Changeset 1916

Timestamp:

04/04/08 03:02:50 (8 months ago)

Author:

gary

Message:

merge of r1913-1915 on mainline

Location:

branches/c08_branch

Files:

• data/LineList_BLR.dat (modified) (1 diff)
• data/LineList_HeH.dat (modified) (1 diff)
• data/LineList_HII.dat (modified) (1 diff)
• data/LineList_NLR.dat (modified) (4 diffs)
• data/LineList_PDR.dat (modified) (1 diff)
• data/LineList_PDR_H2.dat (modified) (1 diff)
• source/cddefines.h (modified) (1 diff)
• source/cdgetlinelist.cpp (modified) (3 diffs)
• source/container_classes.h (modified) (1 diff)
• source/cont_createmesh.cpp (modified) (1 diff)
• source/elements.txt (modified) (1 diff)
• source/init_coreload.cpp (modified) (1 diff)
• source/init_sim_postparse.cpp (modified) (2 diffs)
• source/iso.h (modified) (1 diff)
• source/iso_create.cpp (modified) (1 diff)
• source/iso_level.cpp (modified) (4 diffs)
• source/parse_atom_iso.cpp (modified) (1 diff)
• source/parse_table.cpp (modified) (1 diff)
• source/prt_alltau.cpp (modified) (2 diffs)
• source/prt_comment.cpp (modified) (2 diffs)
• source/prt_lines_hydro.cpp (modified) (3 diffs)
• source/prt_met.cpp (modified) (2 diffs)
• source/zero.cpp (modified) (1 diff)
• tsuite/auto/blr_f92.in (modified) (1 diff)
• tsuite/auto/blr_fp89.in (modified) (3 diffs)
• tsuite/auto/blr_kk81.in (modified) (6 diffs)
• tsuite/auto/blr_n13_p18.in (modified) (1 diff)
• tsuite/auto/blr_n13_p18_Z20.in (modified) (1 diff)
• tsuite/auto/blr_rnfa.in (modified) (3 diffs)
• tsuite/auto/blr_rnfb.in (modified) (3 diffs)
• tsuite/auto/func_grid.in (modified) (1 diff)
• tsuite/auto/hhe_otspp.in (modified) (1 diff)
• tsuite/auto/hhe_outppff.in (modified) (1 diff)
• tsuite/auto/hii_paris.in (modified) (1 diff)
• tsuite/auto/h_t4_conemis_thick.in (modified) (2 diffs)
• tsuite/auto/orion_hii_dist_grn.in (modified) (3 diffs)
• tsuite/auto/orion_hii_open.in (modified) (2 diffs)
• tsuite/auto/orion_hii_pdr.in (modified) (5 diffs)
• tsuite/auto/orion_hii_pdr_pp.in (modified) (1 diff)
• tsuite/auto/orion_hii_single_grn.in (modified) (2 diffs)
• tsuite/auto/pn_fluc.in (modified) (1 diff)
• tsuite/auto/pn_paris.in (modified) (1 diff)

branches/c08_branch/data/LineList_BLR.dat

@@ -132 +132 @@
 BA C     0     total of integrated H balmer continuum
 BaC   3646     total nuFnu of Balmer jump at 3646 (the head)
-h  1  3835     total H-7 (H-Balmer)
+#h  1  3835     total H-7 (H-Balmer)
 He 1  3889     total H-6 (H-Balmer)
 ca2k  3934     total Ca II 3934 emission
 ca2h  3969     total Ca II 3969 emission
-h  1  3970     total H-epsilon
+#h  1  3970     total H-epsilon
 h  1  4102     total H-delta
 #inwd  4102     inward flux of H-delta

branches/c08_branch/data/LineList_HeH.dat

@@ -79 +79 @@
 He 1 2.060m
 He 1 2.112m
-H  1 916.4A
-H  1 917.2A
-H  1 918.1A
-H  1 919.4A
-H  1 921.0A
-H  1 923.2A
-H  1 926.2A
-H  1 930.8A
-H  1 937.8A
-H  1 949.7A
-H  1 972.5A
+#H  1 916.4A
+#H  1 917.2A
+#H  1 918.1A
+#H  1 919.4A
+#H  1 921.0A
+#H  1 923.2A
+#H  1 926.2A
+#H  1 930.8A
+#H  1 937.8A
+#H  1 949.7A
+#H  1 972.5A
 H  1 1026A
 H  1 1216A
