Changeset 1751 for trunk/source/iso_continuum_lower.cpp

Timestamp:

01/22/08 13:18:24 (10 months ago)

Author:

rporter

Message:

trunk/source/grid_do.cpp - minor changes in grid/optimizer printout to make difference more clear.

trunk/source/iso_continuum_lower.cpp - fix bug when continuum was lowered in previous zone and then is not lowered.

trunk/source/iso_create.cpp - change lifetime calculation for upper level of extra lyman lines. Dramatically reduces startup time in fast models.

trunk/source/optimize_func.cpp - minor printout change

trunk/source/parse.h - declare ParseGrid?

trunk/source/parse_commands.cpp - call ParseGrid? instead of ParseOptimize? on GRID keyword

trunk/source/parse_grid.cpp - new file, extracted from ParseOptimize?

trunk/source/parse_optimize.cpp - remove GRID keyword as above

trunk/source/punch_fits.cpp - add fixit about FITS files problem with all double precision

trunk/tsuite/auto/dynamics_wind.in - increase itrzn - this has apparently been botching for a month

Files:

• trunk/source/iso_continuum_lower.cpp (modified) (3 diffs)

trunk/source/iso_continuum_lower.cpp

@@ -79 +79 @@
         {
                 iso.lgLevelsLowered[ipISO][nelem] = true;
+                iso.lgLevelsEverLowered[ipISO][nelem] = true;
                 hydro.lgReevalRecom = true;
                 iso.n_HighestResolved_local[ipISO][nelem] = nc;
@@ -94 +95 @@
         {
                 iso.lgLevelsLowered[ipISO][nelem] = true;
+                iso.lgLevelsEverLowered[ipISO][nelem] = true;
                 hydro.lgReevalRecom = true;
                 iso.n_HighestResolved_local[ipISO][nelem] = iso.n_HighestResolved_max[ipISO][nelem];
@@ -118 +120 @@
                 iso.nCollapsed_local[ipISO][nelem] = iso.nCollapsed_max[ipISO][nelem];
                 iso.n_HighestResolved_local[ipISO][nelem] = iso.n_HighestResolved_max[ipISO][nelem];
+                
+                /* if levels were lowered on last past but are not now, must reeval */
+                if( iso.lgLevelsLowered[ipISO][nelem] )
+                {
+                        hydro.lgReevalRecom = true;
+                }
+                else
+                {
+                        hydro.lgReevalRecom = false;
+                }
+
                 iso.lgLevelsLowered[ipISO][nelem] = false;
-                hydro.lgReevalRecom = false;
         }