Changeset 1209

Timestamp:

06/24/07 09:41:13 (11 months ago)

Author:

rjrw

Message:

Move molecular effects into level matrix solve, following pattern
of ion_solver.

Files:

• branches/newmole/source/hydrolevelpop.cpp (modified) (2 diffs)
• branches/newmole/source/iso_ionize_recombine.cpp (modified) (3 diffs)

branches/newmole/source/hydrolevelpop.cpp

@@ -16 +16 @@
-#include "hydrogenic.h"
-#include "dynamics.h"
+#include "mole.h"
-/*lint -e662 Possible access of out-of-bounds pointer*/
-
@@ -332 +333 @@
-        }
-
+        CodeReview(); /* Check signs */
+        if( conv.nTotalIoniz > 1 || iteration > 1 )
+        {
+                
+                /* these are the external source and sink terms */
+                /* source first */
+                creation[ipH1s] += mole.source[nelem][i]/SDIV(dense.xIonDense[nelem][nelem+1]);
+                
+                for( ipLo=ipH1s; ipLo<iso.numLevels_local[ipH_LIKE][nelem]; ++ipLo )
+                {
+                        z[ipLo][ipLo] += mole.sink[nelem][ipH_LIKE];
+                }
+        }
+
-        /* =================================================================== 
-         *

branches/newmole/source/iso_ionize_recombine.cpp

@@ -9 +9 @@
-#include "grainvar.h"
-#include "hmi.h"
-#include "mole.h"
-#include "secondaries.h"
-#include "iso.h"
@@ -120 +119 @@
-                sum;
-
-        /** The following are rates used in determining the ionization balance of helium */
-        float hep_destroy;
-
-        DEBUG_ENTRY( "iso_ionize_recombine()" );
-
@@ -200 +196 @@
-
-                /* The following terms in co.c destroy He+ and thereby need to be included 
-
-
-
-
-
-
-
+
-
-                /* this is ioniz of He due to ct with all other gas constituents */