Changeset 1726

Timestamp:

01/01/08 04:31:10 (11 months ago)

Author:

peter

Message:

source/maincl.cpp:

Bug-fix - main() should also call cdEXIT so that punch files are closed.

source/cdinit.cpp:

Make sure there is no output after last print statement in main().

Location:

trunk/source

Files:

• cdinit.cpp (modified) (2 diffs)
• maincl.cpp (modified) (1 diff)

trunk/source/cdinit.cpp

@@ -243 +243 @@
 /*cdEXIT the routine that should be called to exit cloudy */
 NORETURN void cdEXIT(
-                                         /* EXIT_FAILURE for failure, EXIT_SUCCESS for success */
-                                         int iexit)
+        /* EXIT_FAILURE for failure, EXIT_SUCCESS for success */
+        int iexit)
 {
         enum {DEBUG_LOC=false};
@@ -261 +261 @@
         if( lgMPI )
         {
-                fprintf(ioQQQ," MPI_Finalize called.\n");
 #               ifdef MPI_ENABLED
                 MPI_Finalize();

trunk/source/maincl.cpp

@@ -329 +329 @@
                 /* cdDrive returned 1 if something bad happened, and 0 if everything is ok.  We will
                  * return 0 if everything is ok, and 1 if something bad happened.*/
-                return(lgBadExit);
+                cdEXIT(lgBadExit);
         }
         catch( bad_alloc )