Changeset 1891

Timestamp:

03/27/08 12:40:50 (5 months ago)

Author:

peter

Message:

source/service.cpp
source/punch_fits.cpp
source/init_coreload.cpp
source/grains_mie.cpp
source/assert_results.cpp
source/parse_punch.cpp
source/optimize_phymir.cpp
source/version.h
source/parse_commands.cpp
source/prt_final.cpp
source/grid_do.cpp
source/parse_print.cpp
source/cddrive.cpp
source/prt_comment.cpp
tsuite/programs/mpi/mpi.cpp

• Bug-fix for PR59 - cdVersion, cdDate could cause segfault.
  
• Start preparing for the change of the release numbering scheme for the next release.
  

Location:

trunk

Files:

• source/assert_results.cpp (modified) (1 diff)
• source/cddrive.cpp (modified) (2 diffs)
• source/grains_mie.cpp (modified) (1 diff)
• source/grid_do.cpp (modified) (3 diffs)
• source/init_coreload.cpp (modified) (2 diffs)
• source/optimize_phymir.cpp (modified) (1 diff)
• source/parse_commands.cpp (modified) (4 diffs)
• source/parse_print.cpp (modified) (2 diffs)
• source/parse_punch.cpp (modified) (1 diff)
• source/prt_comment.cpp (modified) (3 diffs)
• source/prt_final.cpp (modified) (3 diffs)
• source/punch_fits.cpp (modified) (1 diff)
• source/service.cpp (modified) (1 diff)
• source/version.h (modified) (2 diffs, 1 prop)
• tsuite/programs/mpi/mpi.cpp (modified) (1 diff)

trunk/source/assert_results.cpp

@@ -2472 +2472 @@
                 if( prt.lgPrintTime )
                 {
-                        fprintf( ioQQQ, " %s\n\n", version.chInfo );
+                        fprintf( ioQQQ, " %s\n\n", version::Inst().chInfo );
                 }
         }

trunk/source/cddrive.cpp

@@ -352 +352 @@
  *
  * cdVersion - puts version number of code into string 
- * incoming string must have at least 8 char and will become null
+ * incoming string must have sufficient length and will become null
  * terminated string
  *
  ************************************************************************/
 
-void cdVersion(char chString[] ) 
-{
-        DEBUG_ENTRY( "cdVersion()" );
-
-        if( !lgcdInitCalled )
-        {
-                printf(" cdInit was not called first - this must be the first call.\n");
-                cdEXIT(EXIT_FAILURE);
-        }
-
-        /* version was set by cdInit */
-        strcpy( chString , version.chVersion );
+void cdVersion(char chString[])
+{
+        strcpy( chString , version::Inst().chVersion );
         return;
 }
@@ -381 +372 @@
 
 /* cdDate - puts date of code into string  */
-void cdDate(char chString[] ) 
-{
-        /* date was set by cdInit */
-        strcpy( chString , version.chDate );
+void cdDate(char chString[])
+{
+        strcpy( chString , version::Inst().chDate );
         return;
 }

trunk/source/grains_mie.cpp

@@ -377 +377 @@
         (void)time(&timer);
         lgErr = lgErr || ( fprintf(fdes,"# this file was created by Cloudy %s (%s) on %s",
-                                   version.chVersion,version.chDate,ctime(&timer)) < 0 );
+                                   version::Inst().chVersion,version::Inst().chDate,ctime(&timer)) < 0 );
         lgErr = lgErr || ( fprintf(fdes,"# ===========================================\n#\n") < 0 );
         lgErr = lgErr || ( fprintf(fdes,"%12ld # magic number opacity file\n",MAGIC_OPC) < 0 );

trunk/source/grid_do.cpp

@@ -167 +167 @@
         if( strcmp(optimize.chOptRtn,"XSPE") == 0 )
         {
-                fprintf( ioQQQ, "                                                           Grid  Driver\n" );
+                fprintf( ioQQQ, "                                                          Grid  Driver\n" );
         }
         else
@@ -173 +173 @@
                 fprintf( ioQQQ, "                                                      Optimization  Driver\n" );
         }
-        fprintf( ioQQQ, "                                                        Cloudy %s\n\n",version.chVersion);
-        fprintf( ioQQQ, "                       **************************************%8.87s*************************************\n", version.chDate);
-        fprintf( ioQQQ, "                       *                                                                                 *\n");
-
+        int indent = (122 - strlen(version::Inst().chVersion))/2;
+        fprintf( ioQQQ, "%*cCloudy %s\n\n",indent,' ',version::Inst().chVersion);
+        fprintf( ioQQQ, "%23c**************************************%7.7s**************************************\n", ' ', version::Inst().chDate );
+        fprintf( ioQQQ, "%23c*%81c*\n", ' ', ' ' );
 
         /* now echo initial input quantities with flag for vary */
