Changeset 13554

Timestamp:

10/05/12 11:22:30 (12 years ago)

Author:

Eric.Larour

Message:

CHG:

• profiling is now done entirely inside the FemModel methods
• moved globals into issm.h
• PrintBanner a new routine to dump ISSM specific information.

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• classes/FemModel.cpp (modified) (4 diffs)
• classes/FemModel.h (modified) (1 diff)
• issm.h (modified) (1 diff)
• solutions/PrintBanner.cpp (added)
• solutions/issm.cpp (modified) (3 diffs)
• solutions/kriging.cpp (modified) (1 diff)
• solutions/solutions.h (modified) (1 diff)

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

@@ -343 +343 @@
                                         ./modules/InputConvergencex/InputConvergencex.cpp\
                                         ./modules/InputConvergencex/InputConvergencex.h\
+                                        ./solutions/PrintBanner.cpp\
                                         ./solutions/convergence.cpp\
                                         ./solutions/ProcessArguments.cpp\

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

@@ -171 +171 @@
         delete parameters;
         delete results;
+
+        /*Before we delete the profiler, report statistics for this run: */
+        profiler->Tag(Finish);  //final tagging
+        _pprintLine_("");
+        _pprintLine_("   "<<setw(40)<<left<<"FemModel initialization elapsed time:"<<profiler->DeltaTime(StartInit,FinishInit));
+        _pprintLine_("   "<<setw(40)<<left<<"Core solution elapsed time:"<<profiler->DeltaTime(StartCore,FinishCore));
+        _pprintLine_("");
+        _pprintLine_("   Total elapsed time:"
+                        <<profiler->DeltaTimeModHour(Start,Finish)<<" hrs "
+                        <<profiler->DeltaTimeModMin(Start,Finish)<<" min "
+                        <<profiler->DeltaTimeModSec(Start,Finish)<<" sec"
+                        );
+        _pprintLine_("");
+
+        /*Now delete: */
         delete profiler;
 
@@ -177 +192 @@
 
 /*Object management*/
+/*FUNCTION FemModel::OutputResults {{{*/
+void FemModel::OutputResults(void){
+        
+        _pprintLine_("write results to disk:");
+
+        /*Just call the OutputResultsx module: */
+        OutputResultsx(this->elements, this->nodes, this->vertices, this->loads, this->materials, this->parameters,this->results);
+
+}
+/*}}}*/
 /*FUNCTION FemModel::Solve {{{*/
 void FemModel::Solve(void){
 
+        /*profiling: */
+        bool profiling = false;
+        IssmDouble solution_time;
+        IssmDouble solution_flops;
+        IssmDouble solution_memory;
+
+        /*solution: */
         int solution_type;
         void (*solutioncore)(FemModel*)=NULL; //core solution function pointer
@@ -186 +218 @@
 
         /*Retrieve solution_type from parameters: */
-        this->parameters->FindParam(&solution_type,SolutionTypeEnum);
+        parameters->FindParam(&solution_type,SolutionTypeEnum);
 
         /*Figure out which solution core we are going to run with the current solution type: */
@@ -201 +233 @@
         profiler->Tag(FinishAdCore);
 
+        /*some profiling results for the core: */
+        parameters->FindParam(&profiling,DebugProfilingEnum);
+        if(profiling){
+
+                solution_time=profiler->DeltaTime(StartCore,FinishCore);
+                solution_flops=profiler->DeltaFlops(StartCore,FinishCore);
+                solution_memory=profiler->Memory(FinishCore);
+
+                _pprintLine_("Solution elapsed time  : " << solution_time << "  Seconds");
+                _pprintLine_("Solution elapsed flops : " << solution_flops << "  Flops");
+                _pprintLine_("Solution memory used   : " << solution_memory << "  Bytes");
+
+                /*Add to results: */
+                results->AddObject(new GenericExternalResult<IssmDouble>(results->Size()+1, ProfilingSolutionTimeEnum, solution_time, 1, 0));
+                results->AddObject(new GenericExternalResult<IssmDouble>(results->Size()+1, ProfilingCurrentMemEnum, solution_memory, 1, 0));
+                results->AddObject(new GenericExternalResult<IssmDouble>(results->Size()+1, ProfilingCurrentFlopsEnum, solution_flops, 1, 0));
+        }
 
 }

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

@@ -54 +54 @@
                 void Echo();
                 void Solve(void);
+                void OutputResults(void);
 
                 /*Fem: */

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