-H  1 3671
-H  1 3674
-H  1 3676
-H  1 3679
-H  1 3683
-H  1 3687
-H  1 3692
-H  1 3697
-H  1 3704
-H  1 3712
-H  1 3722
-H  1 3734
-H  1 3750
-H  1 3771
-H  1 3798
-H  1 3835
-H  1 3889
-H  1 3970
+#H  1 3671
+#H  1 3674
+#H  1 3676
+#H  1 3679
+#H  1 3683
+#H  1 3687
+#H  1 3692
+#H  1 3697
+#H  1 3704
+#H  1 3712
+#H  1 3722
+#H  1 3734
+#H  1 3750
+#H  1 3771
+#H  1 3798
+#H  1 3835
+#H  1 3889
+#H  1 3970
 H  1 4102
 H  1 4340
 H  1 4861
 H  1 6563A
-H  1 8598A
-H  1 8665A
-H  1 8750A
-H  1 8863A
-H  1 9015A
-H  1 9229A
+#H  1 8598A
+#H  1 8665A
+#H  1 8750A
+#H  1 8863A
+#H  1 9015A
+#H  1 9229A

branches/c08_branch/data/LineList_HII.dat

@@ -74 +74 @@
 ca 2     8579
 s  3     9069
-H  1     9229
+#H  1     9229
 s  3     9532
 h  1     9546

branches/c08_branch/data/LineList_NLR.dat

@@ -133 +133 @@
 Ca2k     3934
 Ca2h     3969
-h  1     3970     total H-epsilon
+#h  1     3970     total H-epsilon
 S II     4070
 S  2     4074
@@ -188 +188 @@
 ca 2     8579
 s  3     9069
-H  1     9229
+#H  1     9229
 s  3     9532
-h  1     9546
+#h  1     9546
 totl     9850
 PA C     0
@@ -206 +206 @@
 H  1     1.282m
 H  1     1.094m
-H  1     1.005m
+#H  1     1.005m
 #
 # Brackett series
@@ -212 +212 @@
 H  1     4.051m
 H  1     2.625m
-H  1     2.166m  Brackett gamma
-H  1     1.945m
+#H  1     2.166m  Brackett gamma
+#H  1     1.945m
 #
 # IR and coronal lines

branches/c08_branch/data/LineList_PDR.dat

@@ -17 +17 @@
 H  1   1.875m   Paschen alpha   4-3
 H  1   4.051m   Br alpha        5-4
-H  1   2.166m   Br gamma
-H  1   1.945m   Br delta
+#H  1   2.166m   Br gamma
+#H  1   1.945m   Br delta
 H  1   7.458m   Pfund alpha     6-5
-H  1   12.37m   Humphries alpha 7-6
-H  1   19.06m   8-7
+#H  1   12.37m   Humphries alpha 7-6
+#H  1   19.06m   8-7
 #
 # some lines from the H+ region

branches/c08_branch/data/LineList_PDR_H2.dat

@@ -16 +16 @@
 H  1   1.875m   Paschen alpha   4-3
 H  1   4.051m   Br alpha        5-4
-H  1   2.166m   Br gamma
-H  1   1.945m   Br delta
+#H  1   2.166m   Br gamma
+#H  1   1.945m   Br delta
 H  1   7.458m   Pfund alpha     6-5
-H  1   12.37m   Humphries alpha 7-6
-H  1   19.06m   8-7
+#H  1   12.37m   Humphries alpha 7-6
+#H  1   19.06m   8-7
 # 
 # strong optical lines from H+ region

branches/c08_branch/source/cddefines.h

@@ -1563 +1563 @@
          * line 126 */
 #       pragma warning( disable : 4512 )
-        /* disable "'extern' before template explicit instantiation" */
-#       pragma warning( disable : 4231 )
 #endif
 #ifdef __INTEL_COMPILER

branches/c08_branch/source/cdgetlinelist.cpp

@@ -2 +2 @@
  * others.  For conditions of distribution and use see copyright notice in license.txt */
 /*cdGetLineList routine to read in master list of emission line wavelengths and ids, for
- * generating loc grids,
- * someday add cdGetNLRLineList */
+ * generating loc grids */
 #include "cddefines.h"
 #include "cddrive.h"
@@ -38 +37 @@
         chFilename = ( strlen(chFile) == 0 ) ? "LineList_BLR.dat" : chFile;
 
