Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/c/cores/transient_core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ void transient_core(FemModel* femmodel){/*{{{*/

/*parameters: */
IssmDouble finaltime,dt,yts;
bool save_final_results;
bool iscontrol,isautodiff;
int timestepping;
int output_frequency,checkpoint_frequency;
Expand All @@ -48,6 +49,7 @@ void transient_core(FemModel* femmodel){/*{{{*/
femmodel->parameters->FindParam(&amr_frequency,TransientAmrFrequencyEnum);
femmodel->parameters->FindParam(&iscontrol,InversionIscontrolEnum);
femmodel->parameters->FindParam(&isautodiff,AutodiffIsautodiffEnum);
femmodel->parameters->FindParam(&save_final_results,SaveFinalResultsEnum);

/*call modules that are not dependent on time stepping:*/
transient_precore(femmodel);
Expand Down Expand Up @@ -83,8 +85,9 @@ void transient_core(FemModel* femmodel){/*{{{*/
_printf0_("\e[92miteration " << step << "/" << ceil((finaltime-time)/dt)+step << \
" time [yr]: " <<std::fixed<<setprecision(2)<< time/yts << "\e[m (time step: " << dt/yts << ")\n");
}
bool save_results=false;
if(step%output_frequency==0 || (time >= finaltime - (yts*DBL_EPSILON)) || step==1) save_results=true;
const bool save_results = step==1 //save first step
|| step%output_frequency==0 //save at regular intervals
|| (save_final_results && time >= finaltime - (yts*DBL_EPSILON)); //save last step (optional)
femmodel->parameters->SetParam(save_results,SaveResultsEnum);

/*Run transient step!*/
Expand Down
3 changes: 3 additions & 0 deletions src/c/modules/ModelProcessorx/CreateParameters.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,9 @@ void CreateParameters(Parameters* parameters,IoModel* iomodel,char* rootpath,FIL

/*By default, save all results*/
parameters->AddObject(new BoolParam(SaveResultsEnum,true));

/*Option to not save results after the final time step, e.g. for external coupling*/
parameters->AddObject(new BoolParam(SaveFinalResultsEnum,true));

/*Should we output results on nodes?*/
iomodel->FindConstant(&outputonnodes,&numoutputs,"md.settings.results_on_nodes");
Expand Down
1 change: 1 addition & 0 deletions src/c/shared/Enum/EnumDefinitions.h
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,7 @@ enum definitions{
SamplingRobinEnum,
SamplingSeedEnum,
SaveResultsEnum,
SaveFinalResultsEnum,
SolidearthPartitionIceEnum,
SolidearthPartitionHydroEnum,
SolidearthPartitionOceanEnum,
Expand Down
1 change: 1 addition & 0 deletions src/c/shared/Enum/EnumToStringx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,7 @@ const char* EnumToStringx(int en){
case SamplingRobinEnum : return "SamplingRobin";
case SamplingSeedEnum : return "SamplingSeed";
case SaveResultsEnum : return "SaveResults";
case SaveFinalResultsEnum : return "SaveFinalResults";
case SolidearthPartitionIceEnum : return "SolidearthPartitionIce";
case SolidearthPartitionHydroEnum : return "SolidearthPartitionHydro";
case SolidearthPartitionOceanEnum : return "SolidearthPartitionOcean";
Expand Down
1 change: 1 addition & 0 deletions src/c/shared/Enum/StringToEnumx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@ int StringToEnumx(const char* name,bool notfounderror){
else if (strcmp(name,"SamplingRobin")==0) return SamplingRobinEnum;
else if (strcmp(name,"SamplingSeed")==0) return SamplingSeedEnum;
else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
else if (strcmp(name,"SaveFinalResults")==0) return SaveFinalResultsEnum;
else if (strcmp(name,"SolidearthPartitionIce")==0) return SolidearthPartitionIceEnum;
else if (strcmp(name,"SolidearthPartitionHydro")==0) return SolidearthPartitionHydroEnum;
else if (strcmp(name,"SolidearthPartitionOcean")==0) return SolidearthPartitionOceanEnum;
Expand Down