@@ -12 +12 @@
 #endif
 
+#include "./include/globals.h" //only include this header file once!
 #include "./include/include.h"
 #include "./shared/shared.h"

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

@@ -1 +1 @@
 /*!\file:  issm.cpp
- * \brief: ISSM main parallel program
+ * \brief: ISSM main program
  */ 
 
 #include "../issm.h"
-#include "../include/globals.h"
         
-void ProfilerEcho(Profiler* profiler);
-void ProfilerEnd(Profiler* profiler, Results* results, Parameters* parameters);
-
 int main(int argc,char **argv){
 
-        /*FemModel: */
-        FemModel *femmodel = NULL;
-
-        /*Print starting banner: {{{*/
-        _pprintLine_("");
-        _pprintLine_("Ice Sheet System Model (" << PACKAGE_NAME << ") version " << PACKAGE_VERSION);
-        _pprintLine_("(website: " << PACKAGE_URL << " contact: " << PACKAGE_BUGREPORT << ")");
-        _pprintLine_(""); 
-        /*}}}*/
+        /*Print starting banner:*/
+        PrintBanner();
 
         /*Initialize exception trapping: */
@@ -28 +17 @@
                 
         /*Initialize femmodel from arguments provided command line: */
-        femmodel=new FemModel(argc,argv);
+        FemModel *femmodel = new FemModel(argc,argv);
 
         /*Solve: */
         femmodel->Solve();
 
-        /*Some profiling: */
-        ProfilerEnd(femmodel->profiler,femmodel->results,femmodel->parameters);
-
-        _pprintLine_("write results to disk:");
-        OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
-        
-        /*Profiling at the end: */
-        femmodel->profiler->Tag(Finish); 
-        ProfilerEcho(femmodel->profiler);
+        /*Output results: */
+        femmodel->OutputResults();
         
         /*Wrap up: */
@@ -55 +37 @@
         return 0; 
 }
-        
-void ProfilerEcho(Profiler* profiler){ /*{{{*/
-
-        _pprintLine_("");
-        _pprintLine_("   "<<setw(40)<<left<<"FemModel initialization elapsed time:"<<profiler->DeltaTime(StartInit,FinishInit));
-        _pprintLine_("   "<<setw(40)<<left<<"Core solution elapsed time:"<<profiler->DeltaTime(StartCore,FinishCore));
-        _pprintLine_("");
-        _pprintLine_("   Total elapsed time:"
-                <<profiler->DeltaTimeModHour(Start,Finish)<<" hrs "
-                <<profiler->DeltaTimeModMin(Start,Finish)<<" min "
-                <<profiler->DeltaTimeModSec(Start,Finish)<<" sec"
-                );
-        _pprintLine_("");
-
-} /*}}}*/
-void ProfilerEnd(Profiler* profiler, Results* results, Parameters* parameters){ /*{{{*/
-
-        bool profiling = false;
-        
-        IssmDouble solution_time;
-        IssmDouble solution_flops;
-        IssmDouble solution_memory;
-
-        parameters->FindParam(&profiling,DebugProfilingEnum); 
-
-        if(profiling){
-
-                solution_time=profiler->DeltaTime(StartCore,FinishCore);
-                solution_flops=profiler->DeltaFlops(StartCore,FinishCore);
-                solution_memory=profiler->Memory(FinishCore);
-
-                _pprintLine_("Solution elapsed time  : " << solution_time << "  Seconds");
-                _pprintLine_("Solution elapsed flops : " << solution_flops << "  Flops");
-                _pprintLine_("Solution memory used   : " << solution_memory << "  Bytes");
-
-                /*Add to results: */
-                results->AddObject(new GenericExternalResult<IssmDouble>(results->Size()+1, ProfilingSolutionTimeEnum, solution_time, 1, 0));
-                results->AddObject(new GenericExternalResult<IssmDouble>(results->Size()+1, ProfilingCurrentMemEnum, solution_memory, 1, 0));
-                results->AddObject(new GenericExternalResult<IssmDouble>(results->Size()+1, ProfilingCurrentFlopsEnum, solution_flops, 1, 0));
-        }
-
-} /*}}}*/

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

@@ -4 +4 @@
 
 #include "../issm.h"
-#include "../include/globals.h"
 
 /*Local prototypes*/

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

@@ -50 +50 @@
 void EnvironmentFinalize(void);
 int  DakotaSpawnCore(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, void* femmodel,int counter);
+void PrintBanner(void);
 
 //solution configuration