Changeset 2089 for branches/newmole/source

Timestamp:

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

Author:

rjrw

Message:

Merged from trunk r2085:2088

Location:

branches/newmole/source

Files:

• conv_base.cpp (modified) (1 diff)
• iso_level.cpp (modified) (5 diffs)
• radius_increment.cpp (modified) (2 diffs)

branches/newmole/source/conv_base.cpp

@@ -608 +608 @@
                         conv.BadConvIoniz[1] = dense.EdenTrue;
                 }
+
+                for(long ipISO=ipH_LIKE; ipISO<NISO; ++ipISO )
+                {
+                        for( nelem=ipISO; nelem<LIMELM; ++nelem )
+                        {
+                                if( dense.lgElmtOn[nelem] && 
+                                                dense.xIonDense[nelem][nelem-ipISO]/dense.eden>conv.EdenErrorAllowed / 10. &&
+                                                !(iso.chTypeAtomUsed[ipISO][nelem][0]=='L' && 
+                                                        iso.xIonSimple[ipISO][nelem]<1e-10) )
+                                {
+                                        const realnum err_tol = 1e-2;
+                                        realnum abund = 0.;
+                                        for (long n=0; n<iso.numLevels_local[ipISO][nelem]; ++n)
+                                        {
+                                                abund += StatesElem[ipISO][nelem][n].Pop;
+                                        }
+                                        if( conv.lgConvIoniz && iso.pop_ion_ov_neut[ipISO][nelem] > 1e-15 &&
+                                                        ! fp_equal_tol(abund*dense.xIonDense[nelem][nelem+1-ipISO],dense.xIonDense[nelem][nelem-ipISO],
+                                                                                                                 err_tol*dense.xIonDense[nelem][nelem-ipISO]))
+                                        {
+                                                //fprintf(ioQQQ,"Inconsistent iso %ld %ld %ld %g\n",loop_ion,nelem,ipISO,
+                                                //                              abund*dense.xIonDense[nelem][nelem+1-ipISO]/SDIV(dense.xIonDense[nelem][nelem-ipISO])-1);
+                                                conv.lgConvIoniz = false;
+                                                sprintf( conv.chConvIoniz , "Iso!=ion" );
+                                                conv.BadConvIoniz[0] = abund*dense.xIonDense[nelem][nelem+1-ipISO];
+                                                conv.BadConvIoniz[1] = dense.xIonDense[nelem][nelem-ipISO];
+                                        }
+                                }
+                        }
+                }
+
                 ++loop_ion;
         }

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++ )

branches/newmole/source/radius_increment.cpp

@@ -105 +105 @@
                                          * change is to only do this branch if abundance is large enough to be detected by
                                          * the ionization convergence solvers */
-                                        const realnum err_tol = 1e-3;
+                                        const realnum err_tol = 1e-2;
                                         /* >>chng 05 sep 02, when low-T solver used solution is approximate,
                                          * and it must not matter (lot-T solver should not be used if it
@@ -116 +116 @@
                                                 abund += StatesElem[ipISO][nelem][n].Pop;
                                         }
+                                        //fprintf(ioQQQ,"%.2f %ld %ld %11.4g %11.4g\n",fnzone,ipISO,nelem,
+                                        //                              abund*dense.xIonDense[nelem][nelem+1-ipISO]/SDIV(dense.xIonDense[nelem][nelem-ipISO])-1,
+                                        //                              dense.xIonDense[nelem][nelem-ipISO]);
                                         /* make sure that populations are valid, first check Pop2Ion  */
                                         if( iso.pop_ion_ov_neut[ipISO][nelem] > 1e-15 &&