Changeset 1891 for trunk/source/init_coreload.cpp

Timestamp:

03/27/08 12:40:50 (8 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.
  

Files:

• trunk/source/init_coreload.cpp (modified) (2 diffs)

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 ) );