Changeset 1913 for trunk/source/iso_level.cpp

Timestamp:

04/03/08 12:44:50 (9 months ago)

Author:

gary

Message:

these changes affect the predicted iso sequence lines. there are three major parts:

cont_createmesh.cpp the fine continuum did not extend down to the wavelength of HeI 10830 so line overlap was not being treated. Extended low energy limit to below this line. this caused some asserted 10830 lines to change.

do not print H-like or He-like lines that are produced from collapsed levels. Their emission has problems which will be documented in a trac ticket.

the data/LineList* files had H and He like lines from collapsed levels commented out. The code now predicts far fewer lines from H and He like species.

iso_level - now keep track of whether the l-mixing collisions out of p are fast enough to mix the levels. if not a comment is printed saying that the H, He lines are not accurate

prt_alltau.cpp - do not print He I line optical depths twice

parse_atom_iso.cpp - add print levels option to atom H-like levels print or atom He-like levels print to print sizes of all ions of H and He sequence. the command does not change the number of levels.

Files:

• trunk/source/iso_level.cpp (modified) (4 diffs)

trunk/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 )