Changeset 27075

Timestamp:

06/17/22 15:53:57 (3 years ago)

Author:

Eric.Larour

Message:

CHG: MmeToInputFromIdx was not configuring the transients.

Location:

issm/branches/trunk-larour-SLPS2022/src/c

Files:

• analyses/SealevelchangeAnalysis.cpp (modified) (2 diffs)
• classes/FemModel.cpp (modified) (1 diff)
• cores/sealevelchange_core.cpp (modified) (3 diffs)
• modules/MmeToInputFromIdx/MmeToInputFromIdx.cpp (modified) (2 diffs)
• modules/MmeToInputFromIdx/MmeToInputFromIdx.h (modified) (1 diff)

issm/branches/trunk-larour-SLPS2022/src/c/analyses/SealevelchangeAnalysis.cpp

@@ -42 +42 @@
         /*external solidearthsolution: solid-Earth model*/
         iomodel->FetchData(&isexternal,"md.solidearth.isexternal");
-
         if(isexternal){
 
@@ -632 +631 @@
         /*Resolve Mmes using the modelid, if necessary: meaning if we are running a transient model and that UQ computations have not been triggered:*/
         femmodel->parameters->FindParam(&isuq,QmuIsdakotaEnum);
-        _printf_("hello0\n");
         if (!isuq && femmodel->inputs->GetInputObjectEnum(SolidearthExternalDisplacementEastRateEnum)==DatasetInputEnum){
-                _printf_("hello1\n");
-                
                 femmodel->parameters->FindParam(&modelid,SolidearthExternalModelidEnum);
 
                 /*replace dataset of forcings with only one, the modelid'th:*/
-                MmeToInputFromIdx(femmodel->inputs,femmodel->elements,modelid-1,SolidearthExternalDisplacementNorthRateEnum, P1Enum);
-                MmeToInputFromIdx(femmodel->inputs,femmodel->elements,modelid-1,SolidearthExternalDisplacementEastRateEnum, P1Enum);
-                MmeToInputFromIdx(femmodel->inputs,femmodel->elements,modelid-1,SolidearthExternalDisplacementUpRateEnum, P1Enum);
-                MmeToInputFromIdx(femmodel->inputs,femmodel->elements,modelid-1,SolidearthExternalGeoidRateEnum, P1Enum);
+                MmeToInputFromIdx(femmodel->inputs,femmodel->elements,femmodel->parameters, modelid-1,SolidearthExternalDisplacementNorthRateEnum, P1Enum);
+                MmeToInputFromIdx(femmodel->inputs,femmodel->elements,femmodel->parameters,modelid-1,SolidearthExternalDisplacementEastRateEnum, P1Enum);
+                MmeToInputFromIdx(femmodel->inputs,femmodel->elements,femmodel->parameters,modelid-1,SolidearthExternalDisplacementUpRateEnum, P1Enum);
+                MmeToInputFromIdx(femmodel->inputs,femmodel->elements,femmodel->parameters,modelid-1,SolidearthExternalGeoidRateEnum, P1Enum);
 
         }               

issm/branches/trunk-larour-SLPS2022/src/c/classes/FemModel.cpp

@@ -2112 +2112 @@
 void FemModel::MmeToInputFromId(int id, int rootenum, int interpolationenum){ /*{{{*/
 
-        MmeToInputFromIdx(this->inputs,this->elements,id,rootenum,interpolationenum);
+        MmeToInputFromIdx(this->inputs,this->elements,this->parameters,id,rootenum,interpolationenum);
 
 }       //}}}

issm/branches/trunk-larour-SLPS2022/src/c/cores/sealevelchange_core.cpp

@@ -205 +205 @@
                 TransferForcing(femmodel,DeltaTwsEnum);
 
-                /*transfer external forcings back to Earth:*/
-                /*TransferSealevel(femmodel,BedEnum);
-                TransferSealevel(femmodel,SealevelEnum);
-                if(horiz){
-                        TransferSealevel(femmodel,BedEastEnum);
-                        TransferSealevel(femmodel,BedNorthEnum);
-                }*/
         }
 
@@ -272 +265 @@
         /*only run if grd was requested, if we are the earth, and we have reached
          * the necessary number of time steps dictated by :*/
