Changeset 1709

Show
Ignore:
Timestamp:
12/21/07 13:40:11 (11 months ago)
Author:
rporter
Message:

trunk/source/conv_base.cpp - undo a bug introduced a few revisions ago, also undo the changes in itrzn asserts in a number of models.

trunk/source/iso_radiative_recomb.cpp - change commented out code, just comment out print statements.

Location:
trunk
Files:
27 modified

Legend:

Unmodified
Added
Removed

  • trunk/source/conv_base.cpp

    r1698 r1709  
    163163        DEBUG_ENTRY( "ConvBase()" ); 
    164164 
     165#if     0 
    165166        if( loopi == 0 ) 
    166167        { 
    … …  
    170171                nzoneOTS = -1; 
    171172        } 
     173#endif 
    172174 
    173175        /* this is set to phycon.te in tfidle, is used to insure that all temp 

  • trunk/source/iso_radiative_recomb.cpp

    r1700 r1709  
    338338 
    339339        /* If we have the variable set, go ahead and find effective recom and print it. */ 
    340         if( iso.lgRandErrGen[ipISO] && 0 ) 
     340        if( iso.lgRandErrGen[ipISO] ) 
    341341        { 
    342342                long ipLo, ipHi, ipHigher; 
    343343 
    344                 fprintf( ioQQQ, "ipHi\tipLo\tWL\tEmiss\tSigmaEmiss\tRadEffec\tSigRadEff\tBrRat\tSigBrRat\n" ); 
     344                //fprintf( ioQQQ, "ipHi\tipLo\tWL\tEmiss\tSigmaEmiss\tRadEffec\tSigRadEff\tBrRat\tSigBrRat\n" ); 
    345345 
    346346                /* Find effective recombinations and errors thereof */ 
    … …  
    390390                                                        pow( SigmaBranchRatio * iso.RadEffec[ipISO][nelem][ipHi], 2.) ); 
    391391 
     392                                                /* \todo 2 make this a trace option */ 
     393#if     0 
    392394                                                fprintf( ioQQQ, "%li\t%li\t", ipHi, ipLo ); 
    393395                                                prt_wl( ioQQQ, wavelength ); 
    … …  
    399401                                                        iso.BranchRatio[ipISO][nelem][ipHi][ipLo], 
    400402                                                        SigmaBranchRatio); 
     403#endif                                                   
    401404                                        } 
    402405                                } 

  • trunk/tsuite/auto/agn_reflector.in

    r1699 r1709  
    118118// 
    119119// >>chng 04 feb 15, from 5 to 3 
    120 // >>chng 07 dec 19, from 3 to 4, changes in r1698 
    121 assert itrzn < 4 
     120assert itrzn < 3 
    122121// 
    123122// >>chng 04 sep 06, from 250 to 300 (actually 253) bug nej Auger 

  • trunk/tsuite/auto/blr_fp89.in

    r1699 r1709  
    529529// >>chng 03 jan 22, from 6.1 to 7 (actually 6.4), hmole solver chng 
    530530// >>chng 07 oct 26, from 7.0 to 7.5 (actually 7.2), due to changes in r1472 
    531 // >>chng 07 dec 19, from 7.5 to 8.5, changes in r1698 
    532 assert itrzn < 8.5 
     531assert itrzn < 7.5 
    533532// 
    534533assert niterations < 5 

  • trunk/tsuite/auto/blr_hizqso.in

    r1699 r1709  
    144144// >>chng 03 aug 22, from 7 to 6 
    145145// >>chng 04 feb 15, from 6 to 5, conv ioniz loop auger 
    146 // >>chng 07 dec 19, from 5 to 6, changes in r1698 
    147 assert itrzn < 6 
     146assert itrzn < 5 
    148147c blr_hizqso.in 
    149148c class blr  

  • trunk/tsuite/auto/blr_kk81.in

    r1699 r1709  
    409409// >>chng 04 sep 30, from 10 to 12, conv_base conv heat cool 
    410410// >>chng 05 feb 06, from 12 to 15 slow drift, actually 12.6 
    411 // >>chng 07 dec 19, from 15 to 16, changes in r1698 
    412 assert itrzn < 16 
     411assert itrzn < 15 
    413412// 
    414413// >>chng 02 jun 13, from 250 to 320, finer griding 

  • trunk/tsuite/auto/blr_level2.in

    r1699 r1709  
    241241// >>chng 04 feb 09, from 4.5 to 5 ion_solver algor chng 
    242242// >>chng 04 feb 15, from 5 to 6, conv ion loop augger 
    243 // >>chng 07 dec 19, from 6 to 7, changes in r1698 
    244 assert itrzn < 7 
     243assert itrzn < 6 
    245244// 
    246245c blr_level2.in 

  • trunk/tsuite/auto/blr_n09_p18_Z20.in

    r1699 r1709  
    109109// 
    110110// >>chng 04 sep 25, from 6.6 to 8.5 incr temp toler 0.02 to 0.005 
    111 // >>chng 04 sep 30, from 8.5 to 10, conv_base conv heat cool 
    112 assert itrzn < 10 
     111assert itrzn < 8.5 
    113112// >>chng 07 dec 06, from 5 to 7, changes in h-like collisions 
    114113// >>chng 07 dec 19, from 7 to 9, changes in r1698 

  • trunk/tsuite/auto/blr_n11_p20.in

    r1699 r1709  
    113113// >>chng 04 mar 05, from 6 to 5, improve convergence 
    114114// >>chng 04 sep 25, from 5 to 6.5 incr temp toler 0.02 to 0.005 
    115 // >>chng 07 dec 19, from 6.5 to 7.5, changes in r1698 
    116 assert itrzn < 7.5 
     115assert itrzn < 6.5 
    117116// 
    118117// >>chng from 3 to <5 (actually 4) 

  • trunk/tsuite/auto/blr_n12_p19.in

    r1699 r1709  
    111111// >>chng 04 sep 25, from 6.5 to 7.5, incr temp toler 0.02 to 0.005 
    112112// >>chng 04 sep 30, from 7.5 to 9, conv_base conv heat cool 
    113 // >>chng 07 dec 19, from 9 to 10, changes in r1698 
    114 assert itrzn < 10 
     113assert itrzn < 9 
    115114// 
    116115// >>chng 04 sep 08, from <4 to <5, small changes in logic 

  • trunk/tsuite/auto/blr_n13_p18_Z20.in

    r1699 r1709  
    9292// >>chng 04 mar 05, from < 7 to < 9, chng conv criteria 
    9393// >>chng 04 sep 30, from 9 to 12, conv_base conv heat cool 
    94 // >>chng 07 dec 19, from 12 to 15, changes in r1698 
    95 assert itrzn < 15 
     94assert itrzn < 12 
    9695// 
    9796// number of iterations required 

  • trunk/tsuite/auto/blr_nf84.in

    r1699 r1709  
    342342// >>chng 04 sep 25, from 12 to 15, incr temp toler 0.02 to 0.005 
    343343// >>chng 04 sep 30, from 15 to 18, conv_base conv heat cool 
    344 // >>chng 07 dec 19, from 18 to 19, changes in r1698 
    345 assert itrzn < 19 
     344assert itrzn < 18 
    346345// 
    347346c blr_nf84.in 

  • trunk/tsuite/auto/dynamics_wind.in

    r1699 r1709  
    3737// 
    3838// >>chng 03 dec 08, from 12 to 15, chng ots, zones 
    39 // >>chng 07 dec 19, from 15 to 20, changes in r1698 
    40 assert itrzn < 20 
     39assert itrzn < 15 
    4140//  
    4241c dynamics_wind.in 

  • trunk/tsuite/auto/hhe_outpp.in

    r1699 r1709  
    122122assert nzone < 250 
    123123// 
    124 // >>chng 07 dec 19, from 5 to 6, changes in r1698 
    125 assert itrzn < 6 
     124assert itrzn < 5 
    126125// 
    127126c hhe_outpp.in 

  • trunk/tsuite/auto/hii_coolstar.in

    r1699 r1709  
    166166// >>chng 04 jun 21, from 5.5 to 7.5, go to T=100K to pick up all Hb 
    167167// >>chng 04 sep 25, from 7.5 to 12, incr temp toler 0.02 to 0.005 
    168 // >>chng 07 dec 19, from 12 to 14, changes in r1698 
    169 assert itrzn < 14 
     168assert itrzn < 12 
    170169// 
    171170// >>chng 04 jul 03, from 0.938 to 0.921 NA update H, CO chem net 

  • trunk/tsuite/auto/limit_conserve.in

    r1699 r1709  
    452452// so fewer zones, but more itrzn 
    453453// >>chng 05 feb 06, from 22 to 26 slow drift, actual 23.1 
    454 // >>chng 07 dec 19, from 26 to 28, changes in r1698 
    455 assert itrzn < 28 
     454assert itrzn < 26 
    456455// 
    457456c limit_conserve.in 

  • trunk/tsuite/auto/limit_vbhum.in

    r1699 r1709  
    3939// 
    4040// >>chng 05 mar 28, from 5 to 3.5, impr mol converg 
    41 // >>chng 07 dec 19, from 3.5 to 4.5, changes in r1698 
    42 assert itrzn < 4.5 
     41assert itrzn < 3.5 
    4342c  
    4443c limit_vbhum.in 

  • trunk/tsuite/auto/nlr_liner.in

    r1699 r1709  
    228228// >>chng 04 sep 30, from 16 to 18, conv_base conv heat cool 
    229229// >>chng 05 feb 06, from 18 to 20 slow drift, actually 18.7 
    230 // >>chng 07 dec 19, from 20 to 22, changes in r1698 
    231 assert itrzn < 22 
     230assert itrzn < 20 
    232231// 
    233232c nlr_liner.in 

  • trunk/tsuite/auto/nova_dqher.in

    r1699 r1709  
    337337// >>chng 05 dec 04, from 8.5 to 9.0 (8.57) unified FeII emissions 
    338338// >>chng 06 nov 29, from -9.0 to -10 (9.1) Badnell DR turned on 
    339 // >>chng 07 dec 19, from 10 to 11, changes in r1698 
    340 assert itrzn < 11  
     339assert itrzn < 10  
    341340// 
    342341c nova_dqher.in 

  • trunk/tsuite/auto/nova_photos.in

    r1699 r1709  
    171171// >>chng 06 jul 18, from 550 to 650 (617) RP major upgrade VS coll strengths 
    172172// >>chng 07 oct 29, from 650 to 447, change from "<" to "=" 
     173// >>chng 07 dec 21, from 447 to 474, changes in r1698 
    173174assert nzone = 447  
    174175// 
    175176// >>chng 02 dec 13, from 8 to 6.5, better zoning 
    176 // >>chng 07 dec 19, from 6.5 to 7, changes in r1698 
    177 assert itrzn < 7 
     177assert itrzn < 6.5 
    178178// 
    179179// >>chng 00 nov 01, removed checks on ionization since 

  • trunk/tsuite/auto/orion_hii_open.in

    r1699 r1709  
    121121// 
    122122// >>chng 05 mar 28, from 26 to 18 impr mol converg 
    123 // >>chng 07 dec 19, from 18 to 19, changes in r1698 
    124 assert itrzn < 19 
     123assert itrzn < 18 
    125124// 
    126125assert nzone < 220 

  • trunk/tsuite/auto/orion_hii_single_grn.in

    r1699 r1709  
    210210// >>chng 04 dec 08, from 16 to 25, co-ion feedback, check converg 
    211211// >>chng 05 mar 28, from 25 to 18 impr mol converg 
    212 // >>chng 07 dec 19, from 18 to 19, changes in r1698 
    213 assert itrzon < 19 
     212assert itrzon < 18 
    214213// 
    215214// >>chng 03 jun 08, from 220 to 260, add n0 zoning 

  • trunk/tsuite/auto/pdr_leiden_f1.in

    r1699 r1709  
    110110// 
    111111// >>chng 05 mar 28, from 5 to 3.5 impr mol converg 
    112 // >>chng 07 dec 19, from 3.5 to 4, changes in r1698 
    113 assert itrzn < 4 
     112assert itrzn < 3.5 
    114113//  
    115114// >>chng 05 jun 26, turn on elements needed for chem net, 450 to 574 

  • trunk/tsuite/auto/pdr_leiden_f2.in

    r1699 r1709  
    9393//  
    9494// >>chng 05 mar 28, from 5 to 3.5, impr mol converg 
    95 // >>chng 07 dec 19, from 3.5 to 4, changes in r1698 
    96 assert itrzn < 4 
     95assert itrzn < 3.5 
    9796//  
    9897// >>chng 05 dec 08, from 520 to 600 (539) update to Elwert Solomon rate 

  • trunk/tsuite/auto/pdr_leiden_hack_f3.in

    r1699 r1709  
    5757// >>chng 04 sep 19, from 5 to 7, improv converge criteria 
    5858// >>chng 05 mar 28, from 7 to 4.5, impr mol converg 
    59 // >>chng 07 dec 19, from 4.5 to 5, changes in r1698 
    60 assert itrzn < 5 
     59assert itrzn < 4.5 
    6160assert nzone < 550 
    6261c  

  • trunk/tsuite/auto/pdr_leiden_hack_f4.in

    r1699 r1709  
    5353// >>chng 04 sep 21, from 5 to 6 - finer molec conver criteria 
    5454// >>chng 05 mar 28, from 6 to 3.5, impr mol converg 
    55 // >>chng 07 dec 19, from 3.5 to 5, changes in r1698 
    56 assert itrzn < 5 
     55assert itrzn < 3.5 
    5756assert nzone < 550  
    5857c  

  • trunk/tsuite/auto/pdr_orion_veil.in

    r1699 r1709  
    111111// >>chng 04 jul 02, from 6.5 to 7.5 O H ct 
    112112// >>chng 04 sep 25, from 7.5 to 11, incr temp toler 0.02 to 0.005 
    113 // >>chng 07 dec 19, from 11 to 12, changes in r1698 
    114 assert itrzn < 12 
     113assert itrzn < 11 
    115114// 
    116115c pdr_orion_veil.in