Changeset 20955

Timestamp:

07/19/16 16:16:28 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not checkpoint profiler, this messes up the tags and does not make sense

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (5 diffs)
• classes/Profiler.cpp (modified) (1 diff)
• cores/transient_core.cpp (modified) (1 diff)

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

@@ -362 +362 @@
 
         if(marshall_direction==MARSHALLING_BACKWARD){
-                delete this->profiler;
                 delete this->loads;
                 delete this->materials;
@@ -373 +372 @@
                 xDelete<int>(this->analysis_type_list);
 
-                this->profiler    = new Profiler();
                 this->loads       = new Loads();
                 this->materials   = new Materials();
@@ -391 +389 @@
         MARSHALLING_DYNAMIC(analysis_type_list,int,nummodels);
 
-        this->profiler->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
         this->loads->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
         this->materials->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
@@ -402 +399 @@
 
         if(marshall_direction==MARSHALLING_BACKWARD){
-                //reset hooks for elements, loads and nodes:
+                /*reset hooks for elements, loads and nodes:*/
                 this->elements->ResetHooks();
                 this->loads->ResetHooks();
                 this->materials->ResetHooks();
 
-                //do the post-processing of the datasets to get an FemModel that can actually run analyses:
+                /*do the post-processing of the datasets to get an FemModel that can actually run analyses:*/
                 for(i=0;i<nummodels;i++){
                         analysis_type=this->analysis_type_list[i];
@@ -435 +432 @@
         /*First, recover the name of the restart file: */
         parameters->FindParam(&restartfilename,RestartFileNameEnum);
+
+        /*Print banner*/
+        _printf0_("                                                                    \n");
+        _printf0_("====================================================================\n");
+        _printf0_("                         RESTART DETECTED                           \n");
+        _printf0_("                                                                    \n");
+        _printf0_("  Restart file: "<<restartfilename<<"                               \n");
+        _printf0_("====================================================================\n");
+        _printf0_("                                                                    \n");
 
         /*Now, figure out whether this file actually exists!: */

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

@@ -50 +50 @@
 
         _printf_("Profiler:\n");
-        _printf_("   time tags: \n");
-        _error_("not implemented yet");
+        for(int i=0;i<MAXIMUMSIZE;i++){
+                _printf_("    Tag "<<i<<":\n");
+                _printf_("       flops:  "<<this->flops[i]<<"\n");
+                _printf_("       memory: "<<this->memory[i]<<"\n");
+                _printf_("       time:   "<<this->time[i]<<"\n");
+        }
 
 }

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -62 +62 @@
         if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,TransientRequestedOutputsEnum);
 
-        //first, figure out if there was a check point, if so, do a reset of the FemModel* femmodel structure. 
+        /*first, figure out if there was a check point, if so, do a reset of the FemModel* femmodel structure. */
         if(recording_frequency)femmodel->Restart();