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

Timestamp:

05/20/08 15:56:57 (8 months ago)

Author:

rjrw

Message:

Merged from trunk r2085:2088

Files:

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

branches/newmole/source/iso_level.cpp

@@ -11 +11 @@
 #include "grainvar.h"
 #include "he.h"
+#include "heavy.h"
 #include "helike.h"
 #include "hydrogenic.h"
@@ -23 +24 @@
 #include "thirdparty.h"
 #include "trace.h"
+#include "yield.h"
 
 /* solve for level populations  */
@@ -334 +336 @@
                 }
 
+#if 0
                 for( long ion=0; ion<=nelem+1; ++ion )
                 {
@@ -364 +367 @@
                 }
 
+                for(long ion=dense.IonHigh[nelem]; ion < nelem-NISO; ion++ )
+                {
+                        for(long ns=0; ns < Heavy.nsShells[nelem][ion]; ns++ )
+                        {
+                                for(long nej=1; nej <= t_yield::Inst().nelec_eject(nelem,ion,ns); nej++ )
+                                {
+                                        long IonProduced = MIN2(ion+nej,dense.IonHigh[nelem]);
+                                        if (nelem-NISO == IonProduced)
+                                        {
+                                                source += ionbal.PhotoRate_Shell[nelem][ion][ns][0]*
+                                                        t_yield::Inst().elec_eject_frac(nelem,ion,ns,nej-1);
+                                        }
+                                }
+                        }
+                }
+
+#endif
+
                 if( nelem-ipISO >= 1 && ionbal.RateIonizTot[nelem][nelem-ipISO-1] > 0.)
                 {
@@ -373 +394 @@
                         sink += ionbal.RateRecomTot[nelem][nelem-ipISO-1];
                 }
-
+                
                 creation[0] += source/SDIV(dense.xIonDense[nelem][nelem+1-ipISO]);
                 for( level=0; level < numlevels_local; level++ )