CHG: slc coupling not activated in UQ mode.

Also, need to be sure to add loads if in Mme or non Mme mass transport.
ISSMteam · Nov 30, 2024 · 3a0e6ae · 3a0e6ae
1 parent 9224985
commit 3a0e6ae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/c/classes/Dakota/IssmParallelDirectApplicInterface.cpp b/src/c/classes/Dakota/IssmParallelDirectApplicInterface.cpp
@@ -24,6 +24,9 @@ namespace SIM {
 		if(world_rank!=0){
 			femmodel_init= new FemModel(argc,argv,evaluation_comm);
 			femmodel_init->profiler->Start(CORE);
+
+			/*Need to know we are firing up from ISSM main, not a coupler driver like issm_slcp or issm_ocean:*/
+			femmodel_init->parameters->AddObject(new IntParam(IsSlcCouplingEnum,0));
 		}
 
 	}

diff --git a/src/c/classes/Elements/Tria.cpp b/src/c/classes/Elements/Tria.cpp
@@ -7054,7 +7054,6 @@ void       Tria::SealevelchangeGeometryInitial(IssmDouble* xxe, IssmDouble* yye,
 
 }
 /*}}}*/
-
 void       Tria::SealevelchangeGeometrySubElementKernel(SealevelGeometry* slgeom){ /*{{{*/
 
 	/*Declarations:{{{*/
@@ -7224,15 +7223,19 @@ void       Tria::SealevelchangeGeometryCentroidLoads(SealevelGeometry* slgeom, I
 	bool isoceanonly=false;
 	bool isice=false;
 	bool isiceonly=false;
-	bool  computeice=false;
-	bool  computebp=false;
-	bool  computehydro=false;
+	bool computeice=false;
+	bool computebp=false;
+	bool computehydro=false;
+	bool ismasstransport=false;
+	bool ismmemasstransport=false;
 
 	/*constants:*/
 	IssmDouble constant=0;
 
 	/*recover parameters:*/
-	this->parameters->FindParam(&computeice,TransientIsmasstransportEnum);
+	this->parameters->FindParam(&ismasstransport,TransientIsmasstransportEnum);
+	this->parameters->FindParam(&ismmemasstransport,TransientIsmmemasstransportEnum);
+	if(ismasstransport || ismmemasstransport)computeice=true;
 	this->parameters->FindParam(&computebp,TransientIsoceantransportEnum);
 	this->parameters->FindParam(&computehydro,TransientIshydrologyEnum);
 	this->parameters->FindParam(&planetradius,SolidearthPlanetRadiusEnum);
@@ -8031,7 +8034,7 @@ IssmDouble*       Tria::SealevelchangeHorizGxL(int spatial_component, IssmDouble
 			}
 		}
 		//av+=1;
-	} /*}}}*/
+	} 
 
 	//free resources
 	xDelete<IssmDouble>(horiz_projection);
@@ -8043,7 +8046,6 @@ IssmDouble*       Tria::SealevelchangeHorizGxL(int spatial_component, IssmDouble
 	return grdfield;
 
 } /*}}}*/
-
 void       Tria::SealevelchangeCollectGrdfield(IssmDouble* grdfieldout, IssmDouble* grdfield, SealevelGeometry* slgeom, int nel, bool percpu, int viscousenum, bool computefuture) { /*{{{*/
 
 	//This function aligns grdfield with the requested output format: in a size 3 vector or in a size numberofvertices vector