Changeset 2100

Timestamp:

06/05/08 04:18:39 (3 months ago)

Author:

gary

Message:

parse_punch.cpp - add extra check on punch helium so that it does not pick up ionization rate punch option

punch_do.cpp - change f to e format for punch line list

Location:

trunk/source

Files:

• parse_punch.cpp (modified) (1 diff)
• punch_do.cpp (modified) (2 diffs)

trunk/source/parse_punch.cpp

@@ -1362 +1362 @@
         }
 
-        else if( nMatch("HELI",chCard) )
-        {
-                /* punch helium & helium-like iso sequence */
-                /* punch helium line wavelengths */
+        else if( nMatch("HELI",chCard) &&!( nMatch("IONI",chCard)))
+        {
+                /* punch helium & helium-like iso sequence, but not punch helium ionization rate
+                 * punch helium line wavelengths */
                 if( nMatch("LINE",chCard) && nMatch("WAVE",chCard) )
                 {

trunk/source/punch_do.cpp

@@ -2439 +2439 @@
                                                         static double SaveQuantity = 0;
                                                         if( is_odd(j) )
-                                                                fprintf( punch.ipPnunit[ipPun], "\t%.3f" , 
+                                                                fprintf( punch.ipPnunit[ipPun], "\t%.3e" , 
                                                                         SaveQuantity / SDIV( PrtQuantity ) );
                                                         else
@@ -2446 +2446 @@
                                                 else
                                                 {
-                                                        fprintf( punch.ipPnunit[ipPun], "\t%.3f" , PrtQuantity );
+                                                        fprintf( punch.ipPnunit[ipPun], "\t%.3e" , PrtQuantity );
                                                 }
                                         }