Changeset 20575

Timestamp:

04/28/16 16:24:48 (9 years ago)

Author:

Eric.Larour

Message:

CHG: put the profiling information on step 0.

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (4 diffs)

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

@@ -355 +355 @@
 
                 /*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, 0, 0));
+                results->AddObject(new GenericExternalResult<IssmDouble>(results->Size()+1, ProfilingCurrentMemEnum, solution_memory, 0, 0));
+                results->AddObject(new GenericExternalResult<IssmDouble>(results->Size()+1, ProfilingCurrentFlopsEnum, solution_flops, 0, 0));
 
                 #ifdef _HAVE_ADOLC_
@@ -546 +546 @@
 
                 case TransientSolutionEnum:{
-                        bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,ismovingfront,ishydrology,isdamage,issmb,isslr;
+                        bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,ismovingfront,ishydrology,isdamage,issmb,isslr,isgia;
                         iomodel->Constant(&isSIA,FlowequationIsSIAEnum);
                         iomodel->Constant(&isFS,FlowequationIsFSEnum);
@@ -559 +559 @@
                         iomodel->Constant(&issmb,TransientIssmbEnum);
                         iomodel->Constant(&isslr,TransientIsslrEnum);
+                        iomodel->Constant(&isgia,TransientIsgiaEnum);
                         if(isstressbalance){
                                 int  fe_FS;
@@ -602 +603 @@
                         if(isslr){
                                 analyses_temp[numanalyses++]=SealevelriseAnalysisEnum;
+                        }
+                        if(isgia){
+                                analyses_temp[numanalyses++]=GiaAnalysisEnum;
                         }