Changeset 2133

Timestamp:

06/27/08 06:20:29 (2 months ago)

Author:

gary

Message:

these implement two additional command line options for time dependent simulations

print lines cumulative - will print time-integrated spectrum in addition to spectrum for every time step

stop temperature xxx time
iterations/time steps will stop then the temperature of the last zone falls below the number. intended for stopping cals of single cell of cooling gas.

Location:

trunk/source

Files:

• abundances.cpp (modified) (1 diff)
• conv_itercheck.cpp (modified) (1 diff)
• dynamics.cpp (modified) (2 diffs)
• init_defaults_preparse.cpp (modified) (3 diffs)
• iter_end_chk.cpp (modified) (2 diffs)
• parse_commands.cpp (modified) (1 diff)
• parse_print.cpp (modified) (1 diff)
• parse_stop.cpp (modified) (5 diffs)
• prt.h (modified) (1 diff)
• prt_comment.cpp (modified) (1 diff)
• prt_lines_hydro.cpp (modified) (1 diff)
• rt_ots.cpp (modified) (4 diffs)
• stopcalc.h (modified) (1 diff)

trunk/source/abundances.cpp

@@ -263 +263 @@
         /* if stop temp set below default then we are going into cold and possibly 
          * molecular gas - check some parameters in this case */
