Show
Ignore:
Timestamp:
05/10/08 09:03:02 (2 months ago)
Author:
peter
Message:

Merging all changes from mainline upto r2033, except r1902.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/c08_branch/source/conv_init_solution.cpp

    r1793 r2034  
    451451                 * and many more if ices are important.  */ 
    452452                const long int LIMIT_THERMAL_LOOP=300; 
    453                 double CoolMHeatSave=-1. , TempSave=-1. , TeNew=-1.,CoolSave=-1;; 
     453                double CoolMHeatSave=-1. , TempSave=-1. , TeNew=-1.,CoolSave=-1; 
    454454                while( !lgConvergedLoop && LoopThermal < LIMIT_THERMAL_LOOP ) 
    455455                { 
     
    580580        } 
    581581 
    582         /* we should now have a good temperature and ionization, set pressure 
    583          * come here on all iterations */ 
    584         /* this is special case where we are working on first zone, at 
    585         * illuminated face of the cloud.  Here we want to remember the 
    586         * initial pressure in case constant pressure is needed */ 
    587         /* >>chng 05 jan 10, chng from nzone==1 to nzone<=1 so pressure not changed 
    588         * during search phase */ 
    589         /*>>chng 06 jun 20, add test on first iteration, or we are holding 
    590         * density constant - flag dense.lgDenseInitConstant false if 
    591         * constant pressure reset is used - default is true, after first iteration 
    592         * initial density is kept constant, when set false with reset option on 
    593         * constant pressure density on first iteration is allowed to change to keep 
    594         * pressure constant */ 
     582        /* we now have a fairly good temperature and ionization  
     583         * iteration is 1 on first iteration - remember current pressure 
     584         * on first iteration so we can hold this constant in constant  
     585         * pressure simulation. 
     586         * 
     587         * flag dense.lgDenseInitConstant false if 
     588         * *constant pressure reset* is used -  
     589         * default is true, after first iteration initial density is used for 
     590         * first zone no matter what pressure results.  Small changes occur due 
     591         * to radiative transfer convergence,  
     592         * when set false with *reset* option the density on later iterations  
     593         * can change to keep the pressure constant */ 
    595594        if( iteration==1 || dense.lgDenseInitConstant ) 
    596595        { 
     
    614613 
    615614        /* now bring current pressure to the correct pressure - must do this 
    616          * before initial values are saved in iter starend */ 
     615         * before initial values are saved in iter start/end */ 
    617616        ConvPresTempEdenIoniz(); 
    618617