Changeset 2139 for branches/newmole/source/abundances.cpp

Timestamp:

06/29/08 09:04:54 (6 months ago)

Author:

rjrw

Message:

Merged from trunk r2124:2137

Files:

• branches/newmole/source/abundances.cpp (modified) (2 diffs)

branches/newmole/source/abundances.cpp

@@ -272 +272 @@
         /* 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 ) ) )
@@ -278 +278 @@
 
                 /* print warning if temperature set below default but C > O */
-                if( dense.gas_phase[ipCARBON]/SDIV( dense.gas_phase[ipOXYGEN]) >= 1. )
+                if( dense.lgElmtOn[ipOXYGEN] && dense.gas_phase[ipCARBON]/SDIV( dense.gas_phase[ipOXYGEN]) >= 1. )
                 {
                         fprintf( ioQQQ, "\n >>> \n"