Changeset 2090 for branches/newmole/source

Timestamp:

05/20/08 17:41:17 (8 months ago)

Author:

rjrw

Message:

Iso_level/ion_solver consistency fixes -- pdr_leiden_f1 now runs through.

Location:

branches/newmole/source

Files:

• conv_base.cpp (modified) (1 diff)
• iso_level.cpp (modified) (3 diffs)

branches/newmole/source/conv_base.cpp

@@ -628 +628 @@
                                                                                                                  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);
+                                                //fprintf(ioQQQ,"Inconsistent iso %ld %ld %ld %g %g %g\n",loop_ion,nelem,ipISO,
+                                                //                              abund*dense.xIonDense[nelem][nelem+1-ipISO]/SDIV(dense.xIonDense[nelem][nelem-ipISO])-1
+                                                //                              ,abund*dense.xIonDense[nelem][nelem+1-ipISO],(dense.xIonDense[nelem][nelem-ipISO])
+                                                //      );
                                                 conv.lgConvIoniz = false;
                                                 sprintf( conv.chConvIoniz , "Iso!=ion" );

branches/newmole/source/iso_level.cpp

@@ -336 +336 @@
                 }
 
-#if 0
-                for( long ion=0; ion<=nelem+1; ++ion )
+                for( long ion=dense.IonLow[nelem]; ion<=dense.IonHigh[nelem]; ++ion )
                 {
                         if( ion!=nelem-ipISO )
@@ -350 +349 @@
 
                 /* add in source and sink terms from molecular network. */
-                if( conv.nTotalIoniz > 1 || iteration > 1)
-                {
-                        source += mole.source[nelem][nelem-ipISO];
-                        sink += mole.sink[nelem][nelem-ipISO];
-                        
-                        for( long ion=0; ion<N_MOLE_ION; ++ion )
-                        {
-                                if( ion!=nelem-ipISO && ion < nelem+1 )
-                                {
-                                        /* recombination must be multiplied by a ratio of densities to get proper rate. */
-                                        source += mole.xMoleChTrRate[nelem][ion][nelem-ipISO] * 
-                                                dense.xIonDense[nelem][ion] ;
-                                        sink += mole.xMoleChTrRate[nelem][nelem-ipISO][ion];
-                                }
-                        }
-                }
+                source += mole.source[nelem][nelem-ipISO];
+                sink += mole.sink[nelem][nelem-ipISO];
 
                 for(long ion=dense.IonHigh[nelem]; ion < nelem-NISO; ion++ )
@@ -382 +367 @@
                         }
                 }
-
-#endif
 
                 if( nelem-ipISO >= 1 && ionbal.RateIonizTot[nelem][nelem-ipISO-1] > 0.)