NEW: added master flag to not save results in a transient run, needed for nudging

Author: MathieuMorlighem

src/c/cores/transient_core.cpp

@@ -24,7 +24,7 @@ void transient_core(FemModel* femmodel){/*{{{*/
 
 	/*parameters: */
 	IssmDouble finaltime,dt,yts;
-	bool       save_final_results;
+	bool       save_final_results,do_not_save_results,save_results;
 	bool       iscontrol,isautodiff;
 	int        timestepping;
 	int        output_frequency,checkpoint_frequency;
@@ -50,6 +50,7 @@ void transient_core(FemModel* femmodel){/*{{{*/
 	femmodel->parameters->FindParam(&iscontrol,InversionIscontrolEnum);
 	femmodel->parameters->FindParam(&isautodiff,AutodiffIsautodiffEnum);
 	femmodel->parameters->FindParam(&save_final_results,SaveFinalResultsEnum);
+	femmodel->parameters->FindParam(&do_not_save_results,DoNotSaveResultsEnum);
 
 	/*call modules that are not dependent on time stepping:*/
 	transient_precore(femmodel);
@@ -85,12 +86,25 @@ 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");
 		}
-		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);
+		
+		/*Will we save results?*/
+		if(do_not_save_results){
+			save_results = false;
+		}
+		else{
+			if(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)
+			  ){
+				save_results = true;
+			}
+			else{
+				save_results = false;
+			}
+		}
+		femmodel->parameters->SetParam(save_results, SaveResultsEnum);
 
-		/*Run transient step!*/
+		/*Run transient step*/
 		transient_step(femmodel);
 
 		/*unload results*/

src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -404,6 +404,7 @@ void CreateParameters(Parameters* parameters,IoModel* iomodel,char* rootpath,FIL
 
 	/*By default, save all results*/
 	parameters->AddObject(new BoolParam(SaveResultsEnum,true));
+	parameters->AddObject(new BoolParam(DoNotSaveResultsEnum,false)); /*Has priority*/
 
 	/*Option to not save results after the final time step, e.g. for external coupling*/
 	parameters->AddObject(new BoolParam(SaveFinalResultsEnum,true));

src/c/shared/Enum/Enum.vim

@@ -186,6 +186,7 @@ syn keyword cConstant DebrisPackingFractionEnum
 syn keyword cConstant DebugProfilingEnum
 syn keyword cConstant DomainDimensionEnum
 syn keyword cConstant DomainTypeEnum
+syn keyword cConstant DoNotSaveResultsEnum
 syn keyword cConstant DslModelEnum
 syn keyword cConstant DslModelidEnum
 syn keyword cConstant DslNummodelsEnum

src/c/shared/Enum/EnumDefinitions.h

@@ -180,6 +180,7 @@ enum definitions{
 	DebugProfilingEnum,
 	DomainDimensionEnum,
 	DomainTypeEnum,
+	DoNotSaveResultsEnum,
 	DslModelEnum,
 	DslModelidEnum,
 	DslNummodelsEnum,

src/c/shared/Enum/EnumToStringx.cpp

@@ -188,6 +188,7 @@ const char* EnumToStringx(int en){
 		case DebugProfilingEnum : return "DebugProfiling";
 		case DomainDimensionEnum : return "DomainDimension";
 		case DomainTypeEnum : return "DomainType";
+		case DoNotSaveResultsEnum : return "DoNotSaveResults";
 		case DslModelEnum : return "DslModel";
 		case DslModelidEnum : return "DslModelid";
 		case DslNummodelsEnum : return "DslNummodels";

src/c/shared/Enum/Enumjl.vim

@@ -179,6 +179,7 @@ syn keyword juliaConstC DebrisPackingFractionEnum
 syn keyword juliaConstC DebugProfilingEnum
 syn keyword juliaConstC DomainDimensionEnum
 syn keyword juliaConstC DomainTypeEnum
+syn keyword juliaConstC DoNotSaveResultsEnum
 syn keyword juliaConstC DslModelEnum
 syn keyword juliaConstC DslModelidEnum
 syn keyword juliaConstC DslNummodelsEnum

src/c/shared/Enum/StringToEnumx.cpp

@@ -175,6 +175,7 @@
 	DebugProfilingEnum
 	DomainDimensionEnum
 	DomainTypeEnum
+	DoNotSaveResultsEnum
 	DslModelEnum
 	DslModelidEnum
 	DslNummodelsEnum
@@ -4027,6 +4028,7 @@ function EnumToString(enum::IssmEnum)
 	if(enum==DebugProfilingEnum) return "DebugProfiling" end
 	if(enum==DomainDimensionEnum) return "DomainDimension" end
 	if(enum==DomainTypeEnum) return "DomainType" end
+	if(enum==DoNotSaveResultsEnum) return "DoNotSaveResults" end
 	if(enum==DslModelEnum) return "DslModel" end
 	if(enum==DslModelidEnum) return "DslModelid" end
 	if(enum==DslNummodelsEnum) return "DslNummodels" end
@@ -7879,6 +7881,7 @@ function StringToEnum(name::String)
 	if(name=="DebugProfiling") return DebugProfilingEnum  end
 	if(name=="DomainDimension") return DomainDimensionEnum  end
 	if(name=="DomainType") return DomainTypeEnum  end
+	if(name=="DoNotSaveResults") return DoNotSaveResultsEnum  end
 	if(name=="DslModel") return DslModelEnum  end
 	if(name=="DslModelid") return DslModelidEnum  end
 	if(name=="DslNummodels") return DslNummodelsEnum  end