Changeset 1997

Timestamp:

04/30/08 09:59:27 (2 weeks ago)

Author:

peter

Message:

source/parse_commands.cpp:

• Bug-fix: Using DLAW command would lead to bogus error message that
  "Hydrogen density MUST be specified."
  
• Bug-fix: The code would continue a model despite the fact that it
  thought that no hydrogen density was entered.
  
• Bug-fix: When combining the DLAW command and a wind model, the
  hydrogen density would be initialized after it was already used in
  wind.emdot.
  

source/parse_hden.cpp:
source/parse_dlaw.cpp:
source/parse_fluc.cpp:
source/parse_globule.cpp:

• Make dense.gas_phase[ipHYDROGEN] linear immediately.
  
• Disallow multiple density commands in one script.
  

source/zero.cpp:

• Remove initialization of dense.gas_phase[ipHYDROGEN] to -99.
  

source/helike_einsta.cpp:
source/hydroeinsta.cpp:

• Fix: Replace NULL -> 0.f.
  

tsuite/slow/checkall.pl:
tsuite/auto/checkall.pl:

• Pick up DISASTER statements in output and include in serious.txt.
  

tsuite/auto/func_dlaw.in:

• Bug-fix: remove duplicate density statement.
  

Files:

• trunk/source/helike_einsta.cpp (modified) (1 diff)
• trunk/source/hydroeinsta.cpp (modified) (1 diff)
• trunk/source/parse_commands.cpp (modified) (3 diffs)
• trunk/source/parse_dlaw.cpp (modified) (3 diffs)
• trunk/source/parse_fluc.cpp (modified) (3 diffs)
• trunk/source/parse_globule.cpp (modified) (1 diff)
• trunk/source/parse_hden.cpp (modified) (3 diffs)
• trunk/source/zero.cpp (modified) (1 diff)
• trunk/tsuite/auto/checkall.pl (modified) (2 diffs)
• trunk/tsuite/auto/func_dlaw.in (modified) (1 diff)
• trunk/tsuite/slow/checkall.pl (modified) (2 diffs)

trunk/source/helike_einsta.cpp

@@ -1032 +1032 @@
-                        }
-                        else
-NULL
+0.f
-
-                        iso_put_error(ipHE_LIKE,nelem,ipHi,ipLo,IPRAD,0.01f);

trunk/source/hydroeinsta.cpp

@@ -82 +82 @@
-                        }
-                        else
-NULL
+0.f
-
-                        iso_put_error(ipISO,nelem,ipHi,ipLo,IPRAD,0.01f);

trunk/source/parse_commands.cpp

