Changeset 1998

Show
Ignore:
Timestamp:
04/30/08 14:44:34 (3 weeks ago)
Author:
gary
Message:

assert_results.cpp - send output to consistent file

asserts - carefully going over botched values to rationalize approach

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/source/assert_results.cpp

    r1988 r1998  
    19241924                        if( nISOCaseB == ipH_LIKE ) 
    19251925                        { 
    1926                                 fprintf(ioQQQ,"                Species  nHi nLo  Wl  Computed  Asserted       error\n"); 
     1926                                fprintf(ioASSERT,"                 Species  nHi nLo  Wl  Computed  Asserted       error\n"); 
    19271927                                /* limit of 10 is because that is all we printed and saved in prt_lines_hydro */ 
    19281928                                for( long int ipLo=1+iCase; ipLo< MIN2(10,nHighestPrinted-1); ++ipLo ) 
    …… 
    19841984                                                                fprintf( ioASSERT, " ChkAssert botch>>"); 
    19851985                                                        } 
    1986                                                         fprintf(ioQQQ," %s %3li %3li ",  
     1986                                                        fprintf(ioASSERT," %s %3li %3li ",  
    19871987                                                                chElemLabelCaseB , ipHi , ipLo ); 
    1988                                                         prt_wl(ioQQQ, wl ); 
    1989                                                         fprintf(ioQQQ," %.2e %.2e %10.3f",  
     1988                                                        prt_wl(ioASSERT, wl ); 
     1989                                                        fprintf(ioASSERT," %.2e %.2e %10.3f",  
    19901990                                                                absint , CBabsint , error ); 
    19911991                                                } 
    …… 
    19931993                                                        TotalInsanity(); 
    19941994                                                if( fabs(error) > AssertError[i]  ) 
    1995                                                         fprintf(ioQQQ , " botch \n"); 
     1995                                                        fprintf(ioASSERT , " botch \n"); 
    19961996                                                else 
    1997                                                         fprintf(ioQQQ , "\n"); 
     1997                                                        fprintf(ioASSERT , "\n"); 
    19981998 
    19991999                                                PredQuan[i] = 0; 
    …… 
    20072007                                        } 
    20082008                                } 
    2009                                 fprintf(ioQQQ,"\n"); 
     2009                                fprintf(ioASSERT,"\n"); 
    20102010                        } 
    20112011                        else if( nISOCaseB == ipHE_LIKE ) 
    …… 
    20232023                                4026.f, 6678.f, 4922.f }; 
    20242024                                /* do He I as special case */ 
    2025                                 fprintf(ioQQQ,"                     Wl  Computed  Asserted       error\n"); 
     2025                                fprintf(ioASSERT,"                     Wl  Computed  Asserted       error\n"); 
    20262026                                for( long int ipLine=0; ipLine< N_CASEB_HEI ; ++ipLine ) 
    20272027                                { 
    …… 
    20742074                                                        fprintf( ioASSERT, " ChkAssert botch>>"); 
    20752075                                                } 
    2076                                                 prt_wl(ioQQQ, wl ); 
    2077                                                 fprintf(ioQQQ," %.2e %.2e %10.3f",  
     2076                                                prt_wl(ioASSERT, wl ); 
     2077                                                fprintf(ioASSERT," %.2e %.2e %10.3f",  
    20782078                                                        absint , CBabsint , error ); 
    20792079                                        } 
    …… 
    20812081                                                TotalInsanity(); 
    20822082                                        if( fabs(error) > AssertError[i]  ) 
    2083                                                 fprintf(ioQQQ , " botch \n"); 
     2083                                                fprintf(ioASSERT , " botch \n"); 
    20842084                                        else 
    2085                                                 fprintf(ioQQQ , "\n"); 
     2085                                                fprintf(ioASSERT , "\n"); 
    20862086 
    20872087                                        PredQuan[i] = 0; 
    …… 
    20932093                                        ++assertresults.nSumErrorCaseAssert; 
    20942094                                } 
    2095                                 fprintf(ioQQQ,"\n"); 
     2095                                fprintf(ioASSERT,"\n"); 
    20962096                        } 
    20972097                        else 
    …… 
    21072107                        if( !dense.lgElmtOn[ipZ] ) 
    21082108                        { 
    2109                                 fprintf(ioQQQ," asserted element %ld is not turned on!\n",ipZ); 
     2109                                fprintf(ioQQQ,"PROBLEM asserted element %ld is not turned on!\n",ipZ); 
    21102110                                PredQuan[i] = 0; 
    21112111                                RelError[i] = 0.; 
    …… 
    21362136                        if( !dense.lgElmtOn[ipZ] ) 
    21372137                        { 
    2138                                 fprintf(ioQQQ," asserted element %ld is not turned on!\n",ipZ); 
     2138                                fprintf(ioQQQ,"PROBLEM asserted element %ld is not turned on!\n",ipZ); 
    21392139                                PredQuan[i] = 0.; 
    21402140                                RelError[i] = 0.; 
    …… 
    27342734                if( assertresults.nSumErrorCaseAssert>0 ) 
    27352735                { 
    2736                         fprintf(ioQQQ,"\n The mean of the %li assert Case A, B relative " 
     2736                        fprintf(ioASSERT,"\n The mean of the %li assert Case A, B relative " 
    27372737                                "residuals is %.2f\n\n" ,  
    27382738                                assertresults.nSumErrorCaseAssert, 

  • trunk/tsuite/auto/blr_hizqso.in

    r1958 r1998  
    7676// >>chng 06 nov 29, from 7.579 to 7.605, Badnell DR turned on 
    7777// >>chng 08 apr 20, incr error to more realistic 10% 
    78 assert line luminosity "He 2" 303.8A 7.605 0.1 
     78// >>chng 08 apr 30, from 7.61 to 7.55, H, He topoff change 
     79assert line luminosity "He 2" 303.8A 7.55 0.2 
    7980// 
    8081// >>chng 01 jul 04, from 1.442 to 1.859 diffuse fields 

  • trunk/tsuite/auto/blr_level2.in

    r1709 r1998  
    162162// >>chng 06 jul 18, from -2.327 to -2.370, RP major upgrade VS coll strengths 
    163163// >>chng 07 nov 29, from -2.370 to -2.324 update DR rates 
    164 assert ionization Helium   1 -2.324 
     164// >>chng 08 apr 30, from -2.324 to -2.37 H, He topoff change 
     165assert ionization Helium   1 -2.37 error 0.1 
    165166// 
    166167assert ionization Helium   2 -0.146 

  • trunk/tsuite/auto/blr_nf84_45deg.in

    r1935 r1998  
    129129// >>chng 05 mar 25, from -2.79 to -2.71, renorm H pops in level solver 
    130130// >>chng 08 apr 10, from -2.71 to -2.66, change default h-like levels, other minor changes 
    131 assert element ionizaiton Iron     3 -2.66 error 0.1 
     131// >>chng 08 apr 30, from -2.66 to -2.73 H, He topoff change 
     132assert element ionizaiton Iron     3 -2.73 error 0.1 
    132133// 
    133134// >>chng 06 aug 09, from -2.638 to -2.586 Meudon 06, Bowen change 

  • trunk/tsuite/auto/grains_qheat.in

    r1488 r1998  
    22c 
    33c commands controlling continuum ========= 
    4 table ism 
    5 extinguish column=22 leak=0 
     4table draine 
     5extinguish 20 
    66c 
    77c commands for density & abundances ========= 
    88hden 0 
    9 abundances old solar 84  
    10 constant density 
    119c turns on grains with default abundance (log abundance ratio to ism = 0) 
    12 c and with quantum heating enabled by default (disabled with "no grains_qheat" option) 
    13 grains 0. "silicate_ism_10.opc"  
     10c and with quantum heating enabled by default 
     11c (disabled with "no grains qheat" option) 
     12grains 0. "silicate_ism_10.opc" 
    1413c 
    1514c commands controlling geometry  ========= 
    …… 
    1817c 
    1918c other commands for details     ========= 
     19cosmic rays background 
    2020iterate 
    2121print last iteration 
    22 c this is included to that continuum pumping of H atom not important 
    23 case b 
    2422c 
    2523c commands controlling output    ========= 
    …… 
    2826print line faint -2 
    2927print line column 
    30 print h-like departure hydrogen 
    3128punch asserts last "grains_qheat.asr" 
    3229punch grains temperature last "grains_qheat.qht" 
    33 punch continuum  "grains_qheat.con" units microns 
     30punch continuum  "grains_qheat.con" units microns last 
    3431punch two photon continuum "grains_qheat.2nu" units microns 
    3532c 
    3633c commands giving the asserts    ========= 
    37 // all these changed lots when case b added 
    38 // >>chng 01 apr 11, moved all lines to luminosity rather than 
    39 //                   intensity, so changes in c 2 do not change asserts 
    40 // >>chng 02 jan 07, H2 form on grains, adnd temp, changed, -27.127 to -26.905 
    41 // >>chng 02 apr 03, from  -26.905 to -26.863, bound compton  
    42 // >>chng 02 dec 11, from -26.863 to -26.895, new hei 
    43 // >>chng 03 mar 08, from -26.895 to -27.150, grn surf recom, solomon bugs 
    44 // >>chng 04 feb 21, from -27.150 to -27.189, update chem, H- ct, grn recom 
    45 // >>chng 05 jul 05, from -27.189 to -27.183, fine tune 
    46 assert line intensity "C  2"  157.6m -27.183 
     34assert line intensity "C  2"  157.6m -26.769 
    4735// 
    48 // >>chng 01 nov 27, nFnu changed by -0.2 dex when physics upgraded 
    49 assert line intensity "nFnu"  60.83m -24.970 
     36assert line intensity "o  1"  63.17m -28.699 error 0.1 
    5037// 
    51 assert line intensity "nFnu"  41.22m  -25.916 
    52 assert line intensity "nFnu"  30.87m  -26.830 
    53 assert line intensity "nFnu"  24.78m  -27.765 
    54 assert line intensity "nFnu"  21.42m  -28.509 
    55 // 
    56 // >>chng 07 oct 22, from -28.992 to -28.939, resolve l-levels of h-like sequence  
    57 assert line intensity "nFnu"  19.62m  -28.939 
    58 // 
    59 // >>chng 07 oct 22, from -29.639 to -29.376, resolve l-levels of h-like sequence  
    60 assert line intensity "nFnu"  17.37m  -29.376 
     38assert temperature hydrogen 2 64.4 
    6139//  
    62 // >>chng 06 oct 20, from -29.692 to -29.723, ? ? 
    63 // >>chng 06 dec 18, from -29.723 to -29.692, bugfix in r730 
    64 // >>chng 07 oct 22, from -29.692 to -29.283, resolve l-levels of h-like sequence  
    65 assert line intensity "nFnu"  14.60m  -29.283 
    66 //  
    67 // >>chng 06 oct 20, from -29.290 to -29.315, ? ? 
    68 // >>chng 06 dec 18, from -29.315 -29.289, bugfix in r730 
    69 // >>chng 07 oct 22, from -29.289 to -28.926, resolve l-levels of h-like sequence  
    70 assert line intensity "nFnu"  11.40m  -28.926 
    71 //  
    72 // >>chng 06 oct 20, from -29.053 to -29.078, ? ? 
    73 // >>chng 06 dec 18, from -29.078 -29.052, bugfix in r730 
    74 // >>chng 07 oct 22, from -29.052 to -28.687, resolve l-levels of h-like sequence  
    75 assert line intensity "nFnu"   9.480m -28.687 
    76 //  
    77 // >>chng 06 oct 20, from -28.995 to -29.034, ? ? 
    78 // >>chng 06 dec 18, from -29.034 -28.998, bugfix in r730 
    79 // >>chng 07 oct 22, from -28.998 to -28.552, resolve l-levels of h-like sequence  
    80 assert line intensity "nFnu"   8.210m -28.552 
    81 //  
    82 // >>chng 06 oct 20, from -28.769 to -28.800, ? ? 
    83 // >>chng 06 dec 18, from -28.800 -28.768, bugfix in r730 
    84 // >>chng 07 oct 22, from -28.768 to -28.344, resolve l-levels of h-like sequence  
    85 assert line intensity "nFnu"   7.050m -28.344 
    86 //  
    87 // >>chng 07 oct 22, from -26.340 to -26.274, resolve l-levels of h-like sequence  
    88 assert line intensity "nFnu"   2.324m -26.274 
    89 // 
    90 // >>chng 07 oct 22, from -25.472 to -25.448, resolve l-levels of h-like sequence  
    91 assert line intensity "nFnu"   1.643m -25.448 
    92 assert line intensity "nFnu"   1.480m -25.218 
    93 assert line intensity "nFnu"   1.436m -25.146 
    94 assert line intensity "nFnu"   1.119m -24.699 
    95 assert line intensity "nFnu"   1.119m -24.699 
    96 assert line intensity "nFnu"    8330A -24.386 
    97 // 
    98 // >>chng 02 jan 07, H2 form on grains, adnd temp, changed, -28.440 to -28.348 
    99 // >>chng 02 jun 27, from -28.348 to -28.321, h2 grain form rate change 
    100 // >>chng 03 mar 08, from -28.321 to -28.450, grn surf recom, solomon bugs 
    101 // >>chng 05 jul 05, from -28.450 to -28.459, fine tune 
    102 assert line intensity "o  1"  63.17m -28.459 error 0.1 
    103 // 
    104 // >>chng 02 jan 07, H2 form on grains, adnd temp, changed, 40.2 to 52.6 
    105 // >>chng 02 apr 03, from  52.6 to 54.3 bound compton  
    106 // >>chng 03 mar 08, from 54.3 to 39.2 grn surf recom, solomon bugs 
    107 // >>chng 04 jul 22, from 39.2 to 37.7, drift down 
    108 // >>chng 05 jul 05, from 37.7 to 36.7, fine tune 
    109 assert temperature hydrogen 2 36.7 
     40assert line intensity "nFnu" 122.4m -23.976 
     41assert line intensity "nFnu" 60.83m -24.774 
     42assert line intensity "nFnu" 41.22m -25.713 
     43assert line intensity "nFnu" 30.87m -26.596 
    11044c 
    11145c grains_qheat.in 
    …… 
    11448c  
    11549 
     50This sim produces dust emission with a Wein trail that is 
     51dominated by quantum heating emission. 
    11652 
    117 the level 2 lines are left in, in this model.  Many UV lines are 
    118 artifically too strong, for a physical reason.  The calculated model 
    119 is optically thin, so continuum pumping is extremely important.  In the real 
    120 ISM this process would occur but would be much weaker in the global 
    121 spectrum, because the lines would become optically thick, and 
    122 line shielding over a large column would limit the effect. 
    123  
    124  

  • trunk/tsuite/auto/hii_blister.in

    r1925 r1998  
    2323c from being important - the other codes did not include this important 
    2424c physical process 
    25 turbulence 10 
     25turbulence 10 km/s 
    2626c must iterate since optically thick 
    2727iterate 
    …… 
    5656punch dr last "hii_blister.dr" 
    5757punch results last "hii_blister.rlt" 
     58print line optical depths 
    5859c 
    5960c commands giving the asserts    ========= 
    …… 
    6667// >>chng 05 oct 01, from 0.131 to 0.117, RP update He levels 
    6768// >>chng 05 dec 22, from 0.117 to 0.123, RP incr levels he 
    68 assert line "he 1" 5876  0.123 
     69// >>chng 08 apr 30, from 0.123 to 0.1042H, He topoff change 
     70assert line "He 1" 5876  0.142 
     71assert line "+Col" 5876 0.128 
     72//  
     73assert line "he 1" 3889  0.123 
     74assert line "+Col" 3889 0.104 
     75//  
     76assert line "he 1" 7065  0.0843 
     77assert line "+Col" 7065 0.0307 
     78//  
     79assert line "he 1" 4471  0.0476 
     80assert line "+Col" 4471 0.0445 
    6981// 
    7082// >>chng 99dec06, from 0.834 to 0.791, answer had slowly drifted down 
    7183// >>chng 00 sep 29, from 0.791 to 0.837, H- opacity bug 
    7284//assert line "totl" 10830 0.837 
     85//  
    7386// >>chng 02 dec 11, new entry, new hei 
    7487// >>chng 05 mar 12, from 0.848 to 0.899, RP merge He-like code 
    …… 
    100113// >>chng 05 dec 22, from 0.388 to 0.427, RP incr levels he 
    101114// >>chng 06 nov 29, from 0.427 to 0.349, Badnell DR turned on 
    102 assert line "N  2" 6584  0.349 error 0.1 
     115// >>chng 08 apr 30, from 0.349 to 0.396 H, He topoff change 
     116assert line "N  2" 6584  0.396 error 0.1 
    103117// 
    104118assert line "N  3"  57.21m  0.038 
    …… 
    201215// >>chng 06 nov 29, from 0.0983 to 0.0792, Badnell DR turned on 
    202216// >>chng 08 apr 07, from 0.0792 to 0.0909, a number of mostly minor iso changes 
    203 assert HHeicf 0.0909 error 0.01 
     217// >>chng 08 apr 30, from 0.0909 to 0.107 H, He topoff change 
     218assert HHeicf 0.107 error 0.01 
    204219// 
    205220// >>chng 02 dec 13, from 6 to 5, better conv 

  • trunk/tsuite/auto/hii_paris.in

    r1925 r1998  
    7474assert line "Q(H)" 4861 > 1. 
    7575assert line "Q(H)" 4861 < 1.05 
    76 // 
    77 // >>chng 07 oct 22, from 0.3708 to 0.3318, resolve l-levels of h-like sequence 
    78 assert line "H  1" 1.875m 0.3318 
     76//  
    7977// >>chng 01 sep 24, from 24.71 to 23.34 2s2p br chng 
    8078// >>chng 07 dec 06, from 23.34 to 24.63, changes in h-like collisions 
    …… 
    8381assert line "h  1" 0 9.76 
    8482// 
     83// >>chng 07 oct 22, from 0.3708 to 0.3318, resolve l-levels of h-like sequence 
     84// >>chng 08 apr 30, from 0.332 to 0.380 H, He topoff change 
     85assert line "H  1" 1.875m 0.380 
     86assert line "Ca B" 1.875m 0.363 
     87//  
     88assert line "H  1" 6563 2.96 
     89assert line "Ca B" 6563 2.92 
     90// 
    8591// >>chng 04 sep 12, from 17.62 to 18.5, drift up 
    8692assert line "Bac " 3646 18.5 
    8793//  
    88 // assert line "totl" 5 876 0.1175 
    8994// >>chng 02 nov 20, add this line 
    9095// >>chng 03 feb 28, from 0.105 to 0.113, better hei coll 
    9196// >>chng 05 jul 06, from 0.113 to 0.118, fine tune 
    9297// >>chng 05 oct 01, from 0.118 to 0.102, RP update He levels 
    93 assert line "he 1" 5876 0.102 
     98// >>chng 08 apr 30, from 0.102 to 0.123 H, He topoff change 
     99assert line "He 1" 5876 0.123 
     100assert line "+Col" 5876 0.116 
    94101//  
    95102// >>chng 06 aug 11, from 0.102 to 0.208, Meudon 06, use Badnell RR DR 
    96 assert line "totl" 10830 0.208 
     103assert line "He 1" 10830 0.208 
     104assert line "+Col" 10830 0.202 
     105//  
     106assert line "He 1" 7065 0.208 
     107assert line "+Col" 7065 0.0177 
     108//  
     109assert line "He 1" 3889 0.208 
     110assert line "+Col" 3889 0.0884 
    97111//  
    98112// >>chng 02 nov 20, from 0.0227 to 0.0212, new he diff ots 
    …… 
    101115// >>chng 05 jul 05, from 0.0206 to 0.0216 cdsqte err, incr err 
    102116// >>chng 05 oct 01, from 0.0216 to 0.0205, RP update He levels 
    103 assert line "he 1" 20580 0.0205 
     117// >>chng 08 apr 30, stop asserting this 
     118// assert line "he 1" 20580 0.0205 
    104119//  
    105120// >>chng 00 sep 12, from 0.15 to 0.140, change in s3 cs 
    …… 
    117132// >>chng 05 oct 01, from 0.0278 to 0.0263, RP update He levels 
    118133// >>chng 06 aug 11, from 0.0263 to 0.0248, Meudon 06, use Badnell RR DR 
    119 assert line "N  2"  121.7m 0.0248 
     134// >>chng 08 apr 30, from 0.0248 to 0.0261 H, He topoff change 
     135assert line "N  2"  121.7m 0.0261 
    120136//  
    121137// >>chng 00 dec 12, from 0.578 to 0.489, change in [NII] cs 
    …… 
    163179assert line "Ne 2"  12.81m 0.191 
    164180//  
    165 assert line "Ne 3"  15.55m 0.294 
     181// >>chng 08 apr 30, from 0.294 to 0.279 H, He topoff change 
     182assert line "Ne 3"  15.55m 0.279 
    166183//  
    167184// >>chng 06 jul 06, add this line 
    …… 
    232249// >>chng 08 mar 22, from 0.212 to 0.219 bugfix r1879 
    233250// >>chng 08 apr 07, from 0.219 to 0.224, a number of mostly minor iso changes 
    234 assert HHeicf 0.224 error 0.005 
     251// >>chng 08 apr 30, from 0.224 to 0.232, H, He topoff change, inc error to 0.01 
     252assert HHeicf 0.232 error 0.01 
    235253// 
    236254c hii_paris.in 

  • trunk/tsuite/auto/h_otsopen.in

    r1488 r1998  
    1616c other commands for details     ========= 
    1717c must iterate to get inward line fractions, that are asserted below 
    18 iterate 
     18iterate  
    1919diffuse ots 
    2020atom h-like levels resolved 10 
    …… 
    3636c due to Lyman line leakage.  we iterated, so have a good estimate of 
    3737c inward and outward fractions, which we test  
    38 assert line "Q(H)" 4861 > 1.0  %>1 due to lyman line leaking 
     38// >>chng 08 apr 30, from >1 to 1 H, He topoff change 
     39assert line "Q(H)" 4861 1.0  % 
     40//  
    3941assert line "Q(H)" 4861 < 1.1  %>but not a lot less 
    4042* 99jun26, error had been just under 2%, increased above it when optical 

  • trunk/tsuite/auto/orion_hii_open.in

    r1913 r1998  
    4848// >>chn 05 mar 07, add this to test suite  
    4949assert line "totl" 4861 intensity -11.253 
     50//  
     51assert line "H  1" 3889A 0.107 
     52assert line "Ca B" 3889A 0.105 
    5053// 
    5154// >>chng 05 jun 05, from 0.143 to 0.137, RP update he-like iso seq 
    5255// >>chng 05 oct 01, from 0.137 to 0.123, RP update He levels 
    5356// >>chng 05 dec 22, from 0.123 to 0.129, RP incr levels he 
    54 assert line "he 1" 5876 0.129 
     57// >>chng 08 apr 30, from 0.129 to 0.147 H, He topoff change 
     58assert line "He 1" 5876 0.147 
     59assert line "+Col" 5876 0.133 
     60//  
     61assert line "He 1" 3889 0.0192 
     62assert line "+Col" 3889 0.114 
     63//  
     64assert line "He 1" 7065 0.0990 
     65assert line "+Col" 7065 0.0381 
     66//  
     67assert line "He 1" 4471 0.0490 
     68assert line "+Col" 4471 0.0456 
     69//  
     70assert line "He 1" 6678 0.0377 
     71assert line "+Col" 6678 0.0358 
    5572// 
    5673// >>chng 08 apr 03, from 0.591 to 0.428, include 10830 in fine opacity array 
    57 assert line "totl" 10830 0.428 
     74assert line "He 1" 10830 0.428 
     75assert line "+Col" 10830 0.428 
    5876// 
    5977// >>chng 05 oct 01, from 0.313 to 0.287, RP update He levels 
    …… 
    7088// >>chng 05 dec 22, from 0.495 to 0.519, RP incr levels he 
    7189// >>chng 06 nov 29, from 0.519 to 0.446, Badnell DR turned on 
    72 assert line "n  2" 6584 0.446 
     90// >>chng 08 apr 30, from 0.446 to 0.474 H, He topoff change 
     91assert line "n  2" 6584 0.474 
    7392// 
    7493// >>chng 06 nov 24, from 1.360 to 1.426, turn on Badnell RR