Changeset 1937 for trunk/source/iso_ionize_recombine.cpp

Timestamp:

04/10/08 12:44:47 (9 months ago)

Author:

rporter

Message:

trunk/source/iso_ionize_recombine.cpp - kill csupra is collisional ionization is disabled. Few other minor changes.

Files:

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

trunk/source/iso_ionize_recombine.cpp

@@ -143 +143 @@
                 iso.RateLevel2Cont[ipISO][nelem][level] = iso.gamnc[ipISO][nelem][level] + 
                   iso.ColIoniz[ipISO][nelem][level]* dense.EdenHCorr + 
-                  /* >>chng 04 nov 30, also turn off cr ionization with atom h-like collisions off */
-                  /* >>chng 05 aug 17, do not turn off cosmic rays with no collisional ionization 
-                   * simply leave out crs if this is desired - this allows leiden hacks to work */
-                  secondaries.csupra[nelem][nelem-ipISO]/* *iso.lgColl_ionize[ipISO]*/;
+                  secondaries.csupra[nelem][nelem-ipISO]*iso.lgColl_ionize[ipISO];
 
                 /* all processes from continuum to level n, units s-1 */
@@ -166 +163 @@
         }
 
-        /* all following go into or out of ground state */
-        level = 0;
-
         /* now charge transfer - all into/from ground, two cases, H and not H */
         if( nelem==ipHYDROGEN )
@@ -174 +168 @@
                 /* charge transfer, hydrogen onto everything else */
                 /* charge exchange ionization, these come out of every level */
-                for( level=ipH1s; level< iso.numLevels_local[ipISO][nelem]; ++level)
+                for( level=0; level< iso.numLevels_local[ipISO][nelem]; ++level)
                 {
                         iso.RateLevel2Cont[ipISO][nelem][level] += atmdat.HCharExcIonTotal;
                 }
                 /* charge exchange recombination */
-                iso.RateCont2Level[ipISO][nelem][ipH1s] += atmdat.HCharExcRecTotal;
+                iso.RateCont2Level[ipISO][nelem][0] += atmdat.HCharExcRecTotal;
         }
         else if( nelem==ipHELIUM && ipISO==ipHE_LIKE )
@@ -228 +222 @@
         Recom3Body = 0.;
         /* >>chng 06 jul 20, level should go to numLevels_local instead of numLevels_max */
-        for( level=ipH1s; level< iso.numLevels_local[ipISO][nelem]; ++level)
+        for( level=0; level< iso.numLevels_local[ipISO][nelem]; ++level)
         {