Changeset 13534

Timestamp:

10/04/12 12:22:14 (12 years ago)

Author:

Eric.Larour

Message:

NEW and CHG:
added new enums in src/m/enum. Please run source Synchronize.sh when adding new enums in EnumDefinitions.h
new Profiler object that stores unlimited number of tags. easier to handle time profiling anywhere in the
code.
debugged EnvironmentInit, which was duplicating external symbols.
new EnvironmentFinalize, to simplify finalization of environment variables like Petsc and MPI.
simplified issm.cpp accordingly with new Profiler capabilitlie.s

Location:

issm/trunk-jpl/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/Makefile.am (modified) (2 diffs)
• c/classes/objects/Profiler.cpp (added)
• c/classes/objects/Profiler.h (added)
• c/classes/objects/objects.h (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (3 diffs)
• c/solutions/EnvironmentFinalize.cpp (added)
• c/solutions/EnvironmentInit.cpp (modified) (1 diff)
• c/solutions/issm.cpp (modified) (3 diffs)
• c/solutions/kriging.cpp (modified) (1 diff)
• c/solutions/solutions.h (modified) (1 diff)
• m/enum/EnumDefinitions.py (modified) (2 diffs)
• m/enum/MaximumNumberOfEnums.m (modified) (1 diff)
• m/enum/ProfilerEnum.m (added)
• m/enum/SurfaceforcingsHrefEnum.m (added)
• m/enum/SurfaceforcingsSmbrefEnum.m (added)

issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h

@@ -323 +323 @@
         PentaEnum,
         PentaP1InputEnum,
+        ProfilerEnum,
         MatrixParamEnum,
         VectorParamEnum,

issm/trunk-jpl/src/c/Makefile.am

@@ -159 +159 @@
                                         ./classes/objects/Params/DataSetParam.h\
                                         ./classes/objects/Params/DataSetParam.cpp\
+                                        ./classes/objects/Profiler.h\
+                                        ./classes/objects/Profiler.cpp\
                                         ./Container/Container.h\
                                         ./Container/Constraints.h\
@@ -351 +353 @@
                                         ./solutions/CorePointerFromSolutionEnum.cpp\
                                         ./solutions/EnvironmentInit.cpp\
+                                        ./solutions/EnvironmentFinalize.cpp\
                                         ./solvers/solver_linear.cpp\
                                         ./solvers/solver_nonlinear.cpp\

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

@@ -13 +13 @@
 #include "./Vertex.h"
 #include "./Node.h"
+#include "./Profiler.h"
 #include "./DependentObject.h"
 #include "./IndependentObject.h"

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -320 +320 @@
                 case PentaEnum : return "Penta";
                 case PentaP1InputEnum : return "PentaP1Input";
+                case ProfilerEnum : return "Profiler";
                 case MatrixParamEnum : return "MatrixParam";
                 case VectorParamEnum : return "VectorParam";

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -327 +327 @@
               else if (strcmp(name,"Penta")==0) return PentaEnum;
               else if (strcmp(name,"PentaP1Input")==0) return PentaP1InputEnum;
+              else if (strcmp(name,"Profiler")==0) return ProfilerEnum;
               else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
               else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
@@ -383 +384 @@
               else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
               else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
-              else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
+              if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
+              else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
               else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
               else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
@@ -506 +507 @@
               else if (strcmp(name,"Scaled")==0) return ScaledEnum;
               else if (strcmp(name,"Separate")==0) return SeparateEnum;
-              else if (strcmp(name,"Sset")==0) return SsetEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Verbose")==0) return VerboseEnum;
+              if (strcmp(name,"Sset")==0) return SsetEnum;
+              else if (strcmp(name,"Verbose")==0) return VerboseEnum;
               else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum;
               else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;

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

@@ -9 +9 @@
 #include "../include/include.h"
 #include "../toolkits/toolkits.h"
-#include "../include/globals.h"
 
 void EnvironmentInit(int argc,char** argv){
+        
+        extern int my_rank;
+        extern int num_procs;
 
         /*Initialize environments: Petsc, MPI, etc...: */

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

@@ -6 +6 @@
 #include "../include/globals.h"
         
+void ProfilerEcho(Profiler* profiler);
+
 int main(int argc,char **argv){
 
@@ -34 +36 @@
         char *rootpath       = NULL;
 
-        /*time*/
-        IssmPDouble   finish;
-        IssmPDouble   start_core, finish_core;
-
         /*profiling*/   
+        Profiler* profiler=NULL;
         bool profiling = false;
         IssmPDouble Time_start, Flops_start;
@@ -185 +184 @@
 
         /*Get finish time and close*/
-        #ifdef _HAVE_MPI_
-        MPI_Barrier(MPI_COMM_WORLD); finish = MPI_Wtime( );
-        _pprintLine_("");
-        _pprintLine_("   "<<setw(40)<<left<<"FemModel initialization elapsed time:"<<finish_init-start_init);
-        _pprintLine_("   "<<setw(40)<<left<<"Core solution elapsed time:"<<finish_core-start_core);
-        _pprintLine_("");
-        _pprintLine_("   Total elapsed time:"<<int((finish-start)/3600)<<" hrs "<<int(int(finish-start)%3600/60)<<" min "<<int(finish-start)%60<<" sec");
-        _pprintLine_("");
-        #else
-        finish=(IssmPDouble)clock();
-        _pprintLine_("");
-        _pprintLine_("   "<<setw(40)<<left<<"FemModel initialization elapsed time:"<<(finish_init-start_init)/CLOCKS_PER_SEC);
-        _pprintLine_("   "<<setw(40)<<left<<"Core solution elapsed time:"<<(finish_core-start_core)/CLOCKS_PER_SEC);
-        _pprintLine_("");
-        _pprintLine_("   Total elapsed time:"
-                                <<int((finish-start)/CLOCKS_PER_SEC/3600)<<" hrs "
-                                <<int(int(finish-start)/CLOCKS_PER_SEC%3600/60)<<" min "
-                                <<int(finish-start)/CLOCKS_PER_SEC%60<<" sec");
-        _pprintLine_("");
-        #endif
-        
-        #ifdef _HAVE_PETSC_
-        _pprintLine_("closing MPI and Petsc");
-        PetscFinalize(); 
-        #else
-        #ifdef _HAVE_MPI_
-        _pprintLine_("closing MPI and Petsc");
-        MPI_Finalize();
-        #endif
-        #endif
+        profiler->Tag(Finish); ProfilerEcho(profiler);
+
+        /*Finalize environment:*/
+        EnvironmentFinalize();
 
         /*Finalize exception trapping: */
         ExceptionTrapEnd();
 
-        return 0; //unix success return;
+        /*Return unix success: */
+        return 0; 
 }
+        
+
+
+void ProfilerEcho(Profiler* profiler){
+
+        _pprintLine_("");
+        _pprintLine_("   "<<setw(40)<<left<<"FemModel initialization elapsed time:"<<profiler->Delta(StartInit,FinishInit));
+        _pprintLine_("   "<<setw(40)<<left<<"Core solution elapsed time:"<<profiler->Delta(StartCore,FinishCore));
+        _pprintLine_("");
+        _pprintLine_("   Total elapsed time:"
+                <<profiler->DeltaModHour(Start,Finish)<<" hrs "
+                <<profiler->DeltaModMin(Start,Finish)<<" min "
+                <<profiler->DeltaModSec(Start,Finish)<<" sec"
+                );
+        _pprintLine_("");
+
+}
+

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

@@ -89 +89 @@
         delete results;
 
-#ifdef _HAVE_PETSC_
-        _pprintLine_("closing MPI and Petsc");
-        PetscFinalize(); 
-#else
-#ifdef _HAVE_MPI_
-        _pprintLine_("closing MPI and Petsc");
-        MPI_Finalize();
-#endif
-#endif
+        /*Finalize environment:*/
+        EnvironmentFinalize();
 
         /*Finalize exception trapping: */

issm/trunk-jpl/src/c/solutions/solutions.h

@@ -46 +46 @@
 void ResetBoundaryConditions(FemModel* femmodel, int analysis_type);
 void EnvironmentInit(int argc,char** argv);
+void EnvironmentFinalize(void);
 
 //solution configuration

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -3039 +3039 @@
         return StringToEnum('PentaP1Input')[0]
 
+def ProfilerEnum():
+        """
+        PROFILERENUM - Enum of Profiler
+
+           Usage:
+              macro=ProfilerEnum()
+        """
+
+        return StringToEnum('Profiler')[0]
+
 def MatrixParamEnum():
         """
@@ -4967 +4977 @@
         """
 
-        return 495
-
+        return 496
+

issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=495;
+macro=496;