@@ -195 +195 @@
                 }
 
-                fprintf( ioQQQ, "               %7.7s * ",chNote);
-                j = 0;
-                /* print actual command */
-                while( input.chCardSav[i][j] !='\0' )
-                {
-                        fprintf( ioQQQ, "%c", input.chCardSav[i][j] );
-                        ++j;
-                }
-                /* flush out rest of space then * */
-                while( j<80 )
-                {
-                        fprintf( ioQQQ, "%c", ' ' );
-                        ++j;
-                }
-                /* end the line */
-                fprintf( ioQQQ, "*\n" );
-        }
-        fprintf( ioQQQ, "                       *                                                                                 *\n                       ***********************************************************************************\n\n\n" );
+                fprintf( ioQQQ, "%22.7s * %-80s*\n", chNote, input.chCardSav[i] );
+        }
+        fprintf( ioQQQ, "%23c*%81c*\n", ' ', ' ' );
+        fprintf( ioQQQ, "%23c***********************************************************************************\n\n\n", ' ' );
 
         /* option to trace logical flow within this sub */

trunk/source/init_coreload.cpp

@@ -11 +11 @@
 #include "hcmap.h"
 #include "h2.h"
-#include "date.h"
 #include "version.h"
 #include "hextra.h"
@@ -159 +158 @@
         hcmap.lgMapBeingDone = false;
 
-        /* set the date saved in date.h into version.chDate 
-         * this is the decade part of the year counted after 2000 */
-        int nDecade = (YEAR-100)/10;
-        char chDecade[2];
-
-        /* create space for these strings */
-        version.chDate = (char *)MALLOC( sizeof(char)*INPUT_LINE_LENGTH );
-        version.chVersion = (char *)MALLOC( sizeof(char)*INPUT_LINE_LENGTH );
-
-        static char chMonth[12][4] ={"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec" };
-        static char chMonthInt[12][3] ={"01","02","03","04","05","06","07","08","09","10","11","12" };
-
-        sprintf(chDecade,"%i", nDecade );
-        /* set date and version - this code will need to be modified in the year 2110 */
-        if( nDecade > 9 )
-        {
-                fprintf(ioQQQ,"must update formation of chDate in cdInit \n");
-                TotalInsanity();
-        }
-        if( DAY < 10 )
-        {
-                sprintf( version.chDate , "%s%1i%s0%1i", 
-                        chDecade,
-                        YEAR-100-nDecade*10,
-                        chMonth[MONTH],
-                        DAY );
-                sprintf( version.chVersion , "%s%1i.%s.0%1i", 
-                        chDecade,
-                        YEAR-100-nDecade*10,
-                        chMonthInt[MONTH],
-                        DAY );
-        }
-        else
-        {
-                sprintf( version.chDate , "%s%1i%s%2i", 
-                        chDecade,
-                        YEAR-100-nDecade*10,
-                        chMonth[MONTH],
-                        DAY );
-                sprintf( version.chVersion , "%s%1i.%s.%2i", 
-                        chDecade,
-                        YEAR-100-nDecade*10,
-                        chMonthInt[MONTH],
-                        DAY );
-        }
-
-        version.chCitation = CITATION;
-        version.chCitationLatex = CITATION_LATEX;
-        version.chCitationShort = CITATION_SHORT;
-
-        /* is this a release version? */
-        version.lgRelease = false;
-
-        /* is this a beta version?  0 for no */
-        version.nBetaVer = 0;
-
-        /* optional letter could come here for updates to branched version */
-        /*strcat( version.chVersion , "a" );*/
-        /* change following from * to letter when letters are used */
-        strcat( version.chDate , "*" );
-
-        char mode[6];
-        if( sizeof(long) == 4 )
-                strncpy( mode, "ILP32", 6 );
-        else if( sizeof(long) == 8 )
-                strncpy( mode, "LP64", 6 );
-        else
-                strncpy( mode, "?????", 6 );
-
-        /* now generate info on how we were compiled, including compiler version */
-        sprintf(version.chInfo , 
-                "cdInit compiled on %s in OS %s using the %s %i compiler in %s mode." ,
-                __DATE__  ,__OS , __COMP , __COMP_VER, mode);
-
         /* name of output file from optimization run */
         strncpy( chOptimFileName , "optimal.in" , sizeof( chOptimFileName ) );

