Changeset 685

Timestamp:

12/05/06 18:14:43 (21 months ago)

Author:

gary

Message:

dayslow_master.pl - use icl rather than gcc for slow test suite
ion_solver.cpp - undo bug introduced in rev 622. now looks at matrix elements to see if singular
rt_stark.cpp - resolved ambiguous overload
blr_n09_p18_Z20.in - add punch convergence error command
limit_hi_ion.in - renamed func_hi_ion.in to this since it tests code in high ionization limit

Location:

trunk

Files:

• scripts/dayslow_master.pl (modified) (1 diff)
• source/atmdat_adfa.cpp (modified) (2 diffs)
• source/date.h (modified) (1 diff)
• source/hot_issues.txt (modified) (1 diff)
• source/ion_solver.cpp (modified) (6 diffs)
• source/rt_stark.cpp (modified) (1 diff)
• tsuite/auto/blr_n09_p18_Z20.in (modified) (1 diff)
• tsuite/auto/limit_hi_ion.in (moved) (moved from trunk/tsuite/auto/func_hi_ion.in) (1 diff)

trunk/scripts/dayslow_master.pl

@@ -67 +67 @@
 #$exe_org = "$c:/projects/cloudy/trunk/release/trunk.exe";
 # use fast gcc exe
-$exe_org = "$c:/projects/cloudy/trunk/gcc/release/cloudy_gcc.exe";
+$exe_gcc = "$c:/projects/cloudy/trunk/gcc/release/cloudy_gcc.exe";
+$exe_icl = "$c:/projects/cloudy/trunk/icl/release/cloudy_icl.exe";
+$exe_org = $exe_icl;
 system("cp $exe_org $out_dir ");
 #$exe = "c:/projects/Cloudy/trunk/release/trunk.exe";
 #$exe = "$out_dir"."trunk.exe";
-$exe = "$out_dir"."cloudy_gcc.exe";
+$exe_gcc = "$out_dir"."cloudy_gcc.exe";
+$exe_icl = "$out_dir"."cloudy_icl.exe";
+$exe = $exe_icl;
 printf(ioLOG "exe is $exe\n");
 

trunk/source/atmdat_adfa.cpp

@@ -1 +1 @@
 /* This file is part of Cloudy and is copyright (C)1978-2006 by Gary J. Ferland
  * For conditions of distribution and use see copyright notice in license.txt */
-/*atmdat_phfit derive photoionization cross sectoins for first 30 elements */
+/*atmdat_phfit derive photoionization cross sections for first 30 elements */
 #include "cddefines.h"
 #include "physconst.h"
@@ -63 +63 @@
 
                 bool lgErr = false;
-                long i, j, k, n;
+                long i=-1, j=-1, k=-1, n;
 
                 lgErr = lgErr || ( fscanf( io, "%ld", &i ) != 1 );

trunk/source/date.h

@@ -8 +8 @@
  * in the morning so no date conflict happens */
 #define YEAR    106
-#define MONTH   10
-#define DAY     29
+#define MONTH   11
+#define DAY     5

trunk/source/hot_issues.txt

@@ -1 +1 @@
 HOT ISSUES
+
+sim blr_n09_p18_Z20.in has very different convergence properties for PvH than here.  cause by r622
 
 code review - behar - gu uta data read in atmdat_readin.cpp

trunk/source/ion_solver.cpp

@@ -45 +45 @@
         int lgNegPop;
         static int lgMustMalloc=TRUE;
-        static double *sink, *source;
+        static double *sink, *source , *sourcesave;
         int32 nerror;
         static int32 *ipiv;
@@ -221 +221 @@
                         BadMalloc();
                 if( (source=(double*)MALLOC( (sizeof(double)*(unsigned)ncell ))) == NULL )
+                        BadMalloc();
+                if( (sourcesave=(double*)MALLOC( (sizeof(double)*(unsigned)ncell ))) == NULL )
                         BadMalloc();
                 if( (ipiv=(int32*)MALLOC( (sizeof(int32)*(unsigned)ncell ))) == NULL )
@@ -514 +516 @@
                         MAT( xmatsave, i, j ) = MAT( xmat, i, j );
                 }
+                sourcesave[i] = source[i];
         }
 
@@ -523 +526 @@
         * will not be removed, a possible source of error, but they must not
         * have been significant, given that the molecular fraction is so small */
+        if( !lgHomogeneous && ion_range==2 )
+        {
+                /* solve algebraically */
+                double a = MAT( xmatsave, 0, 0 ), 
+                        b = MAT( xmatsave, 1, 0 ) ,
+                        c = MAT( xmatsave, 0, 1 ) ,
+                        d = MAT( xmatsave, 1, 1 );
+                b = SDIV(b);
+                d = SDIV(d);
+                double ratio1 = a/b , ratio2 = c/d , fratio1=fabs(a/b),fratio2=fabs(c/d);
+                if( fabs(ratio1-ratio2)/MAX2(fratio1,fratio2) <DBL_EPSILON*1e4 )
+                {
+                        abund_total = SDIV( dense.gas_phase[nelem] -  dense.xMolecules[nelem] );
+                        lgHomogeneous = TRUE;
+                }
+        }
+#       if 0
         if( nelem==ipHYDROGEN && 
                 fabs(dense.xMolecules[nelem]) / SDIV(dense.gas_phase[ipHYDROGEN]) <DBL_EPSILON*100. )
         {
+                abund_total = SDIV( dense.gas_phase[nelem] -  dense.xMolecules[nelem] );
                 lgHomogeneous = TRUE;
         }
+#       endif
 
         /* this is true if no source terms 
@@ -566 +588 @@
         }
 
+        for( i=0; i< ion_range; ++i )
+        {
+                for( j=0; j< ion_range; ++j )
+                {
+                        MAT( xmatsave, i, j ) = MAT( xmat, i, j );
+                }
+                sourcesave[i] = source[i];
+        }
+
         if ( FALSE && nelem == ipHYDROGEN && dynamics.lgAdvection&& iteration>1 ) 
         {
@@ -728 +759 @@
                 enum {DEBUG_LOC=FALSE};
                 /*@+redef@*/
-                if( DEBUG_LOC && (nzone >380 ) && nelem == ipHYDROGEN )
-                {
-                        fprintf(ioQQQ,"debuggg\t%.2f\t%.4e\t%.4e\tIon\t%.3e\tRec\t%.3e\n", 
+                if( DEBUG_LOC && nelem == ipHYDROGEN )
+                {
+                        fprintf(ioQQQ,"debuggg ion_solver1 \t%.2f\t%.4e\t%.4e\tIon\t%.3e\tRec\t%.3e\n", 
                                 fnzone,
                                 phycon.te,

trunk/source/rt_stark.cpp

@@ -58 +58 @@
          * with negative optical depths,
          * NB did not understand why neg optical depths started */
-        aa = pow(SDIV(EmisLines[ipH_LIKE][ipHYDROGEN][ipH2p][ipH1s].TauIn),-0.75f);
+        aa = (float)SDIV(EmisLines[ipH_LIKE][ipHYDROGEN][ipH2p][ipH1s].TauIn);
+        aa = pow( aa ,-0.75);
         hydro.pestrk[ipH1s][ipH2p] = strkla/2.*MAX2(1.,aa);
 

trunk/tsuite/auto/blr_n09_p18_Z20.in

@@ -25 +25 @@
 punch dr "blr_n09_p18_Z20.dr"
 punch convergence reason "blr_n09_p18_Z20.cvr"
+punch convergence error "blr_n09_p18_Z20.cve"
 c
 c commands giving the asserts    =========

trunk/tsuite/auto/limit_hi_ion.in

@@ -10 +10 @@
 c
 c commands controlling output    =========
-punch heating "func_hi_ion.het"
-punch cooling "func_hi_ion.col"
+punch heating "limit_hi_ion.het"
+punch cooling "limit_hi_ion.col"
 c 
 c commands giving the asserts    =========