-        /* >>chng 04 nov 06, had searched only on path, now search locally 
-         * and then on path if not found */
         /* we will check local space first, then on path if not present */
         ioData = open_data( chFilename, "r", AS_LOCAL_DATA_TRY );
 
         if( ioData == NULL )
+        {
+                /* did not find file, return -1 */
                 return -1;
+        }
 
         /* count how many lines are in the file, ignoring all lines
@@ -69 +69 @@
 
         /* create 1-d array of string labels */
-        /* create first dim of space for labels */
         *chLabels = (char**)MALLOC((size_t)(nLines+1)*sizeof(char *) );
 

branches/c08_branch/source/container_classes.h

@@ -1713 +1713 @@
 #endif
 
+#ifdef _MSC_VER
+/* disable "'extern' before template explicit instantiation" */
+#       pragma warning( disable : 4231 )
+#endif
+
 // on Mac systems these instantiations need to be extern in order to avoid duplicate symbols
 #define INSTANTIATE_MULTI_ARR( TYPE, LAYOUT, BC ) \

branches/c08_branch/source/cont_createmesh.cpp

@@ -447 +447 @@
 
         /* frequency range in Rydberg needed for all resonance lines */
-        rfield.fine_ener_lo = 0.1f;
+        rfield.fine_ener_lo = 0.05f;
         rfield.fine_ener_hi = 1500.f;
 

branches/c08_branch/source/elements.txt

@@ -50 +50 @@
 /* string giving ionization stage as roman numerals */
 elementnames.chIonRoman[LIMELM+3][7];
+
+iso sequence names in iso.chISO
 
 these are saved in zerologic.c

branches/c08_branch/source/init_coreload.cpp

@@ -228 +228 @@
         iso.n_HighestResolved_max[ipHE_LIKE][ipZINC] = 5;
 
+        iso.chISO[ipH_LIKE] = "H-like ";
+        iso.chISO[ipHE_LIKE] = "He-like";
+
         max_num_levels = 0;
         for( long ipISO = ipH_LIKE; ipISO < NISO; ipISO++ )

branches/c08_branch/source/init_sim_postparse.cpp

@@ -5 +5 @@
 #include "cddefines.h" 
 #include "dense.h"
+#include "elementnames.h"
 #include "physconst.h"
 #include "mole.h"
@@ -78 +79 @@
         }
 
+        if( iso.lgPrintNumberOfLevels )
+        {
+                fprintf(ioQQQ,"\n\n Number of levels in ions treated by iso sequences.\n");
+                fprintf(ioQQQ," ISO   Element  hi-n(l-resolved) #(l-resolved)  n(collapsed)\n");
+                /* option to print number of levels for each element */
+                for( long ipISO=ipH_LIKE; ipISO<NISO; ++ipISO )
+                {
+                        for( long nelem=ipISO; nelem<LIMELM; ++nelem )
+                        {
+                                /* print number of levels */
+                                fprintf(ioQQQ," %s  %s    %4li            %4li           %4li \n",
+                                        iso.chISO[ipISO] ,
+                                        elementnames.chElementSym[nelem],
+                                        iso.n_HighestResolved_max[ipISO][nelem],
+                                        iso.numLevels_max[ipISO][nelem]-iso.nCollapsed_max[ipISO][nelem],
+                                        iso.nCollapsed_max[ipISO][nelem]);
+                        }
+                }
+        }
+
         return;
 }

branches/c08_branch/source/iso.h