trunk/source/optimize_phymir.cpp

@@ -228 +228 @@
         else
         {
-                strcpy(chDum1,version.chDate);
-                strcpy(chDum2,version.chVersion);
+                strcpy(chDum1,version::Inst().chDate);
+                strcpy(chDum2,version::Inst().chVersion);
                 strcpy(chDum3,cpu.host_name());
                 wr_continue(VRSNEW,LIMPAR,a2,c1,c2,xc,xcold,dmax,dold,*ymin,nvarPhymir,optimize.nOptimiz,

trunk/source/parse_commands.cpp

@@ -117 +117 @@
 
         /* say this is a beta version if we are talking and it is the truth */
-        if( version.nBetaVer > 0 && called.lgTalk )
+        if( version::Inst().nBetaVer > 0 && called.lgTalk )
         {
                 fprintf( ioQQQ, 
                         "\n                             This is %s (beta %ld) of Cloudy, and is intended for testing only.\n\n", 
-                        version.chVersion, version.nBetaVer );
+                        version::Inst().chVersion, version::Inst().nBetaVer );
         }
 
@@ -127 +127 @@
         {
                 /* this code prints pretty lines at top of output box */
-                for( i=0; i<57; i++ ) 
-                {
-                        fprintf(ioQQQ,"%c",' ');
-                }
-                fprintf( ioQQQ, "Cloudy %s\n", version.chVersion);
-
-                for( i=0; i<57; i++ ) 
-                {
-                        fprintf(ioQQQ,"%c",' ');
-                }
-                fprintf( ioQQQ, "www.nublado.org\n\n");
-
-                for( i=0; i<23; i++ ) 
-                {
-                        fprintf(ioQQQ,"%c",' ');
-                }
+                int indent = (122 - strlen(version::Inst().chVersion))/2;
+                fprintf( ioQQQ, "%*cCloudy %s\n", indent, ' ', version::Inst().chVersion );
+
+                fprintf( ioQQQ, "%57cwww.nublado.org\n\n", ' ' );
 
                 /* now print box and date of version, before printing commands */
+                fprintf( ioQQQ, "%23c", ' ' );
                 fprintf( ioQQQ, "**************************************");
-                fprintf( ioQQQ, "%8.8s", version.chDate);
-                fprintf( ioQQQ, "*************************************\n");
-
-                for( i=0; i<23; i++ ) 
-                {
-                        fprintf(ioQQQ,"%c",' ');
-                }
-                fprintf( ioQQQ, "*");
-
-                for( i=0; i<81; i++ ) 
-                {
-                        fprintf(ioQQQ,"%c",' ');
-                }
-                fprintf( ioQQQ, "*\n");
+                fprintf( ioQQQ, "%7.7s", version::Inst().chDate);
+                fprintf( ioQQQ, "**************************************\n");
+
+                fprintf( ioQQQ, "%23c*%81c*\n", ' ', ' ' );
         }
 
@@ -194 +173 @@
                 /* >>chng 04 jan 21, add HIDE option, mostly for print quiet command */
                 if( called.lgTalk && !nMatch("HIDE",input.chCARDCAPS) )
-                {
-                        fprintf( ioQQQ, "                       * ");
-                        i=0;
-                        while( chCard[i]!='\0' )
-                        {
-                                fprintf(ioQQQ,"%c",chCard[i]);
-                                ++i;
-                        }
-
-                        while( i<80 )
-                        {
-                                fprintf(ioQQQ,"%c",' ');
-                                ++i;
-                        }
-                        fprintf(ioQQQ,"*\n");
-                }
+                        fprintf( ioQQQ, "%23c* %-80s*\n", ' ', chCard );
 
                 /* change chCard to all caps */
@@ -1863 +1827 @@
         if( called.lgTalk )
         {
-                fprintf( ioQQQ, "                       * %80.80s*\n", 
-                  chCard );
-                fprintf( ioQQQ, "                       ***********************************************************************************\n\n\n\n" );
+                fprintf( ioQQQ, "%23c*%81c*\n", ' ', ' ' );
+                fprintf( ioQQQ, "%23c***********************************************************************************\n\n\n\n", ' ' );
         }
 

trunk/source/parse_print.cpp

@@ -72 +72 @@
                 fprintf( ioQQQ, "Calculations were performed with version %s of Cloudy,"
                         " last described by %s.\n\n",
-                        version.chVersion,
-                        version.chCitationShort);
-                fprintf( ioQQQ, "The reference is:\n%s\n\n", version.chCitation );
-                fprintf( ioQQQ, "In Latex this is:\n%s\n\n", version.chCitationLatex  );
+                        version::Inst().chVersion,
+                        version::Inst().chCitationShort);
+                fprintf( ioQQQ, "The reference is:\n%s\n\n", version::Inst().chCitation );
+                fprintf( ioQQQ, "In Latex this is:\n%s\n\n", version::Inst().chCitationLatex  );
         }
 