-        if(!grd)            return;
+        if(!grd)return; 
         if(count!=frequency)return;
         femmodel->parameters->FindParam(&iscoupling,IsSlcCouplingEnum);
@@ -606 +599 @@
         femmodel->results->AddResult(new GenericExternalResult<IssmDouble*>(femmodel->results->Size()+1,AreaeEnum,areae,nel,1,1,1));
         #endif
+
+        //Specialty code: {{{
+        bool isuq=0;
+        IssmDouble modelid=0;
+                 
+        /*Resolve Mmes using the modelid, if necessary: meaning if we are running a transient model and that UQ computations have not been triggered:*/
+        femmodel->parameters->FindParam(&isuq,QmuIsdakotaEnum);
+        if(!isuq){
+
+                /*Deal with solid earth: */
+                if (femmodel->inputs->Exist(SolidearthExternalDisplacementEastRateEnum) && femmodel->inputs->GetInputObjectEnum(SolidearthExternalDisplacementEastRateEnum)==DatasetInputEnum){
+                        femmodel->parameters->FindParam(&modelid,SolidearthExternalModelidEnum);
+
+                        /*replace dataset of forcings with only one, the modelid'th:*/
+                        MmeToInputFromIdx(femmodel->inputs,femmodel->elements,femmodel->parameters,modelid-1,SolidearthExternalDisplacementNorthRateEnum, P1Enum);
+                        MmeToInputFromIdx(femmodel->inputs,femmodel->elements,femmodel->parameters,modelid-1,SolidearthExternalDisplacementEastRateEnum, P1Enum);
+                        MmeToInputFromIdx(femmodel->inputs,femmodel->elements,femmodel->parameters,modelid-1,SolidearthExternalDisplacementUpRateEnum, P1Enum);
+                        MmeToInputFromIdx(femmodel->inputs,femmodel->elements,femmodel->parameters,modelid-1,SolidearthExternalGeoidRateEnum, P1Enum);
+
+                }
+                /*Deal with ocean: */
+                if (femmodel->inputs->Exist(OceantransportSpcbottompressureEnum) && femmodel->inputs->GetInputObjectEnum(OceantransportSpcbottompressureEnum)==DatasetInputEnum){
+                        femmodel->parameters->FindParam(&modelid,DslModelidEnum);
+
+                        /*replace dataset of forcings with only one, the modelid'th:*/
+                        MmeToInputFromIdx(femmodel->inputs,femmodel->elements,femmodel->parameters,modelid-1,OceantransportSpcbottompressureEnum, P1Enum);
+                        MmeToInputFromIdx(femmodel->inputs,femmodel->elements,femmodel->parameters,modelid-1,OceantransportSpcdslEnum, P1Enum);
+                        MmeToInputFromIdx(femmodel->inputs,femmodel->elements,femmodel->parameters,modelid-1,OceantransportSpcstrEnum, P0Enum);
+                }
+        } /*}}}*/
 
         return;

issm/branches/trunk-larour-SLPS2022/src/c/modules/MmeToInputFromIdx/MmeToInputFromIdx.cpp

@@ -16 +16 @@
 #include "./MmeToInputFromIdx.h"
 
-void MmeToInputFromIdx(Inputs* inputs, Elements* elements, int id, int rootenum, int interpolationenum){
+void MmeToInputFromIdx(Inputs* inputs, Elements* elements, Parameters* parameters, int id, int rootenum, int interpolationenum){
 
         TransientInput* transientinput  = NULL;
@@ -33 +33 @@
         transientinput->GetAllTimes(&times,&N);
         inputs->SetTransientInput(DummyEnum,times,N);
-        transientinput2 = inputs->GetTransientInput(DummyEnum);
+        transientinput2 = inputs->GetTransientInput(DummyEnum); transientinput2->Configure(parameters);
 
         for(Object* & object : elements->objects){

issm/branches/trunk-larour-SLPS2022/src/c/modules/MmeToInputFromIdx/MmeToInputFromIdx.h

@@ -7 +7 @@
 
 /* local prototypes: */
-void  MmeToInputFromIdx(Inputs* inputs, Elements* elements, int id, int rootenum, int interpolationenum);
+void  MmeToInputFromIdx(Inputs* inputs, Elements* elements, Parameters* parameters, int id, int rootenum, int interpolationenum);
 
 #endif