Changeset 1891 for trunk/source/grid_do.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/grid_do.cpp (modified) (3 diffs)

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 */