Changeset 2034 for branches/c08_branch/source/conv_base.cpp

Timestamp:

05/10/08 09:03:02 (6 months ago)

Author:

peter

Message:

Merging all changes from mainline upto r2033, except r1902.

Files:

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

branches/c08_branch/source/conv_base.cpp

@@ -6 +6 @@
 #include "cddefines.h"
 #include "dynamics.h"
-#include "hydrogenic.h"
 #include "trace.h"
 #include "elementnames.h"
+#include "punch.h"
 #include "phycon.h"
 #include "secondaries.h"
@@ -1031 +1031 @@
                 return 1;
         }
+
+        if( punch.lgTraceConvergeBase )
+        {
+                if( iteration > 1 && punch.lgTraceConvergeBaseHash )
+                {
+                        static int iter_punch=-1;
+                        if( iteration !=iter_punch )
+                                fprintf( punch.ipDRout, "%s\n",punch.chHashString );
+                        iter_punch = iteration;
+                }
+
+                fprintf( punch.ipTraceConvergeBase, 
+                "%li\t%.4e\t%.4e\t%.4e\n",
+                nzone , thermal.htot , thermal.ctot , dense.eden  );
+        }
+
         return 0;
 }