Show
Ignore:
Timestamp:
04/07/08 15:54:08 (9 months ago)
Author:
rporter
Message:

trunk/data/h_iso_recomb.dat
trunk/data/he_iso_recomb.dat
--recompile these after small changes. h-like now closer to total rates given by Hummer & Storey.

trunk/source/atmdat_chianti.cpp
trunk/source/atmdat_lamda.cpp
trunk/source/cddefines.h
--atmolIndex is not used and is not general enough to be part of state structure anyway. Remove.

trunk/source/helike_cs.cpp - charge in VF01 treatment was hard-wired to 1, set to appropriate charge (thus far only relevant for alpha particles).

trunk/source/helike_recom.cpp - correct comment

trunk/source/helike_recom.h - block of defines was redundant to source in iso.h

trunk/source/init_coreload.cpp - lower most h-like resolved levels to 2, raise a few of the most abundant he-like from 3 to 5.

trunk/source/iso.h - change recomb file magic number declare three new functions, change a few comments

trunk/source/iso_collide.cpp - relocate case b modifications, add a TotalInsanity?

trunk/source/iso_continuum_lower.cpp - streamline iso-dependent items

trunk/source/iso_cool.cpp - remove dead code, change a few comments.

trunk/source/iso_create.cpp - minor cleanup and refactoring.

trunk/source/iso_ionize_recombine.cpp - cleanup

trunk/source/iso_level.cpp - cleanup

trunk/source/iso_photo.cpp - cleanup

trunk/source/iso_radiative_recomb.cpp - merge iso-dependent parts and minor cleanup.

trunk/source/iso_solve.cpp - add comment next to a fixit and remove unnecessary check on ipISO.

trunk/source/parse_commands.cpp - change comment

trunk/source/parse_print.cpp - change "print XX-like departure" parsing... use root of sequence as default.

trunk/source/parse_table.cpp - change .c to .cpp

trunk/source/prt_lines_helium.cpp - make minor change to term for collisional enhancement of case B.

trunk/source/prt_zone.cpp - replace 1 with ipHELIUM in several places

trunk/source/rt_line_all.cpp - disallow pumping to highest level of iso species unless continuum has been lowered.

trunk/source/rt_tau_init.cpp - generalize trace output

trunk/source/sanity_check.cpp - apply recomb sanity check to root of all iso sequences.

trunk/source/stars.cpp - change .c to .cpp

trunk/tsuite/auto/ - mostly minor changes in asserted quantities. More significant ones are as follows:
h_caseb_n8.in - h1 fraction changed by a factor of 2
limit_compton_hi_t.in - o8 fraction changed by an order of magnitude. This is now converged answer. Large number of collapsed levels helps in this case.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/source/helike_cs.cpp

    r1853 r1925  
    11541154        global_s = s; 
    11551155        global_temp = temp; 
    1156         global_collider_charge = 1.; 
    11571156        global_Collider = Collider; 
     1157        global_collider_charge = ColliderCharge[Collider]; 
     1158        ASSERT( global_collider_charge > 0. ); 
    11581159 
    11591160        /* no need to do this for h-like */