Changeset 2086 for branches/newmole/source/iso_level.cpp

Timestamp:

05/19/08 12:39:03 (8 months ago)

Author:

rjrw

Message:

Merged from trunk r2078:2085

Files:

• branches/newmole/source/iso_level.cpp (modified) (2 diffs)

branches/newmole/source/iso_level.cpp

@@ -334 +334 @@
                 }
 
+                for( long ion=0; ion<=nelem+1; ++ion )
+                {
+                        if( ion!=nelem-ipISO )
+                        {
+                                /* recombination must be multiplied by a ratio of densities to get proper rate. */
+                                source += mole.xMoleChTrRate[nelem][ion][nelem-ipISO] * 
+                                        dense.xIonDense[nelem][ion] ;
+                                /* take ionization out of every level. */
+                                sink += mole.xMoleChTrRate[nelem][nelem-ipISO][ion];
+                        }
+                }
+
                 /* add in source and sink terms from molecular network. */
-                if( nelem-ipISO < N_MOLE_ION)
+                if( conv.nTotalIoniz > 1 || iteration > 1)
                 {
                         source += mole.source[nelem][nelem-ipISO];
@@ -350 +362 @@
                                 }
                         }
+                }
+
+                if( nelem-ipISO >= 1 && ionbal.RateIonizTot[nelem][nelem-ipISO-1] > 0.)
+                {
+                        /* now add ionization from next lower stage */
+                        source += ionbal.RateIonizTot[nelem][nelem-ipISO-1]*
+                                dense.xIonDense[nelem][nelem-ipISO-1];  
+
+                        /* now add recombination to next lower stage */
+                        sink += ionbal.RateRecomTot[nelem][nelem-ipISO-1];
                 }