Changeset 1949 for trunk/source/parse_punch.cpp

Timestamp:

04/18/08 14:19:56 (9 months ago)

Author:

gary

Message:

punch base convergence command added

conv_base.cpp, init_defaults_preparse.cpp parse_punch.cpp punch.h
add command to give values of converged quantities for each pass through conv_base.cpp

Files:

• trunk/source/parse_punch.cpp (modified) (6 diffs)

trunk/source/parse_punch.cpp

@@ -34 +34 @@
 /* these are for some special cases, same purpose as previous no clobber */
 static bool lgPunConv_noclobber , lgDROn_noclobber , 
-        lgPunPoint_noclobber , lgioRecom_noclobber , lgQHPunchFile_noclobber;
+        lgPunPoint_noclobber , lgioRecom_noclobber , lgQHPunchFile_noclobber,
+        lgTraceConvergeBase_noclobber;
 
 /* NB NB NB NB NB NB NB NB NB NB
@@ -1057 +1058 @@
                                 "#depth\tnPres2Ioniz\tP(cor)\tP(cur)\tP%%error\tNE(cor)\tNE(cur)\tNE%%error\tHeat\tCool\tHC%%error\n" );
                 }
+                else if( nMatch("BASE",chCard) )
+                {
+                        /* punch converged quantities in Converge base for each pass through
+                         * solvers - not one pass per zone */
+                        strcpy( punch.chPunch[punch.npunch], "CNVB" );
+                        strcpy( punch.chPunch[punch.npunch], "" );
+                        punch.lgRealPunch[punch.npunch] = false;
+                }
                 else
                 {
@@ -2314 +2323 @@
         }
 
+        else if( nMatch("CONV",chCard) && nMatch("BASE",chCard) )
+        {
+                /* punch some quantities we are converging */
+                punch.lgTraceConvergeBase = true;
+                /* the second punch occurrence - file has been opened,
+                * copy handle, also pass on special no hash option */
+                if( nMatch("O HA",chCard) )
+                        punch.lgTraceConvergeBaseHash = false;
+                punch.ipTraceConvergeBase = punch.ipPnunit[punch.npunch];
+                /* set punch last flag to whatever it was above */
+                lgTraceConvergeBase_noclobber = lgNoClobber[punch.npunch];
+                static bool lgPrtHeader = true;
+                if( lgPrtHeader )
+                        fprintf( punch.ipTraceConvergeBase, 
+                        "#zone\theat\tcool\teden\n" );
+                lgPrtHeader = false;
+        }
+
         else if( nMatch(" DR ",chCard) )
         {
@@ -2431 +2458 @@
         lgPunConv_noclobber = lgNoClobberDefault;
         lgDROn_noclobber = lgNoClobberDefault;
+        lgTraceConvergeBase_noclobber = lgNoClobberDefault;
         lgPunPoint_noclobber = lgNoClobberDefault;
         lgioRecom_noclobber = lgNoClobberDefault;
@@ -2455 +2483 @@
         }
 
+        punch.lgTraceConvergeBase = false;
+
         if( !lgDROn_noclobber )
         {
                 punch.ipDRout = NULL;
                 punch.lgDROn = false;
+        }
+
+        if( !lgTraceConvergeBase_noclobber )
+        {
+                punch.ipTraceConvergeBase = NULL;
+                punch.lgTraceConvergeBase = false;
         }
 
@@ -2530 +2566 @@
                 punch.lgDROn = false;
         }
+
+        if( punch.ipTraceConvergeBase != NULL && !lgTraceConvergeBase_noclobber  )
+        {
+                /*fclose( punch.ipDRout );*/
+                punch.ipTraceConvergeBase = NULL;
+                punch.lgTraceConvergeBase = false;
+        }
+
         if( punch.ipPunConv != NULL && !lgPunConv_noclobber )
         {