Changeset 12004 for issm/branches/trunk-jpl-damage/src/c/solutions/issm.cpp

Timestamp:

04/16/12 16:06:52 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 11990

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/solutions/issm.cpp (modified) (4 diffs)

issm/branches/trunk-jpl-damage/src/c/solutions/issm.cpp

@@ -7 +7 @@
 
 int main(int argc,char **argv){
-
-        /*MPI: */
-        extern int my_rank;
-        extern int num_procs;
 
         /*I/O: */
@@ -41 +37 @@
         MODULEBOOT();
 
-        #if !defined(_PARALLEL_) || (defined(_PARALLEL_) && !defined(_HAVE_PETSC_))
+        #ifndef _PARALLEL_
         _error_(" parallel executable was compiled without support of parallel libraries!");
         #endif
@@ -60 +56 @@
 
         /*First process inputs*/
-        _printf_(true,"Launching solution sequence\n");
+        _printf_(true,"\n");
+        _printf_(true,"Ice Sheet System Model (%s) version %s\n",PACKAGE_NAME,PACKAGE_VERSION);
+        _printf_(true,"(website: %s contact: %s)\n",PACKAGE_URL,PACKAGE_BUGREPORT);
+        _printf_(true,"\n");
         ProcessArguments(&solution_type,&binfilename,&outbinfilename,&petscfilename,&lockfilename,argc,argv);
 
@@ -114 +113 @@
 
         _printf_(true,"write results to disk:\n");
-        OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,&femmodel->results);
+        OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
 
         /*Close output and petsc options file and write lock file if requested*/