Changeset 2125 for branches/newmole/source/conv_base.cpp

Timestamp:

06/24/08 16:39:58 (7 months ago)

Author:

rjrw

Message:

Merged from trunk r2111:2124

Files:

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

branches/newmole/source/conv_base.cpp

@@ -855 +855 @@
         PresTotCurrent();
 
-        if( trace.lgTrace )
-        {
-                fprintf( ioQQQ, 
-                        "   ConvBase return. %.2f Te:%.3e  HI:%.3e  HII:%.3e  H2:%.3e  Ne:%.3e  htot:%.3e  CSUP:%.2e Conv?%c\n", 
-                  fnzone,
-                  phycon.te, 
-                  dense.xIonDense[ipHYDROGEN][0], 
-                  dense.xIonDense[ipHYDROGEN][1], 
-                  hmi.H2_total,
-                  dense.eden, 
-                  thermal.htot, 
-                  secondaries.csupra[ipHYDROGEN][0] ,
-                  TorF(conv.lgConvIoniz) );
-        }
-
         ASSERT(lgElemsConserved());
 
@@ -879 +864 @@
          * reset to zero each time ConvPresTempEdenIoniz is called */
         ++conv.nPres2Ioniz;
+
+        if( trace.lgTrace )
+        {
+                fprintf( ioQQQ, 
+                        "   ConvBase return. fnzone %.2f nPres2Ioniz %li Te:%.3e  HI:%.3e  HII:%.3e  H2:%.3e  Ne:%.3e  htot:%.3e  CSUP:%.2e Conv?%c reason:%s\n", 
+                        fnzone,
+                        conv.nPres2Ioniz,
+                        phycon.te, 
+                        dense.xIonDense[ipHYDROGEN][0], 
+                        dense.xIonDense[ipHYDROGEN][1], 
+                        hmi.H2_total,
+                        dense.eden, 
+                        thermal.htot, 
+                        secondaries.csupra[ipHYDROGEN][0] ,
+                        TorF(conv.lgConvIoniz) ,
+                        conv.chConvIoniz);
+        }
 
         /* this is abort option set with SET PRESIONIZ command,