Changeset 1969 for trunk/source/iso.h

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:

• trunk/source/iso.h (modified) (5 diffs)

trunk/source/iso.h

@@ -35 +35 @@
  * atom xx-like levels large command */
 /* Hydrogen and helium atoms will have precompiled recombination coefficients up to these maximum n.    */
-#define RREC_MAXN( A_ )         ( A_ == ipH_LIKE ? 40 : 40 )
-
-/** Ions of the sequences will go up to this n. */
-#define LIKE_RREC_MAXN( A_ )            ( A_ == ipH_LIKE ? 20 : 20 )
+#define RREC_MAXN       40
+
+/** Ions of the sequences will go up to this n, h-like He will get same as iso roots.   */
+#define LIKE_RREC_MAXN( A_ )            ( A_ == ipHELIUM ? 40 : 20 )
 
 #define N_ISO_TE_RECOMB         41
@@ -48 +48 @@
 #define RECOMBMAGIC             (80405)
 
+/**iso_cascade - calculate cascade probabilities, branching ratios, and associated errors
+\param ipISO
+\param nelem
+*/
+void iso_cascade( long ipISO, long nelem );
+
+/**iso_collapsed_bnl_print - print departure coefficients for collapsed levels 
+\param ipISO
+\param nelem
+*/
+void iso_collapsed_bnl_print( long ipISO, long nelem );
+
+/**iso_collapsed_bnl_set - set departure coefficients for collapsed levels 
+\param ipISO
+\param nelem
+*/
+void iso_collapsed_bnl_set( long ipISO, long nelem );
+
+/**iso_collapsed_Aul_update - update decays from collapsed levels 
+\param ipISO
+\param nelem
+*/
+void iso_collapsed_Aul_update( long ipISO, long nelem );
+
+/**iso_collapsed_lifetimes_update - update lifetimes of collapsed levels 
+\param ipISO
+\param nelem
+*/
+void iso_collapsed_lifetimes_update( long ipISO, long nelem );
+
 /** iso_collide - calculate collision data for ipISO, nelem  
 \param ipISO
@@ -136 +166 @@
 */
 void iso_radiative_recomb( long ipISO, long nelem );
+
+
+/**iso_radiative_recomb_effective - get effective recomb rate coefficients into each level (including indirect)
+\param ipISO
+\param nelem
+*/
+void iso_radiative_recomb_effective( long ipISO, long nelem );
 
 /**iso_recomb_check - called by SanityCheck to confirm that recombination coef are ok,
@@ -344 +381 @@
         multi_arr<double,3> PopLTE;
 
-        /** collisional ionization rate coefficient from each level */
+        /** collisional ionization rate coefficient from each level (cm3 s-1) */
         multi_arr<double,3> ColIoniz;
 
@@ -513 +550 @@
         multi_arr<double,3> RadEffec, SigmaRadEffec;
 
+        multi_arr<realnum,5> CachedAs;
+        /* the departure coefficients of collapsed levels */
+        multi_arr<double,5> bnl_effective;
+
 } iso;