Show
Ignore:
Timestamp:
04/26/08 10:59:21 (9 months ago)
Author:
rporter
Message:

trunk/data/compile_helike.in - the compile command has changed, update this file
trunk/data/compile_hlike.in - add this file to compile the hlike recomb data/compile_helike.in
trunk/data/h_iso_recomb.dat - store He+ levels up to 40 (like H) instead of 20 (like rest of sequence)
trunk/source/hydroeinsta.cpp - cache As from collapsed to resolved
trunk/source/iso.h - declare several new routines and variables related to collapsed levels; change number of levels in He+ recomb data file to be same as H and He
trunk/source/iso_collide.cpp - only kill some collisions with "case b hummer" for h-like sequence (i.e., do nothing for he-like)
trunk/source/iso_create.cpp - allocate space for new variables, refactor iso_cascade, define new functions iso_collapsed_Aul_update, iso_collapsed_bnl_print, iso_collapsed_bnl_set, and iso_collapsed_lifetimes_update.
trunk/source/iso_radiative_recomb.cpp - break out effective recomb calculation into its own routine.
trunk/source/iso_solve.cpp - call new routines related to getting collapsed to resolved As correct.
trunk/source/parse_abundances.cpp - remove redundant "CAME" parsing, and non-existant "NLR" option from print statement.
trunk/source/parse_atom_iso.cpp - change to RREC_MAXN
trunk/source/parse_compile.cpp - change to RREC_MAXN and LIKE_RREC_MAXN
trunk/source/prt_lines_helium.cpp - add "TOTL" 10830 as line with regular label as well
trunk/source/rt_line_all.cpp - remove dead code

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/source/rt_line_all.cpp

    r1951 r1969  
    180180                                } 
    181181 
    182 #                               if 0 
    183                                 /* do not allow pumping to highest collapsed level unless continuum has been lowered */ 
    184                                 if( !iso.lgLevelsLowered[ipISO][nelem] ) 
    185                                 { 
    186                                         for( ipLo=0; ipLo < iso.numLevels_local[ipISO][nelem]-1; ++ipLo ) 
    187                                         { 
    188                                                 Transitions[ipISO][nelem][ iso.numLevels_local[ipISO][nelem]-1 ][ipLo].Emis->pump = 0.; 
    189                                         } 
    190                                 } 
    191 #                               endif 
    192  
    193182                                if( ipISO > 0 && lgDoEsc ) 
    194183                                {