@@ -174 +174 @@
 EXTERN struct t_iso 
 {
+        bool lgPrintNumberOfLevels;
+
         const char *chISO[NISO];
 

branches/c08_branch/source/iso_create.cpp

@@ -568 +568 @@
 
         DEBUG_ENTRY( "iso_allocate()" );
-
-        iso.chISO[ipH_LIKE] = "h-like ";
-        iso.chISO[ipHE_LIKE] = "he-like";
 
         iso.strkar.reserve( NISO );

branches/c08_branch/source/iso_level.cpp

@@ -44 +44 @@
 
         int32 nerror;
-        double HighestPColOut[2] = {0.,0.},
+        double HighestPColOut = 0.,
                 collider,
                 sum_popn_ov_ion,
@@ -223 +223 @@
         else
         {
+                long SpinUsed[NISO] = {2,1};
+                long indexNmaxP =
+                        iso.QuantumNumbers2Index[ipISO][nelem][ iso.n_HighestResolved_local[ipISO][nelem] ][1][SpinUsed[ipISO]];
+
                 strcpy( iso.chTypeAtomUsed[ipISO][nelem], "Popul" );
                 if( trace.lgTrace && (nelem == trace.ipIsoTrace[ipISO]) )
@@ -280 +284 @@
 
                                 z[level][level] += RadDecay + pump_down + coll_down;
-                                z[level][ipLo] = - (RadDecay + pump_down + coll_down);
-
-                                if( ipISO == ipHE_LIKE )
-                                {
-                                        if ( nelem == ipHELIUM )
-                                        {
-                                                if( StElm[level].l == 1 && 
-                                                    StElm[level].n == iso.n_HighestResolved_local[ipISO][nelem] )
-                                                {
-                                                        if( StElm[level].S == 1 )
-                                                        {
-                                                                ASSERT( (int)(StElm[level].S >> 1) == 0 );
-                                                        }
-                                                        else if( StElm[level].S == 3 )
-                                                        {
-                                                                ASSERT( (int)(StElm[level].S >> 1) == 1 ); 
-                                                        }
-
-                                                        HighestPColOut[StElm[level].S >> 1] += coll_down;
-                                                }
-                                                                                         
-                                                if( StElm[ipLo].l == 1 &&
-                                                    StElm[ipLo].n == iso.n_HighestResolved_local[ipISO][nelem] )
-                                                {
-                                                        if( StElm[ipLo].S == 1 )
-                                                        {
-                                                                ASSERT( (int)(StElm[ipLo].S >> 1) == 0 );
-                                                        }
-                                                        else if( StElm[ipLo].S == 3 )
-                                                        {
-                                                                ASSERT( (int)(StElm[ipLo].S >> 1) == 1 ); 
-                                                        }
-                                                        
-                                                        HighestPColOut[StElm[ipLo].S >> 1] += coll_up;
-                                                }
-                                        }
-
-                                        /* find total collisions out of 2^3S to singlets. */
-                                        if( (level == 1) && (ipLo==0) )
-                                        {
-                                                iso.qTot2S[ipISO][nelem] += coll_down/dense.EdenHCorr;
-                                        }
-                                        if( (ipLo == 1) && (ipISO==ipH_LIKE || (StElm[level].S==1)) )
-                                        {
-                                                iso.qTot2S[ipISO][nelem] += coll_up/dense.EdenHCorr;
-                                        }
+                                z[level][ipLo] = - (RadDecay + pump_down + coll_down);                                  
+
+                                if( level == indexNmaxP )
+                                {
+                                        HighestPColOut += coll_down;
+                                }                                
+                                if( ipLo == indexNmaxP )
+                                {
+                                        HighestPColOut += coll_up;
                                 }
+
+                                /* find total collisions out of 2^3S to singlets. */
+                                if( (level == 1) && (ipLo==0) )
+                                {
+                                        iso.qTot2S[ipISO][nelem] += coll_down/dense.EdenHCorr;
+                                }
+                                if( (ipLo == 1) && (ipISO==ipH_LIKE || (StElm[level].S==1)) )
+                                {
+                                        iso.qTot2S[ipISO][nelem] += coll_up/dense.EdenHCorr;
+                                }
+                        }
+                }
+
+                if( ipISO == nelem )
+                {
+                        /* iso.lgCritDensLMix[ipISO] is a flag used to print warning if density is
+                        * too low for first collapsed level to be l-mixed.  Check is if l-mixing collisions
+                        * out of highest resolved singlet P are greater than sum of transition probs out.       */
+                        if( HighestPColOut < 1./StatesElem[ipISO][nelem][indexNmaxP].lifetime )
+                        {
+                                iso.lgCritDensLMix[ipISO] = false;
                         }
                 }
@@ -657 +645 @@
         if( ipISO == ipHE_LIKE )
         {
-                /* iso.lgCritDensLMix[ipISO] is a flag used to print warning if density is
-                 * too low for first collapsed level to be l-mixed.  Check is if l-mixing collisions
-                 * out of highest resolved singlet P are greater than sum of transition probs out.      */
-                if( ( (HighestPColOut[0] < 1./StatesElem[ipISO][ipHELIUM][iso.QuantumNumbers2Index[ipISO][ipHELIUM][iso.n_HighestResolved_max[ipISO][ipHELIUM]][1][1]].lifetime )
-                        || (HighestPColOut[1] < 1./StatesElem[ipISO][ipHELIUM][iso.QuantumNumbers2Index[ipISO][ipHELIUM][iso.n_HighestResolved_max[ipISO][ipHELIUM]][1][3]].lifetime ) )
-                        && nelem==ipHELIUM ) 
-                {
-                        iso.lgCritDensLMix[ipISO] = false;
-                }
 
                 if( nzone>0 && nelem==ipHELIUM )

branches/c08_branch/source/parse_atom_iso.cpp

@@ -154 +154 @@
                  * allocated for the hydrogen and helium lines.  Once done we must ignore all 
                  * future changes in the number of levels */
-                if( !lgHydroMalloc )
+                if( nMatch("PRIN",chCard) )
+                {
+                        /* only print - do not change levels */
+                        iso.lgPrintNumberOfLevels = true;
+                }
+                else if( !lgHydroMalloc )
                 {
                         i = 5;

branches/c08_branch/source/parse_table.cpp

@@ -878 +878 @@
 
                 lgLines_Malloc = true;
-                /* this flag says we did not find a continuum source - nearly all table XXX
+                /* this flag says this is not find a continuum source - nearly all table XXX
                  * commands deal with continuum sources */
                 ncont = -10;
 
                 /* actually get the lines, and malloc the space in the arrays */
-                nLINE_TABLE = cdGetLineList( chLINE_LIST , &chLabel , &wl);
+                if( (nLINE_TABLE = cdGetLineList( chLINE_LIST , &chLabel , &wl) )<0 )
+                {
+                        /* did not find file, abort */
+                        fprintf(ioQQQ,"\n DISASTER PROBLEM ParseTable could not find "
+                                "line list file %s\n", chLINE_LIST );
+                        fprintf(ioQQQ," Please check the spelling of the file name and that it "
+                                "is in either the local or data directory.\n\n");
+                        cdEXIT(EXIT_FAILURE);
+                }
         }
 

branches/c08_branch/source/prt_alltau.cpp

@@ -116 +116 @@
         PrintE93( ioQQQ , opac.TauTotalGeo[0][iso.ipIsoLevNIonCon[ipH_LIKE][1][ipH1s]-1]/fcon);
         fprintf( ioQQQ, "\n");
-
-        if( dense.lgElmtOn[ipHELIUM] )
-        {
-                /* print optical depths of previous iteration with old atom */
-
-                /* these results are for new HeI as part of he iso sequence */
-                fprintf( ioQQQ, "  Line Optical Depths: 10830:");
-                fprintf( ioQQQ,PrintEfmt("%9.2e", (Transitions[ipHE_LIKE][ipHELIUM][ipHe2p3P0][ipHe2s3S].Emis->TauIn+
-                        Transitions[ipHE_LIKE][ipHELIUM][ipHe2p3P1][ipHe2s3S].Emis->TauIn+
-                        Transitions[ipHE_LIKE][ipHELIUM][ipHe2p3P2][ipHe2s3S].Emis->TauIn)/flin));
-                fprintf( ioQQQ, "  3889:");
-                fprintf( ioQQQ,PrintEfmt("%9.2e", Transitions[ipHE_LIKE][ipHELIUM][ipHe3p3P][ipHe2s3S].Emis->TauIn/flin));
-                fprintf( ioQQQ, "    5876:");
-                fprintf( ioQQQ,PrintEfmt("%9.2e", (Transitions[ipHE_LIKE][ipHELIUM][ipHe3d3D][ipHe2p3P0].Emis->TauIn+
-                        Transitions[ipHE_LIKE][ipHELIUM][ipHe3d3D][ipHe2p3P1].Emis->TauIn+
-                        Transitions[ipHE_LIKE][ipHELIUM][ipHe3d3D][ipHe2p3P2].Emis->TauIn)/flin));
-                fprintf( ioQQQ, " 7065:");
-                fprintf( ioQQQ,PrintEfmt("%9.2e", (Transitions[ipHE_LIKE][ipHELIUM][ipHe3s3S][ipHe2p3P0].Emis->TauIn+
-                        Transitions[ipHE_LIKE][ipHELIUM][ipHe3s3S][ipHe2p3P1].Emis->TauIn+
-                        Transitions[ipHE_LIKE][ipHELIUM][ipHe3s3S][ipHe2p3P2].Emis->TauIn)/flin));
-                fprintf( ioQQQ, "  2.06m:");
-    &nbs