@@ -96 +96 @@
                 /* print compiler and code version information */
                 fprintf( ioQQQ, "\nThis is Cloudy, version %s\n%s\n\n" , 
-                        version.chVersion,
-                        version.chInfo );
+                        version::Inst().chVersion,
+                        version::Inst().chInfo );
         }
 

trunk/source/parse_punch.cpp

@@ -203 +203 @@
                 sprintf( chHeader, 
                         "# %s %s\n", 
-                  version.chVersion, input.chTitle );
+                  version::Inst().chVersion, input.chTitle );
         }
 

trunk/source/prt_comment.cpp

@@ -160 +160 @@
         wcnint();
 
-        if( version.nBetaVer > 0 )
+        if( version::Inst().nBetaVer > 0 )
         {
                 sprintf( chLine, 
                         "  !This is beta test version%4ld and is intended for testing only.", 
-                  version.nBetaVer );
+                  version::Inst().nBetaVer );
                 bangin(chLine);
         }
@@ -171 +171 @@
          * to show that parts of the code need repair. 
          * lgRelease is true if this is release version */
-        if( broke.lgFixit && !version.lgRelease )
+        if( broke.lgFixit && !version::Inst().lgRelease )
         {
                 sprintf( chLine, "  !The code needs to be fixed - search for fixit()." );
@@ -180 +180 @@
         * to show that parts of the code need to be reviewed. 
         * lgRelease is true if this is release version */
-        if( broke.lgCheckit  && !version.lgRelease )
+        if( broke.lgCheckit  && !version::Inst().lgRelease )
         {
                 sprintf( chLine, "  !New code needs to be reviewed - search for CodeReview()." );

trunk/source/prt_final.cpp

@@ -136 +136 @@
 
         /* print name and version number */
-        /*lint -e666 expression with side effects */
         fprintf( ioQQQ, "\f\n");
-        REPEAT_16( fprintf( ioQQQ, " "); )
-        REPEAT_4( fprintf( ioQQQ, " "); )
-        REPEAT_2( fprintf( ioQQQ, " ");)
-        fprintf( ioQQQ, " "); 
-        for(i=0; i<31; ++i )
-                fprintf( ioQQQ, "*");
-        fprintf( ioQQQ, "*"); 
-        fprintf( ioQQQ, "> Cloudy %s <", version.chVersion);
-        for(i=0; i<32; ++i )
-                fprintf( ioQQQ, "*");
+        fprintf( ioQQQ, "%23c", ' ' );
+        int len = strlen(version::Inst().chVersion);
+        int repeat = (72-len)/2;
+        for( i=0; i < repeat; ++i )
+                fprintf( ioQQQ, "*" );
+        fprintf( ioQQQ, "> Cloudy %s <", version::Inst().chVersion );
+        for( i=0; i < 72-repeat-len; ++i )
+                fprintf( ioQQQ, "*" );
         fprintf( ioQQQ, "\n" );
-        /*lint +e666 */
 
         for( i=0; i <= input.nSave; i++ )
@@ -165 +161 @@
                 /* >>chng 04 jan 21, add hide option */
                 if( (strcmp(chCKey,"CONT")!= 0) && !nMatch( "HIDE" , input.chCARDCAPS) )
-                {
-                        /* print leading space and first * */
-                        fprintf( ioQQQ, "                       * ");
-
-                        j = 0;
-                        /* print actual command */
-                        while( input.chCardSav[i][j] !='\0' )
-                        {
-                                fprintf( ioQQQ, "%c", input.chCardSav[i][j] );
-                                ++j;
-                        }
-
-                        /* flush out rest of space then * */
-                        while( j<80 )
-                        {
-                                fprintf( ioQQQ, "%c", ' ' );
-                                ++j;
-                        }
-                        /* end the line */
-                        fprintf( ioQQQ, "*\n" );
-                }
+                        fprintf( ioQQQ, "%23c* %-80s*\n", ' ', input.chCardSav[i] );
         }
 
@@ -202 +178 @@
           a );
 
