Changeset 2016

Show
Ignore:
Timestamp:
05/03/08 14:47:57 (2 weeks ago)
Author:
gary
Message:

parse_commands.cpp - write 0.2f to avoid compiler warning

*.in finish updating auto to current head of trunk - should pass with no botches or close values

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/source/parse_commands.cpp

    r2013 r2016  
    17561756                                /* turbulent velocity */ 
    17571757                                optimize.vparm[0][optimize.nparm] = DoppVel.TurbVel/1e5f; 
    1758                                 optimize.vincr[optimize.nparm] = 0.2*optimize.vparm[0][optimize.nparm]; 
     1758                                optimize.vincr[optimize.nparm] = 0.2f*optimize.vparm[0][optimize.nparm]; 
    17591759                                ++optimize.nparm; 
    17601760                        } 

  • trunk/tsuite/auto/blr_n09_p20.in

    r2001 r2016  
    3030assert line luminosity "totl"  1035 8.392 //total of sum of both O VI comp 
    3131//  
    32 assert line luminosity "totl"  1216 8.290 //total Hydrogen Lyman-alpha 1215.67  
     32// >>chng 08 apr 30, from 8.290 to 8.269 H, He topoff change 
     33assert line luminosity "totl"  1216 8.269 //total Hydrogen Lyman-alpha 1215.67  
    3334//  
    3435//total of sum of both N V comp 

  • trunk/tsuite/auto/blr_n12_p19_Z20.in

    r1958 r2016  
    6262// >>chng 06 aug 02, from 6.527 to 6.498, update O+2, N+2 CT 
    6363// >>chng 08 mar 17, from 6.498 to 6.588, r1844 - mostly iso PopOpc and rt_line_one_tauinc changes 
    64 assert line luminosity "he 2"  1640 6.588 //total He II Balmer-alpha 1640 
     64// >>chng 08 apr 30, from 6.588 to 6.609 H, He topoff change 
     65assert line luminosity "he 2"  1640 6.609 //total He II Balmer-alpha 1640 
    6566//  
    6667// >>chng 06 aug 02, from 4.709 to 4.734, update O+2, N+2 CT 

  • trunk/tsuite/auto/blr_n13_p22.in

    r1873 r2016  
    104104// >>chng 07 oct 22, from 6.995 to 6.930, resolve l-levels of h-like sequence 
    105105// >>chng 08 mar 20, from 6.930 to 6.920, dbl precision gets diff answer, take average, widen 
    106 assert line luminosity "totl"  2326 6.920 0.10 //total C II] 2324.69 + 2328.12 
     106// >>chng 08 apr 30, from 6.920 to 6.877 H, He topoff change 
     107assert line luminosity "totl"  2326 6.877 0.10 //total C II] 2324.69 + 2328.12 
    107108// 
    108109// >>chng 06 jul 18, from 8.985 to 9.017, RP major upgrade VS coll strengths 

  • trunk/tsuite/auto/blr_rnfa.in

    r2001 r2016  
    376376// 
    377377// >>chng 06 nov 29, from -2.672 to -2.651 Badnell DR turned on 
    378 assert ionization Helium   3 -2.651 
     378// >>chng 08 apr 30, from -2.651 to -2.631 H, He topoff change 
     379assert ionization Helium   3 -2.631 
    379380// 
    380381assert ionization Carbon   2 -0.006 

  • trunk/tsuite/auto/func_globule.in

    r1669 r2016  
    2828// >>chng 07 nov 17, from 1.10 to 1.17, changes in r1512 
    2929assert line "Q(H)" 4861 1.17 
    30 assert line luminosity "totl" 4861 1.607 
     30//  
     31// >>chng 08 apr 30, from 1.607 to 1.586 H, He topoff change 
     32assert line luminosity "totl" 4861 1.586 
    3133// 
    3234// >>chng 04 sep 16, from 1.95 to 1.86, increase conv edentrue 
    3335// >>chng 07 mar 20 from 1.86 to 1.77, due to chng in r987 
    34 assert line "totl" 2326 1.77 
     36// >>chng 08 apr 30, from 1.77 to 1.85 H, He topoff change 
     37assert line "totl" 2326 1.85 
    3538//  
    3639assert temperature Hydrogen 2  4.021 

  • trunk/tsuite/auto/func_ion_increase.in

    r1958 r2016  
    3636assert volumn ionization iron  2 -0.913  
    3737//  
    38 assert volumn ionization iron  3 -0.411  
     38// >>chng 08 apr 30, from -0.411 to -0.432 H, He topoff change 
     39assert volumn ionization iron  3 -0.432  
    3940//  
    4041// >>chng 06 aug 09, from -0.594 to -0.566 Meudon 06, Bowen change 

  • trunk/tsuite/auto/hhe_otspp.in

    r2001 r2016  
    3333// >>chng 08 apr 19, incr error from 0.02 to 0.05 since nl model has more 
    3434// limited accuracy 
    35 assert line "totl" 4861 = 0.99 % Ha optical depth not zero 
     35assert line "H  1" 4861 = 0.99 % Ha optical depth not zero 
    3636// 
    3737// >>chng 02 dec 10, from 1 to 1.076, HeI 23P A 
    …… 
    4444// >>chng 02 dec 10, from 1.085 to 1.164, HeI 23P A 
    4545// >>chng 02 dec 11, from 1.164 to 1.167, new hei 
    46 assert line "totl" 10830 1.167 
     46// >>chng 08 apr 30, from 1.167 to 1.104 H, He topoff change 
     47assert line "He 1" 10830 1.104 
     48//  
    4749assert line "+Col" 10830 1.167 
    4850// 
    …… 
    5355// >>chng 05 oct 01, from 0.130 to 0.120, RP update levels 
    5456// >>chng 05 dec 20, from 0.120 to 0.126, RP change default helium levels 
    55 assert line "He 1" 5876  0.126 
    56 assert line "+Col" 5876  0.126 
     57// >>chng 08 apr 30, from 0.126 to 0.139 H, He topoff change 
     58assert line "He 1" 5876  0.139 
     59// >>chng 08 apr 30, from 0.126 to 0.131 H, He topoff change 
     60assert line "+Col" 5876  0.131 
    5761// 
    5862// >>chng 02 dec 11, from 0.0475 to 0.0449, new hei 
    …… 
    6468assert line "He 1" 4471  0.0448 
    6569// 
    66 // >>chng 99 Jun15, change from .018 when lya converged better 
    67 // >>chng 99 Nov24, back to 0.018 from 0.020, change in min ots rate? 
    68 // >>chng 02 dec 10, from 0.018 to 0.0168, HeI 23P A 
    69 // assert line "TOTL" 3889  0.0168  
    7070// >>chng 02 dec 10, from 0.018 to 0.0168, HeI 23P A 
    7171// >>chng 02 dec 10, from 0.0168 to 0.0186, HeI 23P A 
    …… 
    7373// >>chng 03 nov 10, from 0.0171 to 0.0188, impr he0 zoning 
    7474// >>chng 06 jul 18, from 0.0188 to 0.0198 RP major upgrade VS coll strengths 
    75 assert line "He 1" 3889  0.0198  
    76 assert line "+Col" 3889  0.0198  
     75// >>chng 08 apr 30, from 0.0198 to 0.0179 H, He topoff change 
     76assert line "He 1" 3889  0.0179  
     77assert line "+Col" 3889  0.104  
    7778// 
    7879// assert line "TOTL" 7065  0.076 
    7980// >>chng 02 dec 10, from 0.1008 to 0.0957, HeI 23P A 
    8081// >>chng 03 feb 28, from 0.0957 to 0.0907, better hei coll 
    81 assert line "He 1" 7065  0.0907 
    82 assert line "+Col" 7065  0.0907 
     82// >>chng 08 apr 30, from 0.0907 to 0.0847 H, He topoff change 
     83assert line "He 1" 7065  0.0847 
     84assert line "+Col" 7065  0.0310 
    8385// 
    84 // >>chng 00 aug 21, from 0.031 to 0.033 chng HeI sing 2-phot A 
    85 // >>chng 02 jan 05, 0.033 to 0.031, chng HeI Lya redis fcn 
    86 // >>chng 02 nov 20, from 0.033 to 0.0307, new he atom diff ots 
    87 // assert line "TOTL"  20580  0.0307 
    8886// >>chng 02 nov 20, from 0.031 to 0.0328, new he atom diff ots 
    8987// >>chng 05 mar 12, from 0.0328 to 0.0296, RP merge He-like code 
    …… 
    9189assert line "He 1"  20580  0.0310 
    9290// 
    93 assert hydrogen 1 ionization fraction -2.023 
     91// >>chng 08 apr 30, from -2.023 to -2.040 H, He topoff change 
     92assert hydrogen 1 ionization fraction -2.040 
    9493// 
    9594assert hydrogen 2 ionization fraction -0.004 

  • trunk/tsuite/auto/hhe_otssp.in

    r1955 r2016  
    3131// >>chng 07 mar 20, from 1.000 to 1.010, due to chng in r987 
    3232// >>chng 08 apr 07, from 1.010 to 0.992, a number of mostly minor iso changes 
    33 assert line "totl" 4861 = 0.992 error 0.01 % should be within 1% of precise 
     33// >>chng 08 apr 30, from 0.992 to 0.975 H, He topoff change 
     34assert line "H  1" 4861 = 0.975 
    3435//  
    3536// >>chng 02 nov 20, from error 0.06 to 1.07, change assert to the value 
    …… 
    3839// >>chng 07 oct 22, from 0.3512 to 0.3235, resolve l-levels of h-like sequence 
    3940// >>chng 08 apr 19, incr error since nl atom has more limited accuracy 
    40 assert line "H  1" 1.875m = 0.3235 %Paschen alpha 
     41assert line "H  1" 1.875m = 0.324 %Paschen alpha 
     42assert line "Ca B" 1.875m = 0.349 %Paschen alpha 
    4143// 
    4244// >>chng 07 oct 22, from 0.1693 to 0.1623, resolve l-levels of h-like sequence 
    …… 
    4648// >>chng 07 oct 22, from 0.0858 to 0.0738, resolve l-levels of h-like sequence 
    4749// >>chng 08 apr 07, from 0.0738 to 0.0721, a number of mostly minor iso changes 
    48 assert line "H  1" 4.051m = 0.0721 %Bracket alpha 
     50// >>chng 08 apr 30, from 0.0721 to 0.0778 H, He topoff change 
     51assert line "H  1" 4.051m = 0.0778 %Bracket alpha 
     52assert line "Ca B" 4.051m = 0.0830 %Bracket alpha 
    4953//  
    5054// >>chng 07 oct 22, from 0.0477 to 0.0440, resolve l-levels of h-like sequence 
    …… 
    6569// >>chng 05 oct 01, from 0.0974 to 0.0892, RP update levels 
    6670// >>chng 05 dec 20, from 0.0892 to 0.0937, RP change default helium levels 
    67 assert line "He 1" 5876  0.0937 
     71// >>chng 08 apr 30, from 0.0937 to 0.1037 H, He topoff change 
     72assert line "He 1" 5876  0.1037 
     73assert line "+Col" 5876  0.1037 
    6874// 
    6975// >>chng 04 may 19, from 0.034 to 0.0367, RP update helike sequence 
    7076// >>chng 06 may 08, from 0.0367 to 0.0354, RP update high-n As H-like 
    71 assert line "Ca B" 4471  0.0354 
     77assert line "+Col" 4471  0.0354 
    7278// 
    7379// >>chng 05 mar 12, from 0.0358 to 0.0341, RP merge He-like code 
    7480assert line "He 1" 4471  0.0341 
    7581// 
    76 // assert line "TOTL" 3889  0.068 
    77 assert line "He 1" 3889  0.0781 
     82// >>chng 08 apr 30, from 0.0781 to 0.0727 H, He topoff change 
     83assert line "He 1" 3889  0.0727 
     84assert line "+Col" 3889  0.0813 
    7885// 
    7986// >>chng 01 mar 02, change to sphere, from 0.028 to 0.030 
    80 // assert line "TOTL" 7065  0.030 
    8187assert line "He 1" 7065  0.030 
     88assert line "+Col" 7065  0.0242 
    8289// 
    8390// >>chng 02 jan 05, from 0.026 to 0.024, HeI Lya redi fcn 
    84 // assert line "TOTL"  20580  0.024 
    8591// >>chng 05 oct 01, from 0.024 to 0.0228, RP update levels 
    8692// >>chng 05 dec 20, from 0.0228 to 0.024, RP change default helium levels 
    …… 
    98104// >>chng 05 dec 20, from 0.1446 to 0.1550, RP change default helium levels 
    99105// >>chng 08 mar 22, from 0.1550 to 0.1646 bugfix r1879 
    100 assert hheicf 0.1646 error 0.01 
     106// >>chng 08 apr 30, from 0.1646 to 0.1781 H, He topoff change, inc err to 2% 
     107assert HHeicf 0.1781 error 0.02 
    101108// 
    102109assert itrzn < 5 

  • trunk/tsuite/auto/hhe_outpp.in

    r1955 r2016  
    4040// >>chng 07 oct 22, from 0.3512 to 0.3216, resolve l-levels of h-like sequence 
    4141// >>chng 08 apr 07, from 0.3215 to 0.3151, a number of mostly minor iso changes 
    42 assert line "H  1" 1.875m = 0.3151 %Paschen alpha 
     42// >>chng 08 apr 30, from 0.315 to 0.327 H, He topoff change 
     43assert line "H  1" 1.875m = 0.327 %Paschen alpha 
     44//  
    4345// >>chng 07 oct 26, from 0.1693 to 0.1611, very close to botch after recent changes 
    4446assert line "H  1" 1.282m = 0.1611 %Paschen beta 
    …… 
    4648// >>chng 07 oct 22, from 0.0852 to 0.0730, resolve l-levels of h-like sequence 
    4749// >>chng 08 apr 07, from 0.0730 to 0.0713, a number of mostly minor iso changes 
    48 assert line "H  1" 4.051m = 0.0713 %Bracket alpha 
     50// >>chng 08 apr 30, from 0.0713 to 0.0762 H, He topoff change 
     51assert line "H  1" 4.051m = 0.0762 %Bracket alpha 
    4952// 
    5053// >>chng 07 oct 22, from 0.0477 to 0.0435, resolve l-levels of h-like sequence 
    …… 
    5962// assert line "TOTL" 10830 1.154  
    6063// >>chng 02 dec 11, add this line 
    61 assert line "TOTL" 10830 1.157  
     64// >>chng 08 apr 30, from 1.157 to 1.098 H, He topoff change 
     65assert line "He 1" 10830 1.098  
     66assert line "+Col" 10830 1.201  
    6267// 
    6368// >>chng 02 dec 10, from 0.142 to 0.131, HeI 23P A 
    6469// >>chng 03 feb 28, from 0.131 to 0.140, better hei coll 
    6570// >>chng 05 mar 12, from 0.140 to 0.129, RP merge He-like code 
    66 // >>chg 05 oct 01, from 0.129 to 0.120, RP update levels 
     71// >>chng 05 oct 01, from 0.129 to 0.120, RP update levels 
    6772// >>chng 05 dec 22, from 0.120 to 0.126, RP incr levels he 
    68 assert line "He 1" 5876  0.126 
    69 // 
    70 // >>chng 02 dec 11, from 0.0475 to 0.0447, new hei 
    71 // >>chng 05 mar 12, from 0.0447 to 0.0473, RP merge He-like code 
    72 assert line "Ca B" 4471  0.0473 
     73// >>chng 08 apr 30, from 0.126 to 0.140 H, He topoff change 
     74assert line "He 1" 5876  0.140 
     75assert line "+Col" 5876  0.131 
    7376// 
    7477// >>chng 02 dec 11, from 0.0504 to 0.0477, new hei 
    75 // >>chng 05 mar 12, from 0.0477 to 0.0448, RP merge He-like code 
    76 assert line "He 1" 4471  0.0448 
     78// >>chng 05 mar 12, from 0.0448 to 0.0467, RP merge He-like code 
     79assert line "He 1" 4471  0.0467 
     80assert line "+Col" 4471  0.0452 
    7781// 
    7882// >>99 nov 24, change from 0.018 to 0.019, 93.06 
    7983// >>03 nov 08, from 0.019 to 0.0183, diff reset bug 
    8084// >>chg 05 oct 01, from 0.0183 to 0.0192, RP update levels 
    81 assert line "He 1" 3889  0.0192  
     85// >>chng 08 apr 30, from 0.0192 to 0.0181 H, He topoff change 
     86assert line "He 1" 3889  0.0181  
     87assert line "+Col" 3889  0.104  
    8288// 
    83 // assert line "totl" 7065  0.075 
    8489// >>chng 02 dec 10, from 0.101 to 0.0957, HeI 23P A 
    8590// >>chng 03 may 24, from 0.0957 to 0.0909, Ryan changed some As 
    86 assert line "He 1" 7065  0.0909 
     91// >>chng 08 apr 30, from 0.0909 to 0.0847 H, He topoff change 
     92assert line "He 1" 7065  0.0847 
     93assert line "+Col" 7065  0.0311 
    8794// 
    8895// >>chng 00 sep 29, from 0.032 to 0.034, cont rebin 
    8996// >>chng 02 jan 05, from 0.034 to 0.031 HeI Lya inc redis 
    90 // assert line "totl"  20580  0.031 
    9197// >>chng 05 mar 12, from 0.0326 to 0.0298, RP merge He-like code 
    92 assert line "He 1"  20580  0.0298 
     98// >>chng 08 apr 30, from 0.0298 to 0.0312 H, He topoff change 
     99assert line "He 1"  20580  0.0312 error 0.15 
    93100// 
    94101assert hydrogen 1 ionization fraction -2.035 
    …… 
    106113// >>chng 06 jul 18, from -0.929 to -0.981 RP major upgrade VS coll strengths 
    107114// >>chng 08 apr 07, from -0.981 to -0.955, a number of mostly minor iso changes 
    108 assert helium 1 ionization fraction -0.955 
     115// >>chng 08 apr 30, from -0.955 to -0.885 H, He topoff change, inc err 
     116assert helium 1 ionization fraction -0.885 error 0.1 
    109117// 
    110118// >>chng 02 dec 10, from -0.010 to -0.0462 HeI 23P A 
    …… 
    118126// >>chng 05 dec 20, from 0.0811 to 0.1085, RP change default helium levels 
    119127// >>chng 06 jul 18, from 0.1085 to 0.0951 RP major upgrade VS coll strengths 
    120 assert hheicf 0.0951 error 0.01  
     128// >>chng 08 apr 30, from 0.0951 to 0.121 H, He topoff change, inc err 
     129assert HHeicf 0.121 error 0.02  
    121130// 
    122131// >>chng 01 apr 01, from 100 to 135, change in eden change 

  • trunk/tsuite/auto/hhe_outppff.in

    r1955 r2016  
    4343// >>chng 07 oct 26, from 0.1693 to 0.1611, very close to botch after recent changes 
    4444assert line "H  1" 1.282m = 0.1611 %Paschen beta 
     45assert line "Ca B" 1.282m = 0.1611 %Paschen beta 
    4546// 
    4647// >>chng 07 oct 22, from 0.0835 to 0.0730, resolve l-levels of h-like sequence 
    4748assert line "H  1" 4.051m = 0.0730 %Bracket alpha 
     49assert line "Ca B" 4.051m = 0.0827 %Bracket alpha 
    4850// 
    4951// >>chng 07 oct 22, from 0.0477 to 0.0435, resolve l-levels of h-like sequence 
    5052assert line "H  1" 2.625m = 0.0435 %Bracket beta 
     53assert line "Ca B" 2.625m = 0.0473 %Bracket beta 
     54// 
    5155// >>chng 01 aug 23, from 18.26 to 18.634, 2x better continuum resolution 
    5256assert line "BaC " 3646 = 18.634 %Balmer continuum rel to h-beta 
    5357// 
    5458c helium lines 
    55 // >>chng 02 dec 10, from 1.08 to 1.153, HeI 23P A 
    56 // >>chng 02 dec 11, rm this line 
    57 // assert line "totl" 10830 1.153  
    5859// >>chng 02 dec 11, add this line 
    5960// >>chng 05 mar 12, from 1.207 to 1.127, RP merge He-like code 
    6061assert line "totl" 10830 1.127  
     62assert line "+Col" 10830 1.201  
    6163// 
    62 // assert line "TOTL" 5 876  0.142 
    6364// >>chng 02 dec 10, from 0.142 to 0.131, HeI 23P A 
    6465// >>chng 03 feb 28, from 0.131 to 0.140, better hei coll 
    …… 
    6667// >>chng 05 oct 01, from 0.129 to 0.120, RP update levels 
    6768// >>chng 05 dec 22, from 0.120 to 0.126 RP increase default num levels He 
    68 assert line "He 1" 5876  0.126 
     69// >>chng 08 apr 30, from 0.126 to 0.140 H, He topoff change 
     70assert line "He 1" 5876  0.140 
     71assert line "+Col" 5876  0.126 
    6972// 
    7073// >>chng 02 dec 10, from 0.0475 to 0.0451, HeI 23P A 
    …… 
    7275// >>chng 05 dec 22, from 0.0473 to 0.0455 RP increase default num levels He 
    7376assert line "Ca B" 4471  0.0455 
     77assert line "+Col" 4471  0.0455 
    7478// 
    7579// >>chng 02 dec 11, from 0.0504 to 0.0477, new hei 
    …… 
    7781// >>chng 05 dec 22, from 0.0448 to 0.0466 RP increase default num levels He 
    7882assert line "He 1" 4471  0.0466 
     83assert line "+Col" 4471  0.0466 
    7984// 
    8085// >>99 nov 24, change from 0.018 to 0.019, 93.06 
    8186// >>chng 02 dec 10, from 0.018 to 0.0162, HeI 23P A 
    8287// >>chng 08 apr 03, from 0.018 to 0.029, include 10830 in fine opacity array 
    83 assert line "He 1" 3889  0.020 error 0.1 
     88// >>chng 08 apr 30, from 0.020 to 0.0181 H, He topoff change 
     89assert line "He 1" 3889  0.0181 error 0.1 
     90assert line "+Col" 3889  0.104 error 0.1 
    8491// 
    8592// assert line "TOTL" 7065  0.076 
    8693// >>chng 02 dec 10, from 0.101 to 0.0957, HeI 23P A 
    8794// >>chng 03 may 24, from 0.0957 to 0.0909, Ryan changed some As 
    88 assert line "He 1" 7065  0.0909 
     95// >>chng 08 apr 30, from 0.0909 to 0.0847 H, He topoff change 
     96assert line "He 1" 7065  0.0847 
     97assert line "+Col" 7065  0.0311 
    8998// 
    9099// >>chng 00 sep 29, from 0.0320 to 0.034, cont rebin 
    …… 
    108117// >>chng 05 dec 20, from -1.043 to -0.9283, RP change default helium levels 
    109118// >>chng 06 jul 18, from -0.9283 to -0.9809 RP major upgrade VS coll strengths 
    110 assert helium 1 ionization fraction -0.9809 error 0.1 
     119// >>chng 08 apr 30, from -0.981 to -0.885 H, He topoff change 
     120assert helium 1 ionization fraction -0.885 error 0.1 
    111121// 
    112122// >>chng 02 dec 10, from -0.010 to -0.0464 HeI 23P A 
    …… 
    121131// >>chng 05 dec 22, from 0.0812 to 0.01086 RP increase default num levels He 
    122132// >>chng 06 jul 18, from 0.1096 to 0.0951 RP major upgrade VS coll strengths 
    123 assert HHeicf 0.0951 error 0.01 
     133// >>chng 08 apr 30, from -0.0951 to -0.121 H, He topoff change 
     134assert HHeicf 0.121 error 0.01 
    124135// 
    125136// >>chng 01 apr 01, from 100 to 135, change in eden change allowed 

  • trunk/tsuite/auto/hhe_outsp.in

    r1955 r2016  
    4040// >>chng 07 oct 22, from 0.1693 to 0.1623, resolve l-levels of h-like sequence 
    4141assert line "H  1" 1.282m = 0.1623 %Paschen beta 
     42//  
    4243// for following really need larger atom for better accurary 
    4344// >>chng 07 oct 22, from 0.0835 to 0.0738, resolve l-levels of h-like sequence 
    44 assert line "H  1" 4.051m = 0.0738 %Bracket alpha 
     45// >>chng 08 apr 30, from 0.0738 to 0.0778 H, He topoff change 
     46assert line "H  1" 4.051m = 0.0778 %Bracket alpha 
    4547// 
    4648// >>chng 07 oct 22, from 0.0477 to 0.0440, resolve l-levels of h-like sequence 
    …… 
    5860// >>chng 05 oct 01, from 0.0961 to 0.0880, RP udate levels 
    5961// >>chng 05 dec 22, from 0.0880 to 0.0923, RP incr levels he 
    60 assert line "He 1" 5876  0.0923 
     62// >>chng 08 apr 30, from 0.0923 to 0.103 H, He topoff change 
     63assert line "He 1" 5876  0.103 
    6164// 
    6265// >>chng 04 may 19, from 0.034 to 0.0362, RP update helike sequence 
    63 assert line "Ca B" 4471  0.0362 
     66// >>chng 08 apr 30, from 0.0362 to 0.0345 H, He topoff change 
     67assert line "Ca B" 4471  0.0345 
    6468// 
    6569// >>chng 05 mar 12, from 0.0353 to 0.0336, RP merge He-like code 
    66 assert line "He 1" 4471  0.0336 
     70// >>chng 08 apr 30, from 0.0336 to 0.0349 H, He topoff change 
     71assert line "He 1" 4471  0.0349 
    6772// 
    68 // assert line "TOTL" 3889  0.068 
    69 assert line "He 1" 3889  0.077 
     73// >>chng 08 apr 30, from 0.077 to 0.0719 H, He topoff change 
     74assert line "He 1" 3889  0.0719 
    7075// 
    71 // assert line "TOTL" 7065  0.029 
    72 assert line "He 1" 7065  0.0306 
     76// >>chng 08 apr 30, from 0.306 to 0.0285 H, He topoff change 
     77assert line "He 1" 7065  0.0285 
    7378// 
    7479// >>chng 02 jan 05, from 0.026 to 0.024, HeI Lya redis fcn 
    …… 
    9095// >>chng 05 dec 20, from 0.1498 to 0.1607, RP change default helium levels 
    9196// >>chng 08 apr 07, from 0.1607 to 0.1707, a number of mostly minor iso changes 
    92 assert HHeicf 0.1706 error 0.01 
     97// >>chng 08 apr 30, from 0.1706 to 0.1809 H, He topoff change 
     98assert HHeicf 0.1809 error 0.01 
    9399// 
    94100// 

  • trunk/tsuite/auto/h_otsopen.in

    r2010 r2016  
    3535c due to Lyman line leakage.  we iterated, so have a good estimate of 
    3636c inward and outward fractions, which we test  
    37 // >>chng 08 apr 30, from >1 to 1 H, He topoff change 
    38 assert line "Q(H)" 4861 1.0  % 
     37assert line "Q(H)" 4861 >1.0  % 
    3938//  
    40 assert line "Q(H)" 4861 1.0  % 
     39// >>chng 08 apr 30, from 1.00 to 1.057 H, He topoff change 
     40assert line "Q(H)" 4861 1.057 % 
    4141//  
    4242assert line "Q(H)" 4861 < 1.1  %>but not a lot less 
    43 * 99jun26, error had been just under 2%, increased above it when optical 
    44 * depths of 2s and 2p were brought together, so increased error 
    45 assert line "H  1" 4861 = 1 error 0.03 %no surprise if not unity, since open 
    46 assert line "Inwd" 4861 =0.5 error 0.03 %no surprise if not unity, since open 
     43//  
     44//>>chnn 99jun26, error had been just under 2%, increased above it when optical 
     45// depths of 2s and 2p were brought together, so increased error 
     46// >>chng 08 apr 30, from 1 to 0.968 H, He topoff change 
     47assert line "H  1" 4861 = 0.968 error 0.03 %no surprise if not unity, since open 
     48//  
     49// >>chng 08 apr 30, from 0.5 to 0.484 H, He topoff change 
     50assert line "Inwd" 4861 =0.484 error 0.03 %no surprise if not unity, since open 
     51//  
    4752assert line "nFnu" 3588 = 18.0 error 0.02 %total Balmer continuum rel to h-beta 
    4853assert line "InwT" 3588 = 9.00 error 0.02 %inward Balmer continuum rel to h-beta 
     54//  
    4955// >>chng 01 aug 23, from 18.26 to 18.633, 2x better continuum resolution 
    5056assert line "BaC " 3646 = 18.633 error 0.02%residual Balmer continuum rel to h-b 
     57//  
    5158// >>chng 01 aug 23, from 9.07 to 9.319 2x better continuum resolution 
    5259assert line "cout" 3646 = 9.319 error 0.02 %Balmer continuum rel to h-beta 

  • trunk/tsuite/auto/h_otssp.in

    r2010 r2016  
    2929c 
    3030c commands giving the asserts    ========= 
    31 assert line "totl" 4861 = 1. error 0.02 % should be within 1 percent of precise 
     31// >>chng 08 apr 30, from 1.00 to 0.979 H, He topoff change 
     32assert line "H  1" 4861 = 0.979  
     33//  
    3234assert line "Q(H)" 4861 = 1 error 0.02 %make sure we conserve energy  
    3335// 

  • trunk/tsuite/auto/igm_z3.in

    r1488 r2016  
    2929// >>chng 04 jun 12, from 54.07 to 80.0, chng cont shield fcn 
    3030// >>chng 07 oct 22, from 80.0 to 111.7, resolve l-levels of h-like sequence 
    31 assert line "H  1" 4861 111.7 
     31// >>chng 08 apr 30, from 111.7 to 38.24 H, He topoff change 
     32assert line "H  1" 4861 38.24 
    3233// 
    3334assert hydrogen 2 tempeature 3000 
    …… 
    3940// >>chng 04 mar 04, from -1.26 to -1.11 improv conv 
    4041// >>chng 04 jun 12, from -1.11 to -0.651 chng cont shield fcn 
    41 assert ionization hydrogen 2 -0.651 error 0.06 
     42// >>chng 08 apr 30, from -0.651 to -1.22 H, He topoff change 
     43assert ionization hydrogen 2 -1.22 error 0.1 
    4244// 
    4345// >>chng 01 sep 24, from 0.304 to 0.326 lower def case b optical depth 
    …… 
    4749// >>chng 04 mar 04, from 0.347 to 0.327, imrov conv 
    4850// >>chng 04 jun 12, from 0.327 to 0.294 chng cont shield fcn 
    49 assert line "ff h" 0 0.294 
     51// >>chng 08 apr 30, from 0.294 to 0.340 H, He topoff change 
     52assert line "FF h" 0 0.340 
    5053// 
    5154// >>chng 01 sep 24, from 0.0185 to 0.049 lower def case b optical depth 
    …… 
    5356// >>chng 04 mar 04, from 0.0806 to 0.0555, imrov conv 
    5457// >>chng 04 jun 12, from 0.0555 to 0.0162 chng cont shield fcn 
    55 assert line "h- h" 0 0.0162 
     58// >>chng 08 apr 30, from 0.0162 to 0.0734 H, He topoff change 
     59assert line "H- h" 0 0.0734 
    5660// 
    5761// >>chng 01 sep 24, from 0.0163 to 0.043 lower def case b optical depth 
    …… 
    5963// >>chng 04 mar 04, from 0.0703 to 0.0485, imrov conv 
    6064// >>chng 04 jun 12, from 0.0485 to 0.0142 chng cont shield fcn 
    61 assert line "h-fb" 0 0.0142 
     65// >>chng 08 apr 30, from 0.0142 to 0.0645 H, He topoff change 
     66assert line "H-fb" 0 0.0645 
    6267// 
    6368// >>chng 01 sep 24, from 0.0103 to 0.027 lower def case b optical depth 
    …… 
    6570// >>chng 04 mar 04, from 0.0444 to 0.0307, imrov conv 
    6671// >>chng 04 jun 12, from 0.0307 to 0.0090 chng cont shield fcn 
    67 assert line "h2+ " 0 0.0090 
     72// >>chng 08 apr 30, from 0.0090 to 0.0405 H, He topoff change 
     73assert line "H2+ " 0 0.0405 
    6874// 
    6975c igm_z3.in 

  • trunk/tsuite/auto/limit_caseb_he2_den8.in

    r2014 r2016  
    1 title hlike_he He II case B 
     1title limit_caseb_he2_den8 He II case B 
    22c 
    33c commands controlling continuum ========= 
    …… 
    2222c commands controlling output    ========= 
    2323normalize to "Ca B" 1640 // the balmer alpha transition 
    24 punch results "hlike_he.rlt" 
    25 punch asserts "hlike_he.asr" 
     24punch results "limit_caseb_he2_den8.rlt" 
     25punch asserts "limit_caseb_he2_den8.asr" 
    2626c 
    27 assert Case B H-like helium error 0.1 range 1,000 40,000A 
     27assert Case B H-like helium error 0.1 range 1,000 40,000A faint -2 
    2828c 
    2929c commands giving the asserts    ========= 
    …… 
    3232assert line "He 2"  1085A  0.1771  
    3333assert line "He 2"  1025A  0.1013  
     34//  
    3435// >>chng 07 oct 26, from 0.1053 to 0.1001, very close to botch after recent changes 
    3536assert line "He 2"  4686A  0.1001  
    36 assert line "He 2"  3203A  0.0544  
    37 assert line "He 2"  2733A  0.0314  
     37//  
     38// >>chng 08 apr 30, from 0.0544 to 0.0516 H, He topoff change 
     39assert line "He 2"  3203A  0.0516  
     40//  
     41// >>chng 08 apr 30, from 0.0314 to 0.0302 H, He topoff change 
     42assert line "He 2"  2733A  0.0302  
    3843assert line "He 2"  2511A  0.0200  
    3944// >>chng 07 oct 22, from 0.0231 to 0.0217, resolve l-levels of h-like sequence 
    …… 
    4146// >>chng 07 oct 22, from 0.0140 to 0.0133, resolve l-levels of h-like sequence 
    4247assert line "He 2"  6560A  0.0133  
    43 assert line "He 2"  5412A  0.0089  
     48//  
     49// >>chng 08 apr 30, from 0.0089 to 0.0085 H, He topoff change 
     50assert line "He 2"  5412A  0.0085  
     51//  
    4452// >>chng 06 nov 29, from 0.0061 to 0.0058, use Badnell DR by default 
    4553// >>chng 07 mar 13, from 0.0058 to 0.0062, change in lines_service to fix cache errors 
    …… 
    6068assert line "He 2"  8237A  0.0022 error 0.07 
    6169//  
    62 c caseb_c6.in 
     70c limit_caseb_he2_den8.in 
    6371c class limit  
    6472c ======================================== 

  • trunk/tsuite/auto/limit_caseb_h_hs87.in

    r1996 r2016  
    5555assert line "H  1" 1.611m  0.0041 error 0.02 
    5656assert line "H  1" 1.588m  0.0033 error 0.02 
    57 assert line "H  1" 1.570m  0.0027 error 0.02 
     57// >>chng 08 apr 30, from 0.0027 to 0.0026 H, He topoff change 
     58assert line "H  1" 1.570m  0.0026 error 0.02 
    5859c 
    5960c limit_caseb_h_hs87.in 

  • trunk/tsuite/auto/limit_casec_h_den5.in

    r1996 r2016  
    2626c 
    2727c commands giving the asserts    ========= 
    28 assert line "H  1" 1216 183.7 
     28// >>chng 08 apr 30, from 183.7 to 174 H, He topoff change 
     29assert line "H  1" 1216 174 
     30// 
    2931// >>chng 07 oct 22, from 26.5 to 30.63, resolve l-levels of h-like sequence 
    3032assert line "H  1" 1026 30.63 
     33// 
    3134// >>chng 07 oct 22, from 1.126 to 0.943, resolve l-levels of h-like sequence 
    3235assert line "H  1" 4861 0.943 
     36assert line "Ca B" 4861 1.000 
     37// 
    3338// >>chng 07 oct 22, from 3.28 to 2.42, resolve l-levels of h-like sequence 
    3439assert line "H  1" 6563 2.42 
     40assert line "Ca B" 6563 2.829 
     41// 
     42assert line "H  1"  4340A 0.444 
     43assert line "Ca B"  4340A 0.470 
     44// 
     45assert line "H  1" 1.875m 0.297 
     46assert line "Ca B" 1.875m 0.326 
     47// 
     48assert line "H  1" 2.166m 0.0252 
     49assert line "Ca B" 2.166m 0.0271 
    3550// 
    3651assert ionization hydrogen 1 -3.273 

  • trunk/tsuite/auto/nova_photos.in

    r2010 r2016  
    6666// >>chng 08 apr 10, from 32.0 to 37.5, change default h-like levels, other minor changes 
    6767// >>chng 08 apr 30, from 37.5 to 31.8 H, He topoff change 
    68 assert line "totl" 1216 37.5 error 0.1 
     68assert line "totl" 1216 31.8 error 0.1 
    6969// 
    7070// >>chng 01 jun 15, from 34.2 to 35.061 H ct network 

  • trunk/tsuite/auto/pdr_leiden_v3.in

    r1808 r2016  
    103103assert line luminosity "C  2" 157.6m -5.458 
    104104// 
    105 assert line luminosity "C  1" 369.7m -5.693 
     105// >>chng 08 apr 30, from -5.693 to -5.674 H, He topoff change 
     106assert line luminosity "C  1" 369.7m -5.674 
    106107// 
    107108assert line luminosity "C  1" 609.2m -6.067 
    …… 
    113114// >>chng 06 nov 29, from -7.398 to -7.339, Badnell DR turned on 
    114115// >>chng 07 apr 30, from -7.339 to -7.316, log DR average, use mix S DR 
     116// >>chng 08 apr 30, from -7.316 to -7.298 H, He topoff change 
    115117assert line luminosity "O  1" 145.5m -7.316 
    116118//