Changeset 2296

Timestamp:

2008-08-01T18:48:31Z (15 years ago)

Author:

Gary J. Ferland

Message:

series of small changes resulting from a few hours debugging the negative population bugs now current in trunk. these should have little effect

cont_setintensity.cpp enforce use of EdenSet? when used

eden_sum - tidy up prints, assert EdenSet? used at exit

iso_ionize_recombine.cpp - on very first pass through routine set initial recomb rate

iso_level.cpp - small changes in print statements

Location:

trunk/source

Files:

• cont_setintensity.cpp (modified) (1 diff)
• eden_sum.cpp (modified) (3 diffs)
• iso_ionize_recombine.cpp (modified) (2 diffs)
• iso_level.cpp (modified) (1 diff)

trunk/source/cont_setintensity.cpp

@@ -1049 +1049 @@
         }
 
-        dense.EdenTrue = dense.eden;
+        if( dense.EdenSet > 0. )
+        {
+                dense.EdenTrue = dense.EdenSet;
+        }
+        else
+                dense.EdenTrue = dense.eden;
 
         if( trace.lgTrace )

trunk/source/eden_sum.cpp

@@ -92 +92 @@
                  * negative electron density.  occurred in pdr
                  * with large h2, after hmole failure */
-                fprintf(ioQQQ," PROBLEM sum eden from hmole too neg, set to  limt.  EdenTrue:%.3e hmole_eden:%.3e \n",
+                fprintf(ioQQQ,
+                        " PROBLEM sum eden from hmole too neg, set to  limt.  EdenTrue:"
+                        "%.3e hmole_eden:%.3e nTotalIoniz %li\n",
+                        /* NB EdenTrue is set later, not set at this point */
                         dense.EdenTrue, 
-                        hmole_eden);
-                dense.EdenTrue = dense.EdenTrue/2.;
+                        hmole_eden,
+                        conv.nTotalIoniz);
+                if( dense.EdenSet <= 0. )
+                        dense.EdenTrue = dense.EdenTrue/2.;
         }
         else
@@ -217 +222 @@
 
         {
-                /*@-redef@*/
                 enum {DEBUG_LOC=false};
-                /*@+redef@*/
                 if( DEBUG_LOC )
                 {
@@ -228 +231 @@
         }
 
-        /* >>chng 05 jan 05, don't let elec den be zero - logs are taken */
+        /* don't let electron density be zero - logs are taken */
         dense.eden = MAX2( SMALLFLOAT , dense.eden );
+
+        /* case where electron density is set with set eden command
+         * make sure we use it */
+        ASSERT( dense.EdenSet <= 0. || 
+                fp_equal((realnum)dense.EdenTrue , dense.EdenSet) );
 
         return 0;

trunk/source/iso_ionize_recombine.cpp

@@ -5 +5 @@
 #include "cddefines.h"
 #include "ionbal.h"
+#include "conv.h"
 #include "atmdat.h"
 #include "dense.h"
@@ -246 +247 @@
         iso.RecomCollisFrac[ipISO][nelem] = Recom3Body* dense.eden / ionbal.RateRecomTot[nelem][nelem-ipISO];
 
+        /* very first pass through here rate RateIonizTot not yet evaluated */
+        if( conv.nTotalIoniz==0 )
+                ionbal.RateIonizTot[ipISO][nelem] = iso.RateLevel2Cont[ipISO][nelem][0];
+
         /* get simple estimate of atom to ion ratio */
         if( ionbal.RateRecomTot[nelem][nelem-ipISO] > 0. )

trunk/source/iso_level.cpp

@@ -585 +585 @@
                         if( StatesElem[ipISO][nelem][level].Pop <= 0 )
                         {
-                                fprintf(ioQQQ," non-positive level pop for iso = %li, nelem = %li = %s, level=%li val=%.3e\n", 
+                                fprintf(ioQQQ,
+                                        "PROBLEM non-positive level pop for iso = %li, nelem = "
+                                        "%li = %s, level=%li val=%.3e nTotalIoniz %li\n", 
                                         ipISO,
                                         nelem , 
                                         elementnames.chElementSym[nelem],
                                         level,
-                                        StatesElem[ipISO][nelem][level].Pop );
+                                        StatesElem[ipISO][nelem][level].Pop ,
+                                        conv.nTotalIoniz);
                         }