[issm-svn] r21150 - issm/trunk/src/c/classes

[morlighe at issm.ess.uci.edu]

Author: morlighe
Date: 2016-08-19 15:05:57 -0700 (Fri, 19 Aug 2016)
New Revision: 21150

Modified:
   issm/trunk/src/c/classes/FemModel.cpp
Log:
CHG: allow profiling again

Modified: issm/trunk/src/c/classes/FemModel.cpp
===================================================================
--- issm/trunk/src/c/classes/FemModel.cpp	2016-08-18 20:07:40 UTC (rev 21149)
+++ issm/trunk/src/c/classes/FemModel.cpp	2016-08-19 22:05:57 UTC (rev 21150)
@@ -344,7 +344,6 @@
 	/*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);
@@ -354,9 +353,9 @@
 		_printf0_("Core solution memory used     : " << solution_memory << " Bytes\n");
 
 		/*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));
+		results->AddObject(new GenericExternalResult<IssmDouble>(results->Size()+1, ProfilingSolutionTimeEnum, solution_time ));
+		results->AddObject(new GenericExternalResult<IssmDouble>(results->Size()+1, ProfilingCurrentMemEnum, solution_memory ));
+		results->AddObject(new GenericExternalResult<IssmDouble>(results->Size()+1, ProfilingCurrentFlopsEnum, solution_flops));
 
 		#ifdef _HAVE_ADOLC_
 		solution_time=profiler->DeltaTime(StartAdCore,FinishAdCore);
@@ -366,10 +365,8 @@
 		_printf0_("AD Solution elapsed time    : " << solution_time   << " Seconds\n");
 		_printf0_("AD Solution number of flops : " << solution_flops  << " Flops\n");
 		_printf0_("AD Solution memory used     : " << solution_memory << " Bytes\n");
-
 		#endif
-
-			}
+	}
 }
 /*}}}*/
 FemModel* FemModel::copy(void){/*{{{*/