-        if( version.nBetaVer > 0 )
+        if( version::Inst().nBetaVer > 0 )
         {
                 fprintf( ioQQQ, 

trunk/source/punch_fits.cpp

@@ -755 +755 @@
         strcat( tempString, chVer );
         bytesAdded += addComment( tempString );
-        bytesAdded += addComment( version.chInfo );
+        bytesAdded += addComment( version::Inst().chInfo );
         strcpy( tempString, "--- " );
         strcat( tempString, timeString );

trunk/source/service.cpp

@@ -255 +255 @@
 
                         fprintf( ioQQQ, " Cloudy version number is %s\n", 
-                                version.chVersion );
-                        fprintf( ioQQQ, " %s\n\n", version.chInfo );
+                                version::Inst().chVersion );
+                        fprintf( ioQQQ, " %s\n\n", version::Inst().chInfo );
 
                         fprintf( ioQQQ, "%5ld warnings,%3ld cautions,%3ld temperature failures.  Messages follow.\n", 

trunk/source/version.h

@@ -6 +6 @@
 
 /** version.h */
+#include "date.h"
 
-#define CITATION        "Ferland, G. J., Korista, K. T., Verner, D. A., Ferguson, J. W., Kingdon, J. B., & Verner, E. M. 1998, PASP, 110, 761" 
-#define CITATION_LATEX  "\\bibitem[Ferland et al.(1998)]{1998PASP..110..761F} Ferland, G.~J., Korista, K.~T., Verner, D.~A., Ferguson, J.~W., Kingdon, J.~B., \\& Verner, E.~M.\\ 1998, \\pasp, 110, 761" 
-#define CITATION_SHORT  "Ferland et al. (1998)" 
+#if 0
+static const int CLD_MAJOR = 8;
+static const int CLD_MINOR = 0;
 
-EXTERN struct t_version {
+#ifdef SVN_REVISION
+static const char* svn_revision = SVN_REVISION;
+#else
+static const char* svn_revision = "unknown";
+#endif
 
+static const string Url = "$HeadURL$";
+#endif
+
+static const char* CITATION = "Ferland, G. J., Korista, K. T., Verner, D. A., Ferguson, J. W., Kingdon, J. B., & Verner, E. M. 1998, PASP, 110, 761";
+static const char* CITATION_LATEX = "\\bibitem[Ferland et al.(1998)]{1998PASP..110..761F} Ferland, G.~J., Korista, K.~T., Verner, D.~A., Ferguson, J.~W., Kingdon, J.~B., \\& Verner, E.~M.\\ 1998, \\pasp, 110, 761";
+static const char* CITATION_SHORT = "Ferland et al. (1998)";            
+
+class version : public Singleton<version> 
+{
+        friend class Singleton<version>;
+protected:
+        version()
+        {
+                /* set date and version - this code will need to be modified in the year 2100 */
+                if( YEAR >= 200 )
+                {
+                        fprintf(ioQQQ,"must update formation of chDate in cdInit \n");
+                        TotalInsanity();
+                }
+                
+                static const char chMonth[12][4] =
+                        { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+                
+                /* is this a beta version?  0 for no */
+                nBetaVer = 0;
+                
+                /* is this a release version? */
+                lgRelease = false;
+                
+                sprintf( chDate, "%2.2i%3.3s%2.2i", 
+                         YEAR-100,
+                         chMonth[MONTH],
+                         DAY );
+
+                sprintf( chVersion, "%2.2i.%2.2i.%2.2i", 
+                         YEAR-100,
+                         MONTH+1,
+                         DAY );
+                
+                char mode[6];
+                if( sizeof(long) == 4 )
+                        strncpy( mode, "ILP32", 6 );
+                else if( sizeof(long) == 8 )
+                        strncpy( mode, "LP64", 6 );
+                else
+                        strncpy( mode, "?????", 6 );
+                
+                /* now generate info on how we were compiled, including compiler version */
+                sprintf(chInfo , 
+                        "cdInit compiled on %s in OS %s using the %s %i compiler in %s mode." ,
+                        __DATE__  ,__OS , __COMP , __COMP_VER, mode);
+
+                chCitation = CITATION;
+                chCitationLatex = CITATION_LATEX;
+                chCitationShort = CITATION_SHORT;
+        }
+public:
         /** date of this version of the code as a string, set in cdinit.c,
          * where space is allocated */
-        char *chDate;
+        char chDate[INPUT_LINE_LENGTH];
 
         /** version number of this version of the code, as a string, set in cdinit.c 
          * where space is allocated */
-        char *chVersion;
+        char chVersion[INPUT_LINE_LENGTH];
 
         /** normally zero, non-zero if this is a beta test version */
@@ -39 +101 @@
         /** string to print latex bibitem with print citation command */
         const char *chCitationLatex;
-
-}       version;
+};