@@ -1837 +1837 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        if( strcmp(dense.chDenseLaw,"DLW1") == 0 )
-        {
-                dense.gas_phase[ipHYDROGEN] = (realnum)dense_fabden(radius.Radius,radius.depth);
+
+                if( dense.gas_phase[ipHYDROGEN] <= 0. )
+                {
+                        fprintf( ioQQQ, " PROBLEM DISASTER Hydrogen density set by DLAW must be > 0.\n" );
+                        cdEXIT(EXIT_FAILURE);
+                }
-        }
-        else if( strcmp(dense.chDenseLaw,"DLW2") == 0 )
-        {
-
-
+
+
+
+
+
+
+
-        }
-
@@ -1884 +1865 @@
-        lgStop_not_enough_info = false;
-        lgStop = false;
+
+        /* check whether hydrogen density has been set - this value was set to 0 in zero */
+        if( dense.gas_phase[ipHYDROGEN] <= 0. )
+        {
+                fprintf( ioQQQ, " PROBLEM DISASTER Hydrogen density MUST be specified.\n" );
+                lgStop_not_enough_info = true;
+                lgStop = true;
+        }
+
+        radius.rinner = radius.Radius;
+
+        /* mass flux for wind model - used for mass conservation */
+        wind.emdot = dense.gas_phase[ipHYDROGEN]*wind.windv0;
+
+        /* set converge criteria - limit number of iterations and zones */
+        if( iterations.lgConverge_set)
+        {
+                iterations.itermx = MIN2( iterations.itermx , iterations.lim_iter );
+                for( j=0; j < iterations.iter_malloc; j++ )
+                {
+                        geometry.nend[j] = MIN2( geometry.nend[j] , iterations.lim_zone );
+                }
+        }
-
-        /* NSAVE is number of lines saved, =0 if no commands entered */
@@ -2024 +2028 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        {
-                fprintf( ioQQQ, " NOTE Is the entered value of the hydrogen density (%.2e) reasonable?\n",

trunk/source/parse_dlaw.cpp

@@ -7 +7 @@
-#include "abund.h"
-#include "input.h"
+#include "radius.h"
-#include "parse.h"
-
@@ -18 +19 @@
-
-        DEBUG_ENTRY( "ParseDLaw()" );
+
+        if( dense.gas_phase[ipHYDROGEN] > 0. )
+        {
+                fprintf( ioQQQ, " PROBLEM DISASTER More than one density command was entered.\n" );
+                cdEXIT(EXIT_FAILURE);
+        }
-
-        /* call fcn dense_fabden(RADIUS) which uses the ten parameters
@@ -113 +120 @@
-                }
-        }
+
+        /* set fake density to signal that density command was entered */
+        /* real density will be set once all input commands have been read */
+        /* this is necessary since density may depend on subsequent commands */
+        dense.gas_phase[ipHYDROGEN] = 1.f;
+
-        return;
-}

trunk/source/parse_fluc.cpp

@@ -48 +48 @@
-        temp = FFmtRead(chCard,&i,INPUT_LINE_LENGTH,&lgEOL);
-
+        /* check size of density - will we crash? */
+        if( temp > log10(FLT_MAX) || temp < log10(FLT_MIN) )
+        {
+                fprintf(ioQQQ,
+                        " DISASTER - the log of the entered max hydrogen density is %.3f - too extreme for this processor.\n",
+                        temp);
+                if( temp > 0. )
+                        fprintf(ioQQQ,
+                                " DISASTER - the log of the largest hydrogen density this processor can do is %.3f.\n",
+                                log10(FLT_MAX) );
+                else
+                        fprintf(ioQQQ,
+                                " DISASTER - the log of the smallest hydrogen density this processor can do is %.3f.\n",
+                                log10(FLT_MIN) );
+                fprintf(ioQQQ," Sorry.\n" );
+                cdEXIT(EXIT_FAILURE);
+        }
+
-        /* 2nd number log of max hydrogen density */
-        flmax = pow(10.,temp);
-
+        temp = FFmtRead(chCard,&i,INPUT_LINE_LENGTH,&lgEOL);
+
+        /* check size of density - will we crash? */
+        if( temp > log10(FLT_MAX) || temp < log10(FLT_MIN) )
+        {
+                fprintf(ioQQQ,
+                        " DISASTER - the log of the entered min hydrogen density is %.3f - too extreme for this processor.\n",
+                        temp);
+                if( temp > 0. )
+                        fprintf(ioQQQ,
+                                " DISASTER - the log of the largest hydrogen density this processor can do is %.3f.\n",
+                                log10(FLT_MAX) );
+                else
+                        fprintf(ioQQQ,
+                                " DISASTER - the log of the smallest hydrogen density this processor can do is %.3f.\n",
+                                log10(FLT_MIN) );
+                fprintf(ioQQQ," Sorry.\n" );
+                cdEXIT(EXIT_FAILURE);
+        }
+
-        /* 3rd number log of min hydrogen density */
-
+
+
-        if( flmax/flmin > 100. )
-        {
@@ -65 +104 @@
-                fprintf( ioQQQ, "There MUST be three numbers on this line.\n" );
-                fprintf( ioQQQ, "These must be the period(cm), max, min densities, all logs, in that order.\n" );
+                if( flmin > flmax )
+                        fprintf( ioQQQ, "The max density must be greater or equal than the min density.\n" );
-                cdEXIT(EXIT_FAILURE);
-        }
@@ -93 +134 @@
-                strcpy( dense.chDenseLaw, "SINE" );
-
+                if( dense.gas_phase[ipHYDROGEN] > 0. )
+                {
+                        fprintf( ioQQQ, " PROBLEM DISASTER More than one density command was entered.\n" );
+                        cdEXIT(EXIT_FAILURE);
+                }
+
-                /* depth is zero for first zone */
-                dense.gas_phase[ipHYDROGEN] = dense.cfirst*(realnum)cos(dense.flcPhase) + dense.csecnd;
-
+
+
+
+
+
+
-        }
-        return;

