Show
Ignore:
Timestamp:
12/05/06 21:35:06 (2 years ago)
Author:
peter
Message:

Merge changes from mainline upto r685.

This branch is now fully merged. Any remaining problems in doxygen, scripts
and tsuite should now be resolved.

Location:
branches/newmole/tsuite
Files:
5 removed
112 modified
30 copied

Legend:

Unmodified
Added
Removed

  • branches/newmole/tsuite/auto/agn_S_u050.in

    r189 r687  
    2424c 
    2525c commands giving the asserts    ========= 
    26 assert hydrogen 2 temperature 4.670 
     26// >>chng 06 nov 29, from 4.670 to 4.720, Badnell DR turned on 
     27assert hydrogen 2 temperature 4.720 
    2728c 
    2829c agn_S_u050.in 

  • branches/newmole/tsuite/auto/agn_S_u100.in

    r643 r687  
    2626// >>chng 06 jul 12, from 5.060 to 5.160, use Savin & Gu DR to make mean DR 
    2727// >>chng 06 aug 17, from 5.160 to 5.201, update to Badnell dr 
    28 // >>chng 06 nov 26,, from 5.201 to 5.055, use Gu et al. UTA data 
    29 assert hydrogen 2 temperature 5.055 
     28// >>chng 06 nov 26, from 5.201 to 5.055, use Gu et al. UTA data 
     29// >>chng 06 nov 29, from 5.055 to 5.206, Badnell DR turned on 
     30assert hydrogen 2 temperature 5.206 
    3031// 
    3132// >>chng 06 nov 26, add these asserts 
    32 // >>chng 06 nov 26,, from -2.580 to -3.608, use Gu et al. UTA data 
    33 assert iron  8 ionization -3.608 
     33// >>chng 06 nov 26, from -2.580 to -3.608, use Gu et al. UTA data 
     34// >>chng 06 nov 29, from -3.608 to -1.587, Badnell DR turned on 
     35assert iron  8 ionization -1.587 
    3436// 
    35 // >>chng 06 nov 26,, from -0.825 to -1.547, use Gu et al. UTA data 
    36 assert iron  9 ionization -1.547  
     37// >>chng 06 nov 26, from -0.825 to -1.547, use Gu et al. UTA data 
     38// >>chng 06 nov 29, from -1.547 to -0.753, Badnell DR turned on 
     39assert iron  9 ionization -0.753  
    3740// 
    38 // >>chng 06 nov 26,, from -0.914 to -1.574, use Gu et al. UTA data 
    39 assert iron 10 ionization -1.574  
     41// >>chng 06 nov 26, from -0.914 to -1.574, use Gu et al. UTA data 
     42// >>chng 06 nov 29, from -1.574 to -0.640, Badnell DR turned on 
     43assert iron 10 ionization -0.640  
    4044// 
    41 // >>chng 06 nov 26,, from -0.965 to -1.498, use Gu et al. UTA data 
    42 assert iron 11 ionization -1.498  
     45// >>chng 06 nov 26, from -0.965 to -1.498, use Gu et al. UTA data 
     46// >>chng 06 nov 29, from -1.498 to -0.711, Badnell DR turned on 
     47assert iron 11 ionization -0.711  
    4348// 
    44 // >>chng 06 nov 26,, from -0.750 to -1.009, use Gu et al. UTA data 
    45 assert iron 12 ionization -1.009  
     49// >>chng 06 nov 26, from -0.750 to -1.009, use Gu et al. UTA data 
     50// >>chng 06 nov 29, from -1.009 to -0.846, Badnell DR turned on 
     51assert iron 12 ionization -0.846  
    4652// 
    47 // >>chng 06 nov 26,, from -0.617 to -0.524, use Gu et al. UTA data 
    48 assert iron 13 ionization -0.524  
     53// >>chng 06 nov 26, from -0.617 to -0.524, use Gu et al. UTA data 
     54// >>chng 06 nov 29, from -0.524 to -0.927, Badnell DR turned on 
     55assert iron 13 ionization -0.927  
    4956// 
    50 // >>chng 06 nov 26,, from -1.174 to -0.729, use Gu et al. UTA data 
    51 assert iron 14 ionization -0.729  
     57// >>chng 06 nov 26, from -1.174 to -0.729, use Gu et al. UTA data 
     58// >>chng 06 nov 29, from -0.729 to -1.336, Badnell DR turned on 
     59assert iron 14 ionization -1.336  
    5260// 
    53 // >>chng 06 nov 26,, from -1.217 to -0.779, use Gu et al. UTA data 
    54 assert iron 15 ionization -0.779  
     61// >>chng 06 nov 26, from -1.217 to -0.779, use Gu et al. UTA data 
     62// >>chng 06 nov 29, from -0.779 to -1.670, Badnell DR turned on 
     63assert iron 15 ionization -1.670  
    5564// 
    56 // >>chng 06 nov 26,, from -2.017 to -1.533, use Gu et al. UTA data 
    57 assert iron 16 ionization -1.533  
     65// >>chng 06 nov 26, from -2.017 to -1.533, use Gu et al. UTA data 
     66// >>chng 06 nov 29, from -1.533 to -2.162, Badnell DR turned on 
     67assert iron 16 ionization -2.162  
    5868c 
    5969c agn_S_u100.in 

  • branches/newmole/tsuite/auto/agn_S_u150.in

    r448 r687  
    2929c commands giving the asserts    ========= 
    3030// >>chng 06 jul 12, from 5.765 to 5.799, use Savin & Gu DR to make mean DR 
    31 assert hydrogen 2 temperature 5.799 
     31// >>chng 06 nov 29, from 5.799 to 5.642, Badnell DR turned on 
     32assert hydrogen 2 temperature 5.642 
    3233c 
    3334c agn_S_u150.in 

  • branches/newmole/tsuite/auto/agn_S_u200.in

    r189 r687  
    2424c 
    2525c commands giving the asserts    ========= 
    26 assert hydrogen 2 temperature 6.281 
     26// >>chng 06 nov 29, from 6.281 to 6.219, Badnell DR turned on 
     27assert hydrogen 2 temperature 6.219 
    2728c 
    2829c agn_S_u200.in 

  • branches/newmole/tsuite/auto/agn_S_u225.in

    r189 r687  
    2424c 
    2525c commands giving the asserts    ========= 
    26 assert hydrogen 2 temperature 6.446 
     26// >>chng 06 nov 29, from 6.446 to 6.359, Badnell DR turned on 
     27assert hydrogen 2 temperature 6.359 
    2728c 
    2829c agn_S_u225.in 

  • branches/newmole/tsuite/auto/agn_S_u250.in

    r189 r687  
    2424c 
    2525c commands giving the asserts    ========= 
    26 assert hydrogen 2 temperature 6.592 
     26// >>chng 06 nov 29, from 6.592 to 6.555, Badnell DR turned on 
     27assert hydrogen 2 temperature 6.555 
    2728c 
    2829c agn_S_u250.in 

  • branches/newmole/tsuite/auto/agn_warm_absorber.in

    r643 r687  
    4343// >>chng 06 feb 03, from 5.116 to 5.087, guess dr to Badnell mean 
    4444// >>chng 06 jul 12, from 5.087 to 5.118, use Savin & Gu DR to make mean DR 
    45 assert line luminosity "totm" 0 5.118 
     45// >>chng 06 nov 29, from 5.118 to 5.141, Badnell DR turned on 
     46assert line luminosity "totm" 0 5.141 
    4647// 
    4748// >>chng 01 aug 08, from 5.122 to 5.099, additional coolants 
    … …  
    4950// >>chng 05 dec 19, from 5.121 to 5.098, update cs Fe10, 11, & 13 
    5051// >>chng 06 feb 03, from 5.098 to 5.119, guess dr to Badnell mean 
    51 assert temperature hydrogen 2 5.119 
     52// >>chng 06 nov 29, from 5.119 to 5.171, Badnell DR turned on 
     53assert temperature hydrogen 2 5.171 
    5254//  
    53 assert carbon 5 ionization -2.532 
     55// >>chng 06 nov 29, from -2.532 to -2.601, Badnell DR turned on 
     56assert carbon 5 ionization -2.601 
    5457//  
    55 assert carbon 6 ionization -0.930 
     58// >>chng 06 nov 29, from -0.930 to -0.960, Badnell DR turned on 
     59assert carbon 6 ionization -0.960 
     60//  
    5661assert carbon 7 ionization -0.056 
    5762// 
    5863// >>chng 05 dec 19, from -2.977 to -2.974, update cs Fe10, 11, & 13 
    5964// >>chng 06 jul 12, from -2.974 to -3.000, use Savin & Gu DR to make mean DR 
    60 assert oxygen 6 ionization -3.000 
     65// >>chng 06 nov 29, from -3.000 to -3.084, Badnell DR turned on 
     66assert oxygen 6 ionization -3.084 
    6167// 
    6268// >>chng 06 aug 17, from -0.981 to -1.003, update to Badnell dr 
    63 assert oxygen 7 ionization -1.003 
     69// >>chng 06 nov 29, from -1.003 to -1.047, Badnell DR turned on 
     70assert oxygen 7 ionization -1.047 
    6471// 
    65 assert oxygen 8 ionization -0.339 
     72// >>chng 06 nov 29, from -0.339 to -0.356, Badnell DR turned on 
     73assert oxygen 8 ionization -0.356 
    6674// 
    67 assert oxygen 9 ionization -0.360 
     75// >>chng 06 nov 29, from -0.360 to -0.329, Badnell DR turned on 
     76assert oxygen 9 ionization -0.329 
    6877//  
    6978// >>chng 05 mar 03, from -2.11 to -2.143, new romas uta 
    … …  
    7382// >>chng 06 aug 17, from -2.357 to -2.244, update to Badnell dr 
    7483// >>chng 06 nov 26,, from -2.244 to -2.888, use Gu et al. UTA data 
    75 assert iron ionization  9       -2.888 
     84// >>chng 06 nov 29, from -2.888 to -1.488, Badnell DR turned on 
     85assert iron ionization  9       -1.488 
    7686//  
    7787// >>chng 05 mar 03, from -1.756 to -1.788, new romas uta 
    … …  
    8191// >>chng 06 aug 17, from -2.051 to -1.948, update to Badnell dr 
    8292// >>chng 06 nov 26,, from -1.948 to -2.563, use Gu et al. UTA data 
    83 assert iron ionization  10      -2.563 
     93// >>chng 06 nov 29, from -2.563 to -1.038, Badnell DR turned on 
     94assert iron ionization  10      -1.038 
    8495//  
    8596// >>chng 05 mar 03, from -1.381 to -1.409, new romas uta 
    … …  
    8899// >>chng 06 aug 17, from -1.715 to -1.633, update to Badnell dr 
    89100// >>chng 06 nov 26,, from -1.633 to -2.142, use Gu et al. UTA data 
    90 assert iron ionization  11      -2.142 
     101// >>chng 06 nov 29, from -2.142 to -0.859, Badnell DR turned on 
     102assert iron ionization  11      -0.859 
    91103//  
    92104// >>chng 05 mar 03, from -0.763 to -0.787 new romas uta 
    … …  
    96108// >>chng 06 nov 26,, from -1.043 to -3.608, use Gu et al. UTA data 
    97109// >>chng 06 nov 26,, from -1.633 to -1.353, use Gu et al. UTA data 
    98 assert iron ionization  12      -1.353 
     110// >>chng 06 nov 29, from -1.353 to -0.822, Badnell DR turned on 
     111assert iron ionization  12      -0.822 
    99112//  
    100113// >>chng 05 mar 03, from -0.528 to -0.549, new romas uta 
    … …  
    102115// >>chng 06 jul 12, from -0.651 to -0.601, use Savin & Gu DR to make mean DR 
    103116// >>chng 06 nov 26,, from -0.601 to -0.626, use Gu et al. UTA data 
    104 assert iron ionization  13      -0.626 
     117// >>chng 06 nov 29, from -0.626 to -0.757, Badnell DR turned on 
     118assert iron ionization  13      -0.757 
    105119//  
    106120// >>chng 05 mar 03, from -0.833 to -0.852, new romas uta 
    … …  
    108122// >>chng 06 jul 12, from -0.794 to -0.833, use Savin & Gu DR to make mean DR 
    109123// >>chng 06 nov 26,, from -0.833 to -0.733, use Gu et al. UTA data 
    110 assert iron ionization  14      -0.733 
     124// >>chng 06 nov 29, from -0.733 to -1.008, Badnell DR turned on 
     125assert iron ionization  14      -1.008 
    111126//  
    112127// >>chng 05 mar 03, from -1.036 to -1.005, new romas uta 
    … …  
    115130// >>chng 06 aug 17, from -0.817 to -0.844, update to Badnell dr 
    116131// >>chng 06 nov 26,, from -0.844 to -0.788, use Gu et al. UTA data 
    117 assert iron ionization  15      -0.788 
     132// >>chng 06 nov 29, from -0.788 to -1.279, Badnell DR turned on 
     133assert iron ionization  15      -1.279 
    118134//  
    119135// >>chng 05 mar 03, from -1.621 to -1.604, new romas uta 
    … …  
    122138// >>chng 06 jul 12, from -1.302 to -1.358, use Savin & Gu DR to make mean DR 
    123139// >>chng 06 nov 26,, from -1.358 to -1.304, use Gu et al. UTA data 
    124 assert iron ionization  16      -1.304 
     140// >>chng 06 nov 29, from -1.304 to -1.519, Badnell DR turned on 
     141assert iron ionization  16      -1.519 
    125142//  
    126143// >>chng 05 mar 03, from -0.803 to -0.803, new romas uta 
    … …  
    129146// >>chng 06 nov 24, from -0.603 to -0.611, turn on Badnell RR 
    130147// >>chng 06 nov 26,, from -0.611 to -0.581, use Gu et al. UTA data 
    131 assert iron ionization  17      -0.581 
     148// >>chng 06 nov 29, from -0.581 to -0.881, Badnell DR turned on 
     149assert iron ionization  17      -0.881 
    132150//  
    133151// >>chng 05 mar 03, from -1.256 to -1.202, new romas uta 
    … …  
    135153// >>chng 06 jul 12, from -1.360 to -1.403, use Savin & Gu DR to make mean DR 
    136154// >>chng 06 nov 26,, from -1.403 to -1.374, use Gu et al. UTA data 
    137 assert iron ionization  18      -1.374 
     155// >>chng 06 nov 29, from -1.374 to -1.130, Badnell DR turned on 
     156assert iron ionization  18      -1.130 
    138157//  
    139158// >>chng 05 mar 03, from -2.22 to -2.165, new romas uta 
    … …  
    141160// >>chng 06 jul 12, from -2.319 to -2.358, use Savin & Gu DR to make mean DR 
    142161// >>chng 06 nov 26,, from -2.358 to -2.321, use Gu et al. UTA data 
    143 assert iron ionization  19      -2.321 
     162// >>chng 06 nov 29, from -2.321 to -1.706, Badnell DR turned on 
     163assert iron ionization  19      -1.706 
    144164//  
    145165// >>chng 05 mar 03, from -3.656 to -3.600, new romas uta 
    … …  
    147167// >>chng 06 jul 12, from -3.458 to -3.494, use Savin & Gu DR to make mean DR 
    148168// >>chng 06 nov 26,, from -3.494 to -3.451, use Gu et al. UTA data 
    149 assert iron ionization  20      -3.451 
     169// >>chng 06 nov 29, from -3.451 to -2.838, Badnell DR turned on 
     170assert iron ionization  20      -2.838 
    150171//  
    151172// >>chng 05 mar 03, from -5.473 to -5.421, new romas uta 
    … …  
    153174// >>chng 06 jul 12, from -4.853 to -4.886, use Savin & Gu DR to make mean DR 
    154175// >>chng 06 nov 26,, from -4.886 to -4.838, use Gu et al. UTA data 
    155 assert iron ionization  21      -4.838 
     176// >>chng 06 nov 29, from -4.838 to -4.317, Badnell DR turned on 
     177assert iron ionization  21      -4.317 
    156178// 
    157179assert nzone < 20 

  • branches/newmole/tsuite/auto/blr_f92.in

    r521 r687  
    6363// 
    6464// >>chng 02 nov 08, add next assert 
    65 assert line luminosity "TotM" 0  9.214 
     65// >>chng 06 nov 29, from 9.214 to 9.235, Badnell DR turned on 
     66assert line luminosity "TotM" 0  9.235 
    6667// 
    6768// >>chng 01 mar 09 from 2.086 to 4.695 change in H redis function 
    … …  
    9091// >>chng 05 mar 12, from 0.270 to 0.240 RP merge He-like code 
    9192// >>chng 06 jul 18, from 0.240 to 0.354, RP major upgrade VS coll strengths 
    92 assert line "H  1" 1.875m       0.354 
     93// >>chng 06 nov 29, from 0.354 to 0.336, Badnell DR turned on 
     94assert line "H  1" 1.875m       0.336 
    9395// 
    9496// >>chng 00 oct 03, from 102.9 to 111, cont rebin, H- opac bug 
    … …  
    158160// >>chng 04 jun 12, from 1.36 to 1.46 chng cont shield fcn 
    159161// >>chng 06 jul 18, from 1.46 to 1.37, RP major upgrade VS coll strengths 
    160 assert line "He 2" 4686      1.37 
     162// >>chng 06 nov 29, from 1.37 to 1.30, Badnell DR turned on 
     163assert line "He 2" 4686      1.30 
    161164// 
    162165// >>chng 01 mar 16 from 8.67 to 9.16 change in H atomic data 
    163166// >>chng 02 jun 13, from 9.16 to 9.71, slow drift 
    164 assert line "He 2" 1640      9.71 
     167// >>chng 06 nov 29, from 9.71 to 8.98 Badnell DR turned on 
     168assert line "He 2" 1640      8.98 
    165169// 
    166170// >>chng 01 jul 04, from 3.58 to 4.227 diffuse fields 
    … …  
    194198// >>chng 02 nov 08, from 1.58 to 1.797, rec cool increase error 
    195199// >>chng 06 jul 18, from 1.79 to 2.13, RP major upgrade VS coll strengths 
    196 assert line "c  3"  977A     2.13 error 0.15 
     200// >>chng 06 nov 29, from 2.13 to 2.44 Badnell DR turned on 
     201assert line "c  3"  977A     2.44 error 0.15 
    197202// 
    198203//