Changeset 2034 for branches/c08_branch/source/iso_ionize_recombine.cpp

Timestamp:

05/10/08 09:03:02 (6 months ago)

Author:

peter

Message:

Merging all changes from mainline upto r2033, except r1902.

Files:

• branches/c08_branch/source/iso_ionize_recombine.cpp (modified) (8 diffs)

branches/c08_branch/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)
         {
 
@@ -238 +232 @@
                 ionbal.RR_rate_coef_used[nelem][nelem-ipISO] += iso.RadRecomb[ipISO][nelem][level][ipRecRad]*
                         iso.RadRecomb[ipISO][nelem][level][ipRecNetEsc];
-                /*if( nelem==ipHELIUM && ipISO==ipH_LIKE )
-                        fprintf(ioQQQ,"DEBUG rad rec %li %.4e %.4e\n",
-                                level,
-                                iso.RadRecomb[ipISO][nelem][level][ipRecRad],
-                                iso.RadRecomb[ipISO][nelem][level][ipRecNetEsc]);*/
 
                 /* >>chng 05 jul 11, from > to >=, some very opt thick sims did block escape to zero */
@@ -251 +240 @@
                 Recom3Body += iso.ColIoniz[ipISO][nelem][level]*dense.EdenHCorr*iso.PopLTE[ipISO][nelem][level];
         }
-        /*if( nelem==ipHELIUM && ipISO==ipH_LIKE )
-                fprintf(ioQQQ,"DEBUG rad rec %.4e\n",ionbal.RR_rate_coef_used[nelem][nelem-ipISO]);*/
 
         /* fraction of total recombs due to three body - when most are due to this
@@ -262 +249 @@
         if( ionbal.RateRecomTot[nelem][nelem-ipISO] > 0. )
         {
-#               if 0
-                /* >>chng 06 jul 23, this was a temporary hack to force the lot T solver, which forces the
-                 * atom to agree with iso.xIonSimple, to synch up with full solln from matrix - this caused
-                 * many problems since using ionbal.RateIonizTot includes excited level ionization processes
-                 * so matrix soln was called rather than simple.  this cause neg pops in ~half a dozen sims */
-                if( ionbal.RateIonizTot[nelem][nelem-ipISO] >= 0. )
-                {
-                        /* >>chng 06 jul 21, use effective rate, which includes ioniz from excited states, if defined */
-                        iso.xIonSimple[ipISO][nelem] = ionbal.RateIonizTot[nelem][nelem-ipISO]/ionbal.RateRecomTot[nelem][nelem-ipISO];
-                }
-                else
-#               endif
-                {
-                        iso.xIonSimple[ipISO][nelem] = iso.RateLevel2Cont[ipISO][nelem][ipH1s]/ionbal.RateRecomTot[nelem][nelem-ipISO];
-                }
-                /*fprintf(ioQQQ,"DEBUG iso ion rec %li %li ion %.2e ioniztot %.2e \n" ,
-                        ipISO, nelem ,
-                        iso.RateLevel2Cont[ipISO][nelem][ipH1s] ,
-                        ionbal.RateIonizTot[nelem][nelem-ipISO] );*/
+                iso.xIonSimple[ipISO][nelem] = iso.RateLevel2Cont[ipISO][nelem][ipH1s]/ionbal.RateRecomTot[nelem][nelem-ipISO];
         }
         else
@@ -290 +259 @@
         {
                 fprintf( ioQQQ, "     iso_ionize_recombine iso=%2ld Z=%2ld Level2Cont[0] %10.2e RateRecomTot %10.2e xIonSimple %10.2e\n", 
-                        ipISO, nelem, iso.RateLevel2Cont[ipISO][nelem][ipH1s], ionbal.RateRecomTot[nelem][nelem-ipISO], iso.xIonSimple[ipISO][nelem] );
+                        ipISO, nelem, iso.RateLevel2Cont[ipISO][nelem][0], ionbal.RateRecomTot[nelem][nelem-ipISO], iso.xIonSimple[ipISO][nelem] );
         }