CHG: do not update inputs after controlupdateelements to avoid conflict

Author: MathieuMorlighem

src/c/classes/FemModel.cpp

@@ -2761,6 +2761,7 @@ void FemModel::Responsex(IssmDouble* responses,int response_descriptor_enum){/*{
 		case MaterialsRheologyBbarEnum:          this->ElementResponsex(responses,MaterialsRheologyBbarEnum); break;
 		case VelEnum:                            this->ElementResponsex(responses,VelEnum); break;
 		case FrictionCoefficientEnum:            NodalValuex(responses, FrictionCoefficientEnum,elements,nodes, vertices, loads, materials, parameters); break;
+		case GroundinglineMassFluxEnum:          this->GroundinglineMassFluxx(responses, false);    break;
 		default:
 			if(response_descriptor_enum>=Outputdefinition1Enum && response_descriptor_enum <=Outputdefinition2000Enum){
 				int ierr = OutputDefinitionsResponsex(responses, this,response_descriptor_enum);

src/c/modules/ModelProcessorx/ModelProcessorx.cpp

@@ -73,17 +73,22 @@ void ModelProcessorx(Elements** pelements, Nodes*** pnodes, Vertices** pvertices
 		loads[i]->Finalize();
 	}
 
-	/*Solution specific updates*/
+	/*Transient specific updates*/
+	if(solution_enum==TransientSolutionEnum){
+		UpdateParametersTransient(parameters,iomodel);
+		UpdateElementsTransient(elements,parameters,inputs,iomodel);
+	}
+
+	/*Control specific updates*/
 	if(VerboseMProcessor()) _printf0_("   updating elements and materials for control parameters" << "\n");
 	UpdateElementsAndMaterialsControl(elements,parameters,inputs,materials,iomodel);
+
+	/*Dakota specific updates*/
 	#ifdef _HAVE_DAKOTA_
 	if(VerboseMProcessor()) _printf0_("   updating elements and materials for uncertainty quantification" << "\n");
 	UpdateElementsAndMaterialsDakota(elements,inputs,materials,iomodel);
 	#endif
-	if(solution_enum==TransientSolutionEnum){
-		UpdateParametersTransient(parameters,iomodel);
-		UpdateElementsTransient(elements,parameters,inputs,iomodel);
-	}
+
 	/*Output definitions dataset: */
 	if(VerboseMProcessor()) _printf0_("   creating output definitions" << "\n");
 	CreateOutputDefinitions(elements,parameters,inputs,iomodel);