trunk/source/parse_globule.cpp

@@ -16 +16 @@
-        DEBUG_ENTRY( "ParseGlobule()" );
-
+        if( dense.gas_phase[ipHYDROGEN] > 0. )
+        {
+                fprintf( ioQQQ, " PROBLEM DISASTER More than one density command was entered.\n" );
+                cdEXIT(EXIT_FAILURE);
+        }
+
-        /* globule with density increasing inward
-         * parameters are outer density, radius of globule, and density power */
-        i = 5;
-        radius.glbden = (realnum)FFmtRead(chCard,&i,INPUT_LINE_LENGTH,&lgEOL);
-
+
+
+
+
-        {
-
-
-
-
-
-
-
-
+
+
-        }
-

trunk/source/parse_hden.cpp

@@ -15 +15 @@
-        DEBUG_ENTRY( "ParseHDEN()" );
-
+        if( dense.gas_phase[ipHYDROGEN] > 0. )
+        {
+                fprintf( ioQQQ, " PROBLEM DISASTER More than one density command was entered.\n" );
+                cdEXIT(EXIT_FAILURE);
+        }
+
-        /* log of hydrogen density */
-        i = 5;
@@ -20 +26 @@
-        if( lgEOL )
-        {
-log(n)
+DISASTER The density
-                cdEXIT(EXIT_FAILURE);
-        }
-
-        /* check for further options */
-
+! 
-        {
-
-
+
+
+
-                {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        cdEXIT(EXIT_FAILURE);
-                }
-
-
-
-
+
+
-        }
-
-
-
+
-        {
-
-
-
-
-
-
-
-
+
-                cdEXIT(EXIT_FAILURE);
-        }
-
-        /* this is the linear initial density */
-(realnum)pow((realnum)10.f,dense.gas_phase[ipHYDROGEN])
+dense.gas_phase[ipHYDROGEN]
-
-        /* check if exponent entered */
@@ -99 +108 @@
-                /*  pointer to where to write */
-                optimize.nvfpnt[optimize.nparm] = input.nRead;
-dense.gas_phase[ipHYDROGEN]
+log10(dense.gas_phase[ipHYDROGEN])
-                optimize.vincr[optimize.nparm] = 1.;
-

trunk/source/zero.cpp

@@ -900 +900 @@
-
-        dense.eden = 1.;
-        /* >>chng 02 feb 28, this was set to 1 here, and to -99 in zerologic, so that
-         * check whether hden was specified was defeated.  Reset to correct -99. here.*/
-        dense.gas_phase[ipHYDROGEN] = -99.;
-
-        /* now set physical conditions array 

trunk/tsuite/auto/checkall.pl

@@ -59 +59 @@
-        while( <OUTP> )
-        {
-BOTCH " and "W-" strings in all the output file
+DISASTER", "Botched" and "W-" strings in all the output files
-# corresponding line into serious.txt file.
-
+DISASTER/ || /
-            {
-                print SERIOUS "$output: $_";
@@ -72 +72 @@
-# now look for string PROBLEM, which indicates an internal problem
-# during the calculation - this is not a serious problem
-
+&& ! /DISASTER/ 
-            {
-                print MINOR "$output: $_";

trunk/tsuite/auto/func_dlaw.in

@@ -6 +6 @@
-c
-c commands for density & abundances =========
-hden 7 -4
-dlaw table radius
-continue 16 9

trunk/tsuite/slow/checkall.pl

@@ -59 +59 @@
-        while( <OUTP> )
-        {
-BOTCH " and "W-" strings in all the output file
+DISASTER", "Botched" and "W-" strings in all the output files
-# corresponding line into serious.txt file.
-
+DISASTER/ || /
-            {
-                print SERIOUS "$output: $_";
@@ -72 +72 @@
-# now look for string PROBLEM, which indicates an internal problem
-# during the calculation - this is not a serious problem
-
+&& ! /DISASTER/ 
-            {
-                print MINOR "$output: $_";