Changeset 2045

Timestamp:

05/12/08 03:16:01 (4 months ago)

Author:

gary

Message:

rt_diffuse.cpp - BUGFIX - in case where extremely large increase in ionization threshold continuum index for ionization edge could extend beyond the number of cells

ion_trim.cpp - when the density falls to VERY low values, too low to compute on 32 bit cpu, error message is printed and code aborts. Improve information in error message.

service.cpp - fix misspelled words, one use in output

init_coreload.cpp - trivial changes in line skips

Location:

trunk/source

Files:

• init_coreload.cpp (modified) (1 diff)
• ion_trim.cpp (modified) (2 diffs)
• rt_diffuse.cpp (modified) (1 diff)
• service.cpp (modified) (2 diffs)

trunk/source/init_coreload.cpp

@@ -306 +306 @@
         grid.lgGridDone = false;
         grid.lgStrictRepeat = false;
+
         /* these are energy range... if not changed with command, 0. says just use energy limits of mesh */
         grid.LoEnergy_keV = 0.;
         grid.HiEnergy_keV = 0.;
 
-
         PunchFilesInit();
 

trunk/source/ion_trim.cpp

@@ -5 +5 @@
 #include "cddefines.h"
 #include "elementnames.h"
+#include "radius.h"
 #include "heavy.h"
 #include "conv.h"
@@ -190 +191 @@
                         elementnames.chElementName[nelem]);
                 fprintf(ioQQQ,
-                        "Turn off the element or do not consider gas with low density, the current hydrogen density is %.2e cm-3.\n",
+                        "Turn off the element with the command ELEMENT XXX OFF or do not consider "
+                        "gas with low density, the current hydrogen density is %.2e cm-3.\n",
                         dense.gas_phase[ipHYDROGEN]);
                 fprintf(ioQQQ,
-                        "abort flag being set.\n");
+                        "The outer radius of the cloud is %.2e cm - should a stopping "
+                        "radius be set?\n",
+                        radius.Radius );
+                fprintf(ioQQQ,
+                        "The abort flag is being set - the calculation is stopping.\n");
                 lgAbort = true;
                 return;

trunk/source/rt_diffuse.cpp

@@ -384 +384 @@
 
                                 ip = Heavy.ipHeavy[nelem][ion]-1;
+                                ASSERT( ip >= 0 );
 
                                 /* nflux was reset upward in ConvInitSolution to encompass all
                                  * possible line and continuum emission.  this test should not
-                                 * possibly fail.  It could if the ionization were to increase with depth.
-                                 * This is important because the nflux cell in ConInterOut is used to carry out the
-                                 * unit integration, and if it gets clobbered by diffuse emission the code
-                                 * will declare insanity in PrtComment */
-                                ASSERT( ip >= 0 && ip < rfield.nflux );
+                                 * possibly fail.  It could if the ionization were to increase with depth
+                                 * although the continuum mesh is designed to deal with this.
+                                 * This test is important because the nflux cell in ConInterOut 
+                                 * is used to carry out the unit integration, and if it gets 
+                                 * clobbered by diffuse emission the code will declare 
+                                 * insanity in PrtComment */
+                                if( ip >= rfield.nflux )
+                                        continue;
 
                                 /* get shell number, stat weights for this species */

trunk/source/service.cpp

@@ -140 +140 @@
         if( lgFail )
         {
-                fprintf( ioQQQ, " A syntax error occured while splitting the string: \"%s\"\n", str.c_str() );
+                fprintf( ioQQQ, " A syntax error occurred while splitting the string: \"%s\"\n", str.c_str() );
                 fprintf( ioQQQ, " The separator is \"%s\". Empty substrings are not allowed.\n", sep.c_str() );
                 cdEXIT(EXIT_FAILURE);
@@ -929 +929 @@
         else
         {
-                /* round number off for 9.3 format, neg numb not possilbe */
+                /* round number off for 9.3 format, neg numb not possible */
                 tvalue = value;
                 xlog = log10( tvalue );