Changeset 2461

Timestamp:

11/20/08 05:52:02 (7 weeks ago)

Author:

gary

Message:

punch_do.cpp - upgrade all print wavelength/energy statements to be at least .5e - some are higher precision - these were not degraded.

Location:

trunk/source

Files:

• nemala.txt (modified) (1 diff)
• punch_do.cpp (modified) (5 diffs)

trunk/source/nemala.txt

@@ -1 +1 @@
 to use the Chianti and Leiden data base files uncomment Nemala_Start at 
 atmdat_readin.cpp near line 1433
+
+the code will then read a list of species from species.ini in the data directory

trunk/source/punch_do.cpp

@@ -460 +460 @@
 
                                                 /* photon energy in appropriate energy or wavelength units */
-                                                fprintf( punch.ipPnunit[ipPun],"%.3e\t", AnuUnit(rfield.AnuOrg[j]) );
+                                                fprintf( punch.ipPnunit[ipPun],"%.5e\t", AnuUnit(rfield.AnuOrg[j]) );
                                                 /* incident continuum */
                                                 fprintf( punch.ipPnunit[ipPun],"%.3e\t", flxin ); 
@@ -976 +976 @@
                                                  * going to be used by table read
                                                  * and we want good anu array for sanity check*/
-                                                fprintf( punch.ipPnunit[ipPun],"%.3e\t", AnuUnit(rfield.AnuOrg[j]) );
+                                                fprintf( punch.ipPnunit[ipPun],"%.5e\t", AnuUnit(rfield.AnuOrg[j]) );
                                                 fprintf( punch.ipPnunit[ipPun],"%.3e\t", flxtrn);
                                                 fprintf( punch.ipPnunit[ipPun],"%.3e\n", rfield.trans_coef_total[j] );
@@ -2553 +2553 @@
                                         {
                                                 fprintf( punch.ipPnunit[ipPun], 
-                                                        "%12.4e\t%.3e\t%12.4e\t%.3e\n", 
+                                                        "%13.5e\t%.3e\t%12.4e\t%.3e\n", 
                                                   AnuUnit(rfield.AnuOrg[j]), 
                                                   opac.TauAbsFace[j]+opac.TauScatFace[j], 
@@ -2885 +2885 @@
                                         {
                                                 fprintf( punch.ipPnunit[ipPun], 
-                                                        "%.4e\t%.4e\t%.4e\t%.4e\t%.4e\t%.4e\n", 
+                                                        "%.5e\t%.4e\t%.4e\t%.4e\t%.4e\t%.4e\n", 
                                                   AnuUnit(rfield.AnuOrg[j]),
                                                   rfield.ConEmitLocal[nzone][j]/rfield.widflx[j], 
@@ -3578 +3578 @@
         {
                 /* photon energy in appropriate energy or wavelength units */
-                fprintf( ioPUN,"%.3e\t", AnuUnit((realnum)(energy[j]+rfield.widflx[j+ipLo]/2.) ) );
+                fprintf( ioPUN,"%.5e\t", AnuUnit((realnum)(energy[j]+rfield.widflx[j+ipLo]/2.) ) );
                 fprintf( ioPUN,"%.3e\t", cont_incid[j] );
                 fprintf( ioPUN,"%.3e\t", cont_atten[j] );