Changeset 792

Timestamp:

01/22/07 01:20:39 (22 months ago)

Author:

gary

Message:

*.in - these changed as result of e2 bugfix r786

conv_base.cpp - only reevaluate UTA pump rates when lgRedoStatic is true, this will save some time

hydrobranch.cpp - init nd2 var to impossible value to prevent possibly use of uninit var warning

service.cpp - add change comment and date for PvH fix of e2 function. This was a serious bug that had been in the code for some time, did change results, and worthy of a comment

Location:

trunk

Files:

• source/conv_base.cpp (modified) (1 diff)
• source/hydrobranch.cpp (modified) (1 diff)
• source/service.cpp (modified) (1 diff)
• tsuite/auto/agn_warm_absorber.in (modified) (15 diffs)
• tsuite/auto/blr_f92.in (modified) (2 diffs)
• tsuite/auto/blr_fp89.in (modified) (1 diff)
• tsuite/auto/blr_kk81.in (modified) (1 diff)
• tsuite/auto/blr_n09_p18.in (modified) (1 diff)
• tsuite/auto/blr_n09_p18_Z20.in (modified) (1 diff)
• tsuite/auto/blr_n09_p20.in (modified) (1 diff)
• tsuite/auto/blr_n09_p22.in (modified) (2 diffs)
• tsuite/auto/blr_n09_p22_Z20.in (modified) (6 diffs)
• tsuite/auto/blr_n12_p19.in (modified) (1 diff)
• tsuite/auto/blr_n12_p19_Z20.in (modified) (2 diffs)
• tsuite/auto/blr_n13_p22.in (modified) (1 diff)
• tsuite/auto/blr_nf84.in (modified) (1 diff)
• tsuite/auto/blr_nf84_45deg.in (modified) (3 diffs)
• tsuite/auto/blr_rnfb.in (modified) (1 diff)
• tsuite/auto/func_ion_increase.in (modified) (10 diffs)
• tsuite/auto/h_outopen.in (modified) (1 diff)
• tsuite/auto/igm_lalpha.in (modified) (1 diff)
• tsuite/auto/igm_primal.in (modified) (1 diff)
• tsuite/auto/ism_cosmicray.in (modified) (1 diff)
• tsuite/auto/nlr_lex00.in (modified) (7 diffs)
• tsuite/auto/nlr_liner.in (modified) (1 diff)
• tsuite/auto/nlr_liner_grains.in (modified) (3 diffs)
• tsuite/auto/nlr_paris.in (modified) (10 diffs)
• tsuite/auto/orion_hii_dist_grn.in (modified) (2 diffs)
• tsuite/auto/orion_hii_open.in (modified) (1 diff)
• tsuite/auto/orion_hii_pdr_fast.in (modified) (1 diff)
• tsuite/auto/orion_hii_single_grn.in (modified) (2 diffs)

trunk/source/conv_base.cpp

@@ -454 +454 @@
                 /*GrainDrive();*/
 
-                /* inner shell ionization */
-                for( nelem=0; nelem< LIMELM; ++nelem )
-                {
-                        for( ion=0; ion<nelem+1; ++ion )
-                        {
-                                ionbal.UTA_ionize_rate[nelem][ion] = 0.;
-                        }
-                }
-                /* inner shell ionization by UTA lines */
-                /* this flag turned off with no UTA command */
-                if( ionbal.lgInnerShellLine_on )
-                {
-                        for( i=0; i<nUTA; ++i )
-                        {
-                                if( UTALines[i].Aul > 0. )
+                /* only reevaluate this on first pass through on this zone */
+                if( opac.lgRedoStatic )
+                {
+                        /* inner shell ionization */
+                        for( nelem=0; nelem< LIMELM; ++nelem )
+                        {
+                                for( ion=0; ion<nelem+1; ++ion )
                                 {
-                                        /* cs is actually the negative of the branching ratio for autoionization, 
-                                        * rateone is inverse lifetime of level against autoionization */
-                                        double rateone = UTALines[i].pump * -UTALines[i].cs;
-                                        ionbal.UTA_ionize_rate[UTALines[i].nelem-1][UTALines[i].IonStg-1] += rateone;
+                                        ionbal.UTA_ionize_rate[nelem][ion] = 0.;
+                                }
+                        }
+                        /* inner shell ionization by UTA lines */
+                        /* this flag turned off with no UTA command */
+                        if( ionbal.lgInnerShellLine_on )
+                        {
+                                for( i=0; i<nUTA; ++i )
+                                {
+                                        if( UTALines[i].Aul > 0. )
+                                        {
+                                                /* cs is actually the negative of the branching ratio for autoionization, 
+                                                * rateone is inverse lifetime of level against autoionization */
+                                                double rateone = UTALines[i].pump * -UTALines[i].cs;
+                                                ionbal.UTA_ionize_rate[UTALines[i].nelem-1][UTALines[i].IonStg-1] += rateone;
+                                                {
+                                                        /* DEBUG OTS rates - turn this on to debug line, continuum or both rates */
+                                                        /*@-redef@*/
+                                                        enum {DEBUG_LOC=false};
+                                                        /*@+redef@*/
+                                                        if( DEBUG_LOC && UTALines[i].nelem==ipIRON+1 )
+                                                        {
+                                                                fprintf(ioQQQ,"DEBUG UTA %3li %3li %.3f %.2e\n",
+                                                                        UTALines[i].nelem , UTALines[i].IonStg , UTALines[i].WLAng ,
+                                                                        rateone );
+                                                        }
+                                                }
+                                        }
                                 }
                         }

trunk/source/hydrobranch.cpp

@@ -50 +50 @@
         ReadBlock(io,Czero);
 
+        /* initialize here so that lint does not complain about possibly
+         * uninitialized variables */
         int nd2=-1;
 

trunk/source/service.cpp

@@ -295 +295 @@
 
 /*e2 second exponential integral */
+/*>>chng 07 jan 17, PvH discover that exp-t is not really
+ * exp-t - this changed results in several tests */
 double e2(
         /* the argument to E2 */

trunk/tsuite/auto/agn_warm_absorber.in

@@ -29 +29 @@
 // >>chng 03 0ct 08, from 0.657 to 0.622, reorder ots level1
 // >>chng 04 jun 12, from 0.622 to 0.561 chng cont shield fcn
-assert line "cabo" 4861 0.561
+// >>chng 07 jan 20, from 0.561 to 0.537, e2 bug
+assert line "cabo" 4861 0.537
 //
 // >>chng 01 dec 21, inner shell yields, 5.064 to 5.033
@@ -36 +37 @@
 // >>chng 06 feb 03, from 5.169 to 5.144, guess dr to Badnell mean
 // >>chng 06 jul 12, from 5.144 to 5.171, use Savin & Gu DR to make mean DR
-assert line luminosity "toth" 0 5.171
+// >>chng 07 jan 20, from 5.171 to 5.188, e2 bug
+assert line luminosity "toth" 0 5.188
 //
 // >>chng 01 dec 21, inner shell yields, 4.959 to 4.997
@@ -54 +56 @@
 // 
 // >>chng 06 nov 29, from -2.532 to -2.601, Badnell DR turned on
-assert carbon 5 ionization -2.601
+// >>chng 07 jan 20, from -2.601 to -2.577, e2 bug
+assert carbon 5 ionization -2.577
 // 
 // >>chng 06 nov 29, from -0.930 to -0.960, Badnell DR turned on
@@ -64 +67 @@
 // >>chng 06 jul 12, from -2.974 to -3.000, use Savin & Gu DR to make mean DR
 // >>chng 06 nov 29, from -3.000 to -3.084, Badnell DR turned on
-assert oxygen 6 ionization -3.084
+// >>chng 07 jan 20, from -3.084 to -3.050, e2 bug
+assert oxygen 6 ionization -3.050
 //
 // >>chng 06 aug 17, from -0.981 to -1.003, update to Badnell dr
 // >>chng 06 nov 29, from -1.003 to -1.047, Badnell DR turned on
-assert oxygen 7 ionization -1.047
+// >>chng 07 jan 20, from -1.047 to -1.024, e2 bug
+assert oxygen 7 ionization -1.024
 //
 // >>chng 06 nov 29, from -0.339 to -0.356, Badnell DR turned on
@@ -83 +88 @@
 // >>chng 06 nov 26,, from -2.244 to -2.888, use Gu et al. UTA data
 // >>chng 06 nov 29, from -2.888 to -1.488, Badnell DR turned on
-assert iron ionization  9       -1.488
+// >>chng 07 jan 20, from -1.488 to -1.517, e2 bug
+assert iron ionization 9 -1.517
 // 
 // >>chng 05 mar 03, from -1.756 to -1.788, new romas uta
@@ -92 +98 @@
 // >>chng 06 nov 26,, from -1.948 to -2.563, use Gu et al. UTA data
 // >>chng 06 nov 29, from -2.563 to -1.038, Badnell DR turned on
-assert iron ionization  10      -1.038
+// >>chng 07 jan 20, from -1.038 to -1.070, e2 bug
+assert iron ionization  10      -1.070
 // 
 // >>chng 05 mar 03, from -1.381 to -1.409, new romas uta
@@ -100 +107 @@
 // >>chng 06 nov 26,, from -1.633 to -2.142, use Gu et al. UTA data
 // >>chng 06 nov 29, from -2.142 to -0.859, Badnell DR turned on
-assert iron ionization  11      -0.859
+// >>chng 07 jan 20, from -1.038 to -0.887, e2 bug
+assert iron ionization  11      -0.887
 // 
 // >>chng 05 mar 03, from -0.763 to -0.787 new romas uta
@@ -106 +114 @@
 // >>chng 06 jul 12, from -1.180 to -1.097, use Savin & Gu DR to make mean DR
 // >>chng 06 aug 17, from -1.097 to -1.043, update to Badnell dr
-// >>chng 06 nov 26,, from -1.043 to -3.608, use Gu et al. UTA data
-// >>chng 06 nov 26,, from -1.633 to -1.353, use Gu et al. UTA data
+// >>chng 06 nov 26, from -1.043 to -3.608, use Gu et al. UTA data
+// >>chng 06 nov 26, from -1.633 to -1.353, use Gu et al. UTA data
 // >>chng 06 nov 29, from -1.353 to -0.822, Badnell DR turned on
-assert iron ionization  12      -0.822
+// >>chng 07 jan 20, from -0.822 to -0.840, e2 bug
+assert iron ionization  12      -0.840
 // 
 // >>chng 05 mar 03, from -0.528 to -0.549, new romas uta
@@ -129 +138 @@
 // >>chng 06 jul 12, from -0.762 to -0.817, use Savin & Gu DR to make mean DR
 // >>chng 06 aug 17, from -0.817 to -0.844, update to Badnell dr
-// >>chng 06 nov 26,, from -0.844 to -0.788, use Gu et al. UTA data
+// >>chng 06 nov 26, from -0.844 to -0.788, use Gu et al. UTA data
 // >>chng 06 nov 29, from -0.788 to -1.279, Badnell DR turned on
-assert iron ionization  15      -1.279
+// >>chng 07 jan 20, from -1.279 to -1.250, e2 bug
+assert iron ionization  15      -1.250
 // 
 // >>chng 05 mar 03, from -1.621 to -1.604, new romas uta
@@ -137 +147 @@
 // >>chng 06 feb 03, from -1.588 to -1.302, guess dr to Badnell mean
 // >>chng 06 jul 12, from -1.302 to -1.358, use Savin & Gu DR to make mean DR
-// >>chng 06 nov 26,, from -1.358 to -1.304, use Gu et al. UTA data
+// >>chng 06 nov 26, from -1.358 to -1.304, use Gu et al. UTA data
 // >>chng 06 nov 29, from -1.304 to -1.519, Badnell DR turned on
-assert iron ionization  16      -1.519
+// >>chng 07 jan 20, from -1.519 to -1.501, e2 bug
+assert iron ionization  16      -1.501
 // 
 // >>chng 05 mar 03, from -0.803 to -0.803, new romas uta
@@ -145 +156 @@
 // >>chng 06 jul 12, from -0.556 to -0.603, use Savin & Gu DR to make mean DR
 // >>chng 06 nov 24, from -0.603 to -0.611, turn on Badnell RR
-// >>chng 06 nov 26,, from -0.611 to -0.581, use Gu et al. UTA data
+// >>chng 06 nov 26, from -0.611 to -0.581, use Gu et al. UTA data
 // >>chng 06 nov 29, from -0.581 to -0.881, Badnell DR turned on
-assert iron ionization  17      -0.881
+// >>chng 07 jan 20, from -0.881 to -0.843, e2 bug
+assert iron ionization  17      -0.843
 // 
 // >>chng 05 mar 03, from -1.256 to -1.202, new romas uta
@@ -154 +166 @@
 // >>chng 06 nov 26,, from -1.403 to -1.374, use Gu et al. UTA data
 // >>chng 06 nov 29, from -1.374 to -1.130, Badnell DR turned on
-assert iron ionization  18      -1.130
+// >>chng 07 jan 20, from -1.130 to -1.096, e2 bug
+assert iron ionization  18      -1.096
 // 
 // >>chng 05 mar 03, from -2.22 to -2.165, new romas uta
@@ -161 +174 @@
 // >>chng 06 nov 26,, from -2.358 to -2.321, use Gu et al. UTA data
 // >>chng 06 nov 29, from -2.321 to -1.706, Badnell DR turned on
-assert iron ionization  19      -1.706
+// >>chng 07 jan 20, from -1.706 to -1.674, e2 bug
+assert iron ionization  19      -1.674
 // 
 // >>chng 05 mar 03, from -3.656 to -3.600, new romas uta
@@ -168 +182 @@
 // >>chng 06 nov 26,, from -3.494 to -3.451, use Gu et al. UTA data
 // >>chng 06 nov 29, from -3.451 to -2.838, Badnell DR turned on
-assert iron ionization  20      -2.838
+// >>chng 07 jan 20, from -2.838 to -2.810, e2 bug
+assert iron ionization  20      -2.810
 // 
 // >>chng 05 mar 03, from -5.473 to -5.421, new romas uta
@@ -175 +190 @@
 // >>chng 06 nov 26,, from -4.886 to -4.838, use Gu et al. UTA data
 // >>chng 06 nov 29, from -4.838 to -4.317, Badnell DR turned on
-assert iron ionization  21      -4.317
-//
-assert nzone < 20
+// >>chng 07 jan 20, from -4.317 to -4.338, e2 bug
+// >>chng 07 jan 20, from -4.338 to -4.294, e2 bug
+assert iron ionization  21      -4.294
+//
+// >>chng 07 jan 20, from 20 to 25 (21) e2 bug
+assert nzone < 25
 //
 // >>chng 05 mar 03, from 6 to 8 

trunk/tsuite/auto/blr_f92.in

@@ -53 +53 @@
 // >>chng 04 apr 28, from 8.469 to 8.435, He+ - H ct rate update
 // >>chng 04 jul 03, from 8.435 to 8.472, NA update CO, H chem net
-assert line luminosity "H- H" 0  8.472
+// >>chng 07 jan 20, from 8.472 to 8.512, e2 bug
+assert line luminosity "H- H" 0  8.512
 //
 // >>chng 02 nov 08, add next assert
@@ -92 +93 @@
 // >>chng 06 jul 18, from 0.240 to 0.354, RP major upgrade VS coll strengths
 // >>chng 06 nov 29, from 0.354 to 0.336, Badnell DR turned on
-assert line "H  1" 1.875m       0.336
+// >>chng 07 jan 20, from 0.336 to 0.356, e2 bug
+assert line "H  1" 1.875m       0.356
 //
 // >>chng 00 oct 03, from 102.9 to 111, cont rebin, H- opac bug

trunk/tsuite/auto/blr_fp89.in

@@ -230 +230 @@
 // >>chng 04 dec 08, from 18.0 to 10.2 co-ion feedback, check converg
 // >>chng 05 mar 25, from 10.2 to 13.1 renorm H pops in level solver
-assert line "H- H"    0    13.1 error 0.15
+// >>chng 07 jan 20, from 13.1 to 15.1 e2 bug
+assert line "H- H"    0    15.1 error 0.15
 //
 // >>chng 02 may 09, from 0.597 to 0.566 elec scat escape

trunk/tsuite/auto/blr_kk81.in

@@ -202 +202 @@
 // >>chng 03 apr 11, from 3.62 to 3.35 PopOpc bug
 // >>chng 05 oct 01, from 3.35 to 3.48, drift
-assert line "totl" 1750     3.48
+// >>chng 07 jan 20, from 3.48 to 3.66 e2 bug
+assert line "totl" 1750     3.66
 //
 // >>chng 01 mar 09, from 1.35 to 1.44 H redis function

trunk/tsuite/auto/blr_n09_p18.in

@@ -40 +40 @@
 // >>chng 03 nov 23, from 5.813 to 5.836, Kraemer et al. guess of dr
 // >>chng 06 jul 25, from 5.836 to 5.856 HN update OIII collision data
-assert line luminosity "totl"  1397 5.856 //total of sum of both Si IV comp
+// >>chng 07 jan 20, from 5.856 to 5.860, e2 bug
+assert line luminosity "totl"  1397 5.860 //total of sum of both Si IV comp
 //
 // >>chng 06 aug 09, from 5.498 to 5.518 Meudon 06, Bowen change

trunk/tsuite/auto/blr_n09_p18_Z20.in

@@ -52 +52 @@
 assert line luminosity "totl"  1402 5.214 //total O IV] 1402 
 // 
-assert line luminosity "totl"  1549 5.980 //total of sum of both C IV comp
+// >>chng 07 jan 20, from 5.980 to 5.955, e2 bug
+assert line luminosity "totl"  1549 5.955 //total of sum of both C IV comp
 // 
 // >>chng 06 nov 29, from 5.394 to 5.415, Badnell DR turned on

trunk/tsuite/auto/blr_n09_p20.in

@@ -40 +40 @@
 // >>chng 06 feb 03, from 5.809 to 5.851, guess dr to Badnell mean
 // >>chng 06 nov 29, from 5.851 to 5.828, Badnell DR turned on
-assert line luminosity "totl"  1397 5.828
+// >>chng 07 jan 20, from 5.828 to 5.860, e2 bug
+assert line luminosity "totl"  1397 5.860
 //
 //total O IV] 1402 

trunk/tsuite/auto/blr_n09_p22.in

@@ -32 +32 @@
 // >>chng 06 apr 22, from 4.515 to 4.675, RP use Badnell DR for He-like
 // >>chng 06 nov 29, from 4.675 to 4.714, Badnell DR turned on
-assert line luminosity "totl"  1035 4.714
+// >>chng 07 jan 20, from 4.714 to 4.754, e2 bug
+assert line luminosity "totl"  1035 4.754
 //
 //total Hydrogen Lyman-alpha 1215.67 
@@ -43 +44 @@
 // >>chng 06 apr 22, from 2.647 to 2.851, RP use Badnell DR for He-like
 // >>chng 06 nov 29, from 2.851 to 2.894, Badnell DR turned on
-assert line luminosity "totl"  1240 2.894
+// >>chng 07 jan 20, from 2.894 to 2.921, e2 bug
+assert line luminosity "totl"  1240 2.921
 //
 //total He II Balmer-alpha 1640

trunk/tsuite/auto/blr_n09_p22_Z20.in

@@ -29 +29 @@
 // >>chng 05 dec 19, from 6.483 to 6.466, update cs Fe10, 11, & 13
 // >>chng 06 jul 18, from 6.466 to 6.511 RP major upgrade VS coll strengths
-assert hydrogen 2 temperature 6.511
+// >>chng 07 jan 20, from 6.511 to 6.439, e2 bug
+assert hydrogen 2 temperature 6.439
 //
 // strong blr lines
@@ -36 +37 @@
 // >>chng 06 jul 18, from 8.580 to 8.543 RP major upgrade VS coll strengths
 // >>chng 06 nov 29, from 8.543 to 8.4289, Badnell DR turned on
-assert line luminosity "totl"  1035 8.4289
+// >>chng 07 jan 20, from 8.429 to 8.692, e2 bug
+assert line luminosity "totl"  1035 8.692
 //
 //total Hydrogen Lyman-alpha 1215.67 
@@ -43 +45 @@
 // >>chng 06 jul 18, from 8.030 to 7.997 RP major upgrade VS coll strengths
 // >>chng 06 nov 29, from 7.997 to 7.857, Badnell DR turned on
-assert line luminosity "totl"  1216 7.857
+// >>chng 07 jan 20, from 7.857 to 8.063, e2 bug
+assert line luminosity "totl"  1216 8.063
 //
 //total of sum of both N V comp
@@ -49 +52 @@
 // >>chng 06 jul 18, from 8.303 to 8.277 RP major upgrade VS coll strengths
 // >>chng 06 nov 29, from 8.277 to 8.150, Badnell DR turned on
-assert line luminosity "totl"  1240 8.150
+// >>chng 07 jan 20, from 8.150 to 8.348, e2 bug
+assert line luminosity "totl"  1240 8.348
 //
 // >>chng 05 mar 02, from 8.047 to 8.079, Romas UTA data update
@@ -55 +59 @@
 // >>chng 06 jul 18, from 7.971 to 7.925 RP major upgrade VS coll strengths
 // >>chng 06 nov 29, from 7.925 to 7.724, Badnell DR turned on
-assert line luminosity "he 2"  1640 7.724 //total He II Balmer-alpha 1640
+// >>chng 07 jan 20, from 7.724 to 8.018, e2 bug
+assert line luminosity "he 2"  1640 8.018 //total He II Balmer-alpha 1640
 //
 // >>chng 04 sep 30, rom 6 to 8, improv heat cool conv in conv_base
@@ -63 +68 @@
 assert niters < 7  
 //
-assert nzone < 330 
+// >>chng 07 jan 20, from 330 to 400 (364) e2 bug
+assert nzone < 400 
 //
 c blr_n09_p22_Z20.in 

trunk/tsuite/auto/blr_n12_p19.in

@@ -43 +43 @@
 // >>chng 06 aug 09, from 5.392 to 5.515 Meudon 06, Bowen change
 // >>chng 06 nov 29, from 5.515 to 5.485, Badnell DR turned on
-assert line luminosity "totl"  1549 5.485 //total of sum of both C IV comp
+// >>chng 07 jan 20, from 5.485 to 5.452, e2 bug
+assert line luminosity "totl"  1549 5.452 //total of sum of both C IV comp
 //
 assert line luminosity "he 2"  1640 6.732 //total He II Balmer-alpha 1640

trunk/tsuite/auto/blr_n12_p19_Z20.in

@@ -37 +37 @@
 // >>chng 04 sep 06, from 5.393 to 5.345, bug nej Auger
 // >>chng 06 aug 09, from 5.345 to 5.403 Meudon 06, Bowen change
-assert line luminosity "totl"  1397 5.403
+// >>chng 07 jan 20, from 5.403 to 5.367, e2 bug
+assert line luminosity "totl"  1397 5.367
 // 
 // >>chng 06 aug 02, from 3.076 to 3.112, update O+2, N+2 CT
 // >>chng 06 aug 09, from 3.112 to 3.220 Meudon 06, Bowen change
-assert line luminosity "totl"  1402 3.220 //total O IV] 1402 
+// >>chng 07 jan 20, from 3.220 to 3.179, e2 bug
+assert line luminosity "totl"  1402 3.179 //total O IV] 1402 
 // 
 // >>chng 06 aug 02, from 5.224 to 5.244, update O+2, N+2 CT
 // >>chng 06 aug 09, from 5.244 to 5.308 Meudon 06, Bowen change
 // >>chng 06 nov 29, from 5.308 to 5.243, Badnell DR turned on
-assert line luminosity "totl"  1549 5.243 //total of sum of both C IV comp
+// >>chng 07 jan 20, from 5.243 to 5.206, e2 bug
+assert line luminosity "totl"  1549 5.206 //total of sum of both C IV comp
 // 
 // >>chng 06 aug 02, from 6.527 to 6.498, update O+2, N+2 CT
@@ -88 +91 @@
 // >>chng 05 aug 03, from 5.945 to 5.803, NA update CO, H chem net
 // >>chng 06 aug 02, from 5.803 to 5.892, update O+2, N+2 CT
-assert line luminosity "totl"  2326 5.892 err 0.2
+// >>chng 07 jan 20, from 5.892 to 5.795, e2 bug
+assert line luminosity "totl"  2326 5.795 err 0.2
 //
 // >>chng 04 jul 07, from 7.807 to 7.833, oh ct integ

trunk/tsuite/auto/blr_n13_p22.in

@@ -76 +76 @@
 // >>chng 04 set 25, from 7.047 to 7.026, chng te conv from 0.02 to 0.005
 // >>chng 06 jul 18, from 7.026 to 7.078, RP major upgrade VS coll strengths
-assert line luminosity "totl"  2326 7.078  //total C II] 2324.69 + 2328.12
+// >>chng 07 jan 20, from 7.078 to 7.027, e2 bug
+assert line luminosity "totl"  2326 7.027  //total C II] 2324.69 + 2328.12
 //
 // >>chng 06 jul 18, from 8.985 to 9.017, RP major upgrade VS coll strengths

trunk/tsuite/auto/blr_nf84.in

@@ -317 +317 @@
 // 
 assert element temperature Iron     4  4.207
-assert element temperature Iron     5  4.237
+// 
+// >>chng 07 jan 20, from 4.237 to 4.258, e2 bug
+assert element temperature Iron     5  4.258
+// 
 assert element temperature Iron     6  4.256
 assert element temperature Iron     7  4.272

trunk/tsuite/auto/blr_nf84_45deg.in

@@ -112 +112 @@
 //
 assert element ionizaiton Oxygen   5 -3.073 error 0.1
-assert element ionizaiton Oxygen   6 -3.591 error 0.1
+//
+// >>chng 07 jan 20, from -3.591 to -3.636, e2 bug
+assert element ionizaiton Oxygen   6 -3.636 error 0.1
+//
 assert element ionizaiton Iron     2 -0.005
 //
@@ -143 +146 @@
 assert element temperature Oxygen   4  4.270
 assert element temperature Oxygen   5  4.277
+//
 assert element temperature Oxygen   6  4.279
+//
 assert element temperature Oxygen   7  4.280
 // 
@@ -161 +166 @@
 assert element temperature Iron     5  4.258
 //
-assert element temperature Iron     6  4.256
+// >>chng 07 jan 20, from 4.256 to 4.277, e2 bug
+assert element temperature Iron     6  4.277
+//
 assert element temperature Iron     7  4.272
 assert element temperature Iron     8  4.276

trunk/tsuite/auto/blr_rnfb.in

@@ -217 +217 @@
 // >>chng 04 nov 15, from 0.213 to 0.375 incorrect upper level for line
 // >>chng 06 jul 18, from 0.375 to 0.433 RP major upgrade VS coll strengths
-assert line "6lev" 8446    0.433, err 0.1
+// >>chng 07 jan 20, from 0.433 to 0.390, e2 bug
+assert line "6lev" 8446    0.390, err 0.1
 //
 // >>chng 01 mar 09, from 1.98 to 2.11 change in H redis function

trunk/tsuite/auto/func_ion_increase.in

@@ -64 +64 @@
 // >>chng 06 nov 24, from -1.981 to -1.936, turn on Badnell RR
 // >>chng 06 nov 29, from -1.939 to -2.645, Badnell DR turned on
-assert volumn ionization iron  9 -2.645 
+// >>chng 07 jan 20, from -2.645 to -2.665, e2 bug
+assert volumn ionization iron  9 -2.665 
 // 
 // >>chng 06 feb 03, from -2.433 to -2.518, guess dr to Badnell mean
@@ -72 +73 @@
 // >>chng 06 nov 26, from -2.539 to -2.571, use Gu et al. UTA data
 // >>chng 06 nov 29, from -2.571 to -3.159, Badnell DR turned on
-assert volumn ionization iron 10 -3.159 
+// >>chng 07 jan 20, from -3.159 to -3.226, e2 bug
+assert volumn ionization iron 10 -3.226 
 // 
 // >>chng 05 sep 27, from -2.701 to -2.718, TE, GS update H chem
@@ -81 +83 @@
 // >>chng 06 nov 26, from -2.988 to -3.028, use Gu et al. UTA data
 // >>chng 06 nov 29, from -3.028 to -3.549, Badnell DR turned on
-assert volumn ionization iron 11 -3.549 
+// >>chng 07 jan 20, from -3.549 to -3.623, e2 bug
+assert volumn ionization iron 11 -3.623 
 // 
 // >>chng 05 sep 27, from -2.949 to -2.966, TE, GS update H chem