Changeset 25304

Timestamp:

07/28/20 19:47:54 (5 years ago)

Author:

Eric.Larour

Message:

CHG: fixed an issue with BP not being updated when running in MME mode.

Location:

issm/trunk-jpl/src/c/cores

Files:

• cores.h (modified) (1 diff)
• sealevelchange_core.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/cores/cores.h

@@ -66 +66 @@
 void GetStericRate(Vector<IssmDouble> ** psteric_rate_g, FemModel* femmodel);
 void GetDynamicRate(Vector<IssmDouble> ** pdynamic_rate_g, FemModel* femmodel);
+void SetBottomPressure(FemModel* femmodel);
 
 //optimization

issm/trunk-jpl/src/c/cores/sealevelchange_core.cpp

@@ -169 +169 @@
                 masks=sealevelrise_core_masks(femmodel);
 
+                /*set bottom pressures:*/
+                SetBottomPressure(femmodel);
+
+
                 /*call eustatic core  (generalized eustatic - Farrel and Clark, Eq 4, 1st, 3rd and 4rd terms on the RHS) */
                 RSLg_eustatic=sealevelrise_core_eustatic(femmodel,masks,&oceanarea); 
@@ -736 +740 @@
 }
 /*}}}*/
+void SetBottomPressure(FemModel* femmodel){ /*{{{*/
+
+        int dslmodel=-1;
+        int type;
+
+        /*If we are running a dsl mme model, we need to update the bottom pressure first: */
+        femmodel->parameters->FindParam(&dslmodel,DslModelEnum);
+        if(dslmodel==2){
+        
+                IssmDouble modelid;
+                /*figure out the type of DslSeaWaterPressureChangeAtSeaFloor input:*/
+                type=femmodel->inputs2->GetInputObjectEnum(DslSeaWaterPressureChangeAtSeaFloor);
+
+                if(type==DatasetInput2Enum){
+                
+                        /*find the DslSeaWaterPressureChangeAtSeaFloor dataset of transient inputs:*/
+                        DatasetInput2* dataset_input=femmodel->inputs2->GetDatasetInput2(DslSeaWaterPressureChangeAtSeaFloor);
+                
+                        /*Recover modelid:*/
+                        femmodel->parameters->FindParam(&modelid,DslModelidEnum);
+                        modelid--; //from matlab. 
+                
+                        /*Go find the modelid'th transient input:*/
+                        TriaInput2* tria_input=dataset_input->GetTriaInputByOffset(reCast<int, IssmDouble>(modelid));
+                        /*Plug back into DslSeaWaterPressureChangeAtSeaFloor*/
+                        tria_input->ChangeEnum(DslSeaWaterPressureChangeAtSeaFloor);
+                }
+        }
+}
+/*}}}*/
 
 /*support routines:*/