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

Timestamp:

03/09/08 16:59:05 (10 months ago)

Author:

rjrw

Message:

Minor changes to resulting from trying to chase down differences on
pdf_leiden_f1 --

ion_solver: allow molecule effects in first iteration,
iso_level: defensive programming for z[][]
mole_eval_balance: move some definitions for sp
mole_co_atom: add SDIV (aka fixit...) to prevent FPE in some circumstances

Files:

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

branches/newmole/source/iso_level.cpp

@@ -71 +71 @@
         /* now do the 2D array */
         z.alloc(numlevels_local,numlevels_local);
+        z.zero();
 
         /* >>chng 03 may 01, move defn of these two up here, before entering matrix */
@@ -235 +236 @@
                         /* all process depopulating level and placing into the continuum
                          * this does NOT include grain charge transfer ionization, added below */
-                        z[level][level] = iso.RateLevel2Cont[ipISO][nelem][level];
+                        z[level][level] += iso.RateLevel2Cont[ipISO][nelem][level];
                         
                         if( ipISO == ipHE_LIKE && level == ipHe2s3S )
@@ -271 +272 @@
 
                                 z[ipLo][ipLo] += coll_up + pump ;
-                                z[ipLo][level] = - ( coll_up + pump );
+                                z[ipLo][level] -= coll_up + pump ;
 
                                 double pump_down = pump *
@@ -278 +279 @@
 
                                 z[level][level] += RadDecay + pump_down + coll_down;
-                                z[level][ipLo] = - (RadDecay + pump_down + coll_down);
+                                z[level][ipLo] -= RadDecay + pump_down + coll_down;
 
                                 if( ipISO == ipHE_LIKE )