Changeset 2085

Timestamp:

05/19/08 12:30:10 (3 months ago)

Author:

rjrw

Message:

Remove some remaining inconsistencies between ion_solver and iso_level

Location:

trunk/source

Files:

• ion_solver.cpp (modified) (2 diffs)
• iso_level.cpp (modified) (2 diffs)

trunk/source/ion_solver.cpp

@@ -294 +294 @@
          * change ionization stages with this ladder - but do not remove from 
          * the ladder */
-        for( ion_to=dense.IonLow[nelem]; ion_to <= limit; ion_to++ )
+        for( ion_to=dense.IonLow[nelem]; ion_to <= dense.IonHigh[nelem]; ion_to++ )
         {
                 for( ion_from=dense.IonLow[nelem]; ion_from <= dense.IonHigh[nelem]; ++ion_from )
@@ -477 +477 @@
 
                         totsrc += mole.source[nelem][ion];
-                        /* sink next */
-                        /*MAT( xmat, i, i ) += mole.sink[nelem][ion];*/
                         MAT( xmat, i, i ) -= mole.sink[nelem][ion];
                 }

trunk/source/iso_level.cpp

@@ -333 +333 @@
                 }
 
-#if     0
+                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. */
-                CodeReview(); /* Check... */
-                if( nelem == ipISO && conv.nTotalIoniz )
+                if( conv.nTotalIoniz > 1 || iteration > 1)
                 {
                         /* these are the external source and sink terms */
@@ -343 +353 @@
                         sink += mole.sink[nelem][nelem-ipISO];
                 }
-#endif
-
 
                 if( nelem-ipISO >= 1 && ionbal.RateIonizTot[nelem][nelem-ipISO-1] > 0.)