Changeset 2047

Show
Ignore:
Timestamp:
05/12/08 03:29:41 (5 days ago)
Author:
gary
Message:

merge of rev 2045 and 2046
set version numbers to beta 1 of C08.00.00

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/c08_branch/source/date.h

    r2034 r2047  
    1616#define MONTH   4 
    1717/* day is correct */ 
    18 #define DAY     5 
     18#define DAY     12 
    1919 
    2020#endif /* _DATE_H_ */ 

  • branches/c08_branch/source/ion_trim.cpp

    r2034 r2047  
    55#include "cddefines.h" 
    66#include "elementnames.h" 
     7#include "radius.h" 
    78#include "heavy.h" 
    89#include "conv.h" 
    …… 
    190191                        elementnames.chElementName[nelem]); 
    191192                fprintf(ioQQQ, 
    192                         "Turn off the element or do not consider gas with low density, the current hydrogen density is %.2e cm-3.\n", 
     193                        "Turn off the element with the command ELEMENT XXX OFF or do not consider " 
     194                        "gas with low density, the current hydrogen density is %.2e cm-3.\n", 
    193195                        dense.gas_phase[ipHYDROGEN]); 
    194196                fprintf(ioQQQ, 
    195                         "abort flag being set.\n"); 
     197                        "The outer radius of the cloud is %.2e cm - should a stopping " 
     198                        "radius be set?\n", 
     199                        radius.Radius ); 
     200                fprintf(ioQQQ, 
     201                        "The abort flag is being set - the calculation is stopping.\n"); 
    196202                lgAbort = true; 
    197203                return; 

  • branches/c08_branch/source/rt_diffuse.cpp

    r1822 r2047  
    384384 
    385385                                ip = Heavy.ipHeavy[nelem][ion]-1; 
     386                                ASSERT( ip >= 0 ); 
    386387 
    387388                                /* nflux was reset upward in ConvInitSolution to encompass all 
    388389                                 * possible line and continuum emission.  this test should not 
    389                                  * possibly fail.  It could if the ionization were to increase with depth. 
    390                                  * This is important because the nflux cell in ConInterOut is used to carry out the 
    391                                  * unit integration, and if it gets clobbered by diffuse emission the code 
    392                                  * will declare insanity in PrtComment */ 
    393                                 ASSERT( ip >= 0 && ip < rfield.nflux ); 
     390                                 * possibly fail.  It could if the ionization were to increase with depth 
     391                                 * although the continuum mesh is designed to deal with this. 
     392                                 * This test is important because the nflux cell in ConInterOut  
     393                                 * is used to carry out the unit integration, and if it gets  
     394                                 * clobbered by diffuse emission the code will declare  
     395                                 * insanity in PrtComment */ 
     396                                if( ip >= rfield.nflux ) 
     397                                        continue; 
    394398 
    395399                                /* get shell number, stat weights for this species */ 

  • branches/c08_branch/source/service.cpp

    r2034 r2047  
    140140        if( lgFail ) 
    141141        { 
    142                 fprintf( ioQQQ, " A syntax error occured while splitting the string: \"%s\"\n", str.c_str() ); 
     142                fprintf( ioQQQ, " A syntax error occurred while splitting the string: \"%s\"\n", str.c_str() ); 
    143143                fprintf( ioQQQ, " The separator is \"%s\". Empty substrings are not allowed.\n", sep.c_str() ); 
    144144                cdEXIT(EXIT_FAILURE); 
    …… 
    929929        else 
    930930        { 
    931                 /* round number off for 9.3 format, neg numb not possilbe */ 
     931                /* round number off for 9.3 format, neg numb not possible */ 
    932932                tvalue = value; 
    933933                xlog = log10( tvalue ); 

  • branches/c08_branch/source/version.h

    r1898 r2047  
    99 
    1010static const int CLD_MAJOR = 8; 
    11 static const int CLD_MINOR = 1; 
     11static const int CLD_MINOR = 0; 
    1212static const int CLD_PATCH = 0; 
    1313 
    …… 
    2828                lgRelease = false; 
    2929 
    30                 /* is this a beta version?  0 for no */ 
    31                 nBetaVer = 0; 
     30                /* is this a beta version?  0 for no 
     31                 * if this is non-zero then lgRelease above should be false */ 
     32                nBetaVer = 1; 
    3233 
    3334                if( lgRelease ) 
    3435                { 
    35                         if( CLD_PATCH > 0 ) 
    36                                 sprintf( chVersion, "%2.2i.%2.2i (patch level %d)", CLD_MAJOR, CLD_MINOR, CLD_PATCH ); 
    37                         else 
    38                                 sprintf( chVersion, "%2.2i.%2.2i", CLD_MAJOR, CLD_MINOR ); 
     36                        sprintf( chVersion, "%2.2i.%2.2i.%2.2i", CLD_MAJOR, CLD_MINOR, CLD_PATCH ); 
    3937                } 
    4038                else if( nBetaVer > 0 ) 
    4139                { 
    42                         sprintf( chVersion, "%2.2i.%2.2i beta %ld (prerelease)", CLD_MAJOR, CLD_MINOR, nBetaVer ); 
     40                        sprintf( chVersion, "%2.2i.%2.2i.%2.2i beta %ld (prerelease)", CLD_MAJOR, CLD_MINOR, CLD_PATCH , nBetaVer ); 
    4341                } 
    4442                else