Changeset 1969

Timestamp:

04/26/08 10:59:21 (2 weeks 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:

• trunk/data/compile_helike.in (modified) (1 diff)
• trunk/data/compile_hlike.in (added)
• trunk/data/h_iso_recomb.dat (modified) (3 diffs)
• trunk/source/hydroeinsta.cpp (modified) (3 diffs)
• trunk/source/iso.h (modified) (5 diffs)
• trunk/source/iso_collide.cpp (modified) (1 diff)
• trunk/source/iso_create.cpp (modified) (9 diffs)
• trunk/source/iso_radiative_recomb.cpp (modified) (6 diffs)
• trunk/source/iso_solve.cpp (modified) (6 diffs)
• trunk/source/parse_abundances.cpp (modified) (1 diff)
• trunk/source/parse_atom_iso.cpp (modified) (1 diff)
• trunk/source/parse_compile.cpp (modified) (1 diff)
• trunk/source/prt_lines_helium.cpp (modified) (1 diff)
• trunk/source/rt_line_all.cpp (modified) (1 diff)

trunk/data/compile_helike.in

@@ -1 @@
-
+recomb coeff 
-test
-

trunk/data/h_iso_recomb.dat

@@ -1 @@
-210    41      H-like  isoelectronic sequence recomb data, created by COMPile RECOmb COEFficient H-LIke [or HE-Like] command, with 820 H 
+820    41      H-like  isoelectronic sequence recomb data, created by COMPile RECOmb COEFficient H-LIke [or HE-Like] command, with 820 H  and He+
-0       0       -10.781359      -10.907764      -11.033490      -11.158736      -11.283691      -11.408518      -11.533355      -11.658300      -11.783414      -11.908714      -12.034194      -12.159849      -12.285733      -12.412039      -12.539222      -12.668149      -12.800246      -12.937623      -13.083069      -13.239898      -13.411591      -13.601291      -13.811305      -14.042749      -14.295463      -14.568190      -14.858923      -15.165287      -15.484864      -15.815408      -16.154951      -16.501836      -16.854692      -17.212394      -17.574016      -17.938786      -18.306048      -18.675236      -19.045850      -19.417444      -19.804512
-0       1       -11.618004      -11.743005      -11.868006      -11.993008      -12.118012      -12.243020      -12.368032      -12.493055      -12.618096      -12.743169      -12.868300      -12.993541      -13.118987      -13.244831      -13.371465      -13.499666      -13.630891      -13.767563      -13.913131      -14.071665      -14.247072      -14.442305      -14.658938      -14.897156      -15.156032      -15.433896      -15.728678      -16.038167      -16.360194      -16.692735      -17.033973      -17.382319      -17.736413      -18.095113      -18.457472      -18.822714      -19.190215      -19.559474      -19.930092      -20.301758      -20.689140
@@ -1031 +1031 @@
-1       208     -14.913674      -15.039985      -15.167303      -15.296390      -15.428549      -15.565948      -15.712034      -15.871871      -16.052021      -16.259455      -16.499409      -16.773220      -17.077714      -17.406657      -17.753074      -18.110978      -18.476001      -18.845267      -19.217002      -19.590153      -19.964109      -20.338520      -20.713189      -21.088002      -21.462897      -21.837838      -22.212805      -22.587786      -22.962776      -23.337770      -23.712767      -24.087765      -24.462764      -24.837763      -25.212763      -25.587763      -25.962763      -26.337763      -26.712762      -27.087762      -27.477762
-1       209     -15.880759      -16.007280      -16.134970      -16.264707      -16.397984      -16.537266      -16.686406      -16.850918      -17.037650      -17.253379      -17.502502      -17.785111      -18.096973      -18.431391      -18.781510      -19.141752      -19.508185      -19.878277      -20.250487      -20.623909      -20.998019      -21.372517      -21.747235      -22.122076      -22.496986      -22.871936      -23.246908      -23.621892      -23.996883      -24.371878      -24.746875      -25.121874      -25.496873      -25.871872      -26.246872      -26.621872      -26.996872      -27.371872      -27.746872      -28.121871      -28.511871
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+