Changeset 13691

Timestamp:

10/16/12 09:55:40 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: PrintBanner is now done by EnvironmentInit instead of FemModel so that it is printed only once

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (1 diff)
• classes/FemModel.h (modified) (1 diff)
• solutions/EnvironmentInit.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -222 +222 @@
 }
 /*}}}*/
-/*FUNCTION FemModel::PrintBanner {{{*/
-void FemModel::PrintBanner(void){
-
-        _pprintLine_("");
-        _pprintLine_("Ice Sheet System Model (" << PACKAGE_NAME << ") version " << PACKAGE_VERSION);
-        _pprintLine_("(website: " << PACKAGE_URL << " contact: " << PACKAGE_BUGREPORT << ")");
-        _pprintLine_("");
-
-}
-/*}}}*/
 /*FUNCTION FemModel::SetStaticComm {{{*/
 void FemModel::SetStaticComm(void){

issm/trunk-jpl/src/c/classes/FemModel.h

@@ -57 +57 @@
                 void OutputResults(void);
                 void SetStaticComm();
-                void PrintBanner(void);
                 /*}}}*/
                 /*Fem: {{{*/

issm/trunk-jpl/src/c/solutions/EnvironmentInit.cpp

@@ -7 +7 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
+#include <stdio.h>
 #include "../include/include.h"
 #include "../toolkits/toolkits.h"
@@ -12 +13 @@
 COMM EnvironmentInit(int argc,char** argv){
 
+        /*Output*/
+        COMM comm = 0;
+
         /*Initialize environments: Petsc, MPI, etc...: */
-        #ifdef _HAVE_PETSC_
+        #if defined (_HAVE_PETSC_)
         int ierr=PetscInitialize(&argc,&argv,(char*)0,"");  
         if(ierr) _error_("Could not initialize Petsc");
-        return MPI_COMM_WORLD;
+        comm = MPI_COMM_WORLD;
+        #elif defined(_HAVE_MPI_)
+        MPI_Init(&argc,&argv);
+        comm = MPI_COMM_WORLD;
         #else
-        #ifdef _HAVE_MPI_
-        MPI_Init(&argc,&argv);
-        return MPI_COMM_WORLD;
-        #else
-        return 1; //return bogus number for comm, which does not exist anyway.
-        #endif
+        comm = 1; //bogus number for comm, which does not exist anyway.
         #endif
 
+        /*Print Banner*/
+        int my_rank = 0;
+        #ifdef _HAVE_MPI_
+        MPI_Comm_rank(comm,&my_rank);
+        #endif
+        if(!my_rank) printf("\n");
+        if(!my_rank) printf("Ice Sheet System Model (%s) version  %s\n",PACKAGE_NAME,PACKAGE_VERSION);
+        if(!my_rank) printf("(website: %s contact: %s\n",PACKAGE_URL,PACKAGE_BUGREPORT);
+        if(!my_rank) printf("\n");
+
+        /*Return communicator*/
+        return comm;
 }