-        if( called.lgTalk && (StopCalc.tend < phycon.TEMP_STOP_DEFAULT || 
+        if( called.lgTalk && (StopCalc.TempLoStopZone < phycon.TEMP_STOP_DEFAULT || 
                 /* thermal.ConstTemp def is zero, set pos when used */
                 (thermal.ConstTemp > 0. && thermal.ConstTemp < phycon.TEMP_STOP_DEFAULT ) ) )

trunk/source/conv_itercheck.cpp

@@ -210 +210 @@
                 /* >>chng 96 dec 20, moved following to within if on lgAutoIt
                  * this is test for stopping on first zone */
-                if( phycon.te < StopCalc.tend && nzone == 1 )
+                if( phycon.te < StopCalc.TempLoStopZone && nzone == 1 )
                 {
                         lgConverged = true;

trunk/source/dynamics.cpp

@@ -23 +23 @@
 #include "radius.h"
 #include "thirdparty.h"
+#include "stopcalc.h"
 #include "hextra.h"
 #include "rfield.h"
@@ -1364 +1365 @@
                         }
 
+                        /* stop lowest temperature time command */
+                        if( (phycon.te < StopCalc.TempLoStopIteration) ||
+                                (phycon.te > StopCalc.TempHiStopIteration ) )
+                                dynamics.lgStatic_completed = true;
+
                         if( dynamics.time_elapsed < time_elapsed_time[0] )
                         {

trunk/source/init_defaults_preparse.cpp

@@ -317 +317 @@
         prt.lgSurfaceBrightness = false;
         prt.lgSurfaceBrightness_SR = true;
+
+        /* print line cumulative sets true, print integrated line intensity over
+         * time in temp dependent simulation */
+        prt.lgPrintLineCumulative = false;
 
         prt.nzdump = -100;
@@ -384 +388 @@
         StopCalc.AV_point = 1e30f;
         /* highest allowed temperature */
-        StopCalc.T2High = (realnum)phycon.TEMP_LIMIT_HIGH;
+        StopCalc.TempHiStopZone = (realnum)phycon.TEMP_LIMIT_HIGH;
+        StopCalc.TempHiStopIteration = (realnum)phycon.TEMP_LIMIT_HIGH;
 
         /* the floor sets a limit to the temperature in the calculation -
@@ -391 +396 @@
         StopCalc.TeFloor = 0.;
 
-        /* this is in cddefines.h and is 4000 */
-        StopCalc.tend = (realnum)phycon.TEMP_STOP_DEFAULT;
+        /* stop zone calculations when Te falls below this,
+         * TEMP_STOP_DEFAULT in cddefines.h and is 4000 */
+        StopCalc.TempLoStopZone = (realnum)phycon.TEMP_STOP_DEFAULT;
+        /* stop iterations, used to stop time dependent command */
+        StopCalc.TempLoStopIteration = -1.;
+
         /* ending column densities */
         StopCalc.HColStop = COLUMN_INIT;

trunk/source/iter_end_chk.cpp

@@ -336 +336 @@
         }
 
-        else if( phycon.te > StopCalc.T2High )
+        else if( phycon.te > StopCalc.TempHiStopZone )
         {
                 lgDone = true;
@@ -342 +342 @@
         }
 
-        else if( phycon.te < StopCalc.tend )
+        else if( phycon.te < StopCalc.TempLoStopZone )
         {
                 lgDone = true;

trunk/source/parse_commands.cpp

@@ -2007 +2007 @@
         /* if stop temp set below default then we are going into cold and possibly molecular
          * gas - check some parameters in this case */
-        if( called.lgTalk && (StopCalc.tend < phycon.TEMP_STOP_DEFAULT || 
+        if( called.lgTalk && (StopCalc.TempLoStopZone < phycon.TEMP_STOP_DEFAULT || 
                 /* thermal.ConstTemp def is zero, set pos when constant temperature is set */
                 (thermal.ConstTemp > 0. && thermal.ConstTemp < phycon.TEMP_STOP_DEFAULT ) ) )

trunk/source/parse_print.cpp

@@ -428 +428 @@
                         }
                 }
+
+                else if( nMatch("CUMU",chCARD_CAPS) )
+                {
+                        /* print lines cumulative - integral of line emission over time */
+                        prt.lgPrintLineCumulative = true;
+                }
+
                 else
                 {

trunk/source/parse_stop.cpp

@@ -31 +31 @@
         a = FFmtRead(chCard,&i,INPUT_LINE_LENGTH,&lgEOL);
 
-        /* >>chng 04 nov 09, introduce off option */
+        /* off option to turn off one of the stopping criteria, only used if
+         * no number was tnered*/
         if( lgEOL && !nMatch(" OFF",chCard) )
         {
@@ -37 +38 @@
         }
 
+        /* time option, for stopping time dependent calculations, used to stop
+         * iterations rather than zones.  Only some stop commands have this option */
+        bool lgStopZone = true;
+        if( nMatch("TIME",chCard) )
+                lgStopZone = false;
+
         if( nMatch("TEMP",chCard) )
         {
-                /* >>chng 04 nov 09, introduce off option to disable this stopping criterion */
+                /* off option disables this stopping criterion */
                 if( lgEOL && nMatch(" OFF",chCard) )
                 {
@@ -45 +52 @@
                          * but will still stop if Te falls below TeLowest, the lowest
                          * possible temperature */
-                        StopCalc.tend = -1.f;
+                        if( lgStopZone )
+                                StopCalc.TempLoStopZone = -1.f;
+                        else
+                                StopCalc.TempLoStopIteration = -1.f;
                 }
                 else
@@ -85 +95 @@
                                 /* option for this to be highest allowed temperature,
                                  * stop temperate exceeds */
-                                StopCalc.T2High = (realnum)tread;
+                                if( lgStopZone )
+                                        StopCalc.TempHiStopZone = (realnum)tread;
+                                else
+                                        StopCalc.TempHiStopIteration = (realnum)tread;
                         }
                         else
@@ -91 +104 @@
                                 /* this is ending temperature - we stop if kinetic temperature
                                  * falls below this */
-                                StopCalc.tend = (realnum)tread;
+                                if( lgStopZone )
+                                        StopCalc.TempLoStopZone = (realnum)tread;
+                                else
+                                        StopCalc.TempLoStopIteration = (realnum)tread;
                         }
                 }

trunk/source/prt.h

@@ -217 +217 @@
          * in exponential format */
         bool lgPrtLineLog;
+
+        /** flag set by print line cumulative command, also print large set of
+         * emission line integrated intensities over time depend model */
+        bool lgPrintLineCumulative;
 
         /** quantities to do with radiation field and printed in header */

trunk/source/prt_comment.cpp

@@ -492 +492 @@
 
         /* comment if cosmic rays are not included and stop temp has been lowered to go into neutral gas */
-        if( hextra.cryden== 0. && StopCalc.tend < phycon.TEMP_STOP_DEFAULT)
+        if( hextra.cryden== 0. && StopCalc.TempLoStopZone < phycon.TEMP_STOP_DEFAULT)
         {
                 sprintf( chLine, 

trunk/source/prt_lines_hydro.cpp

@@ -270 +270 @@
                                                 Transitions[ipH_LIKE][nelem][index_of_nHi_P][index_of_nLo_S].Emis->xIntensity +=
                                                         Transitions[ipH_LIKE][nelem][ipHi][ipLo].Emis->xIntensity;
-                                                /* kill the resolved line */
-                                                Transitions[ipH_LIKE][nelem][ipHi][ipLo].Emis->xIntensity = 0.;
+                                                /* kill the resolved line - negative means will not be printed */
+                                                Transitions[ipH_LIKE][nelem][ipHi][ipLo].Emis->xIntensity = -1;
                                                 //ASSERT( Transitions[ipH_LIKE][nelem][index_of_nHi_P][index_of_nLo_S].Emis->xIntensity > 0. );
                                         }

trunk/source/rt_ots.cpp

@@ -71 +71 @@
         /**************************************************************************
          *
-         * the bowen HeII - OIII fluorescense problem
+         * the bowen HeII - OIII fluorescence problem
          *
          **************************************************************************/
@@ -100 +100 @@
                 {
                         /* debugging code for line oscillation problems 
-                                * most often Lya OTS oscillations*/
-                        /*@-redef@*/
+                         * most often Lya OTS oscillations*/
                         enum {DEBUG_LOC=false};
-                        /*@+redef@*/
                         if( DEBUG_LOC )
                         {
@@ -268 +266 @@
         /* more debugging code for rec continua */
         {
-                /*@-redef@*/
                 enum {DEBUG_LOC=false};
-                /*@+redef@*/
                 if( DEBUG_LOC )
                 {
@@ -286 +282 @@
         }
 
-        /* now reset Lya dest prob in case is was clobbered */
+        /* now reset Lya dest prob in case is was clobbered by rfield.lgHeIIOTS */
         Transitions[ipH_LIKE][ipHYDROGEN][ipH2p][ipH1s].Emis->Pdest = (realnum)save_lya_dest;
         Transitions[ipH_LIKE][ipHELIUM][ipH2p][ipH1s].Emis->Pdest = (realnum)save_he2lya_dest;

trunk/source/stopcalc.h

@@ -25 +25 @@
         long int iptnu;
 
-        /** highest allowed temperature, set with stop temperature exceeds command */
-        realnum T2High;
-
         /** this provides a "floor" for the temperature - when the temperature
          * falls to this limit, go to constant temperature solution */
         double TeFloor;
 
-        /** tend is lowest temperature, set with stop temperature command */
-        realnum tend;
+        /** highest allowed zone temperature, set with stop temperature exceeds command */
+        realnum TempHiStopZone;
+        /** highest allowed iteration temperature, set with stop time temperature exceeds command */
+        realnum TempHiStopIteration;
+
+        /** TempLoStopZone is lowest temperature to allow in radial zone integrations, 
+         * set with stop temperature command */
+        realnum TempLoStopZone;
+        /** TempLoStopIteration is lowest temperature to allow in iterations, 
+         * set with stop time temperature command, used to stop time dependent sims */
+        realnum TempLoStopIteration;
 
         /** STOP EFRAC sets this limiting ratio of electron to H densities */