Changeset 27537

Timestamp:

01/23/23 14:25:41 (2 years ago)

Author:

sehrenfe

Message:

BUG: fixed problem with GlaDS meltflag options

File:

• issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp

@@ -113 +113 @@
         int    hydrology_model;
         iomodel->FindConstant(&hydrology_model,"md.hydrology.model");
-
+        int    meltflag;        
+        iomodel->FindConstant(&meltflag,"md.hydrology.melt_flag");
+        
         /*Now, do we really want GlaDS?*/
         if(hydrology_model!=HydrologyGlaDSEnum) return;
@@ -133 +135 @@
         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.geothermalflux",BasalforcingsGeothermalfluxEnum);
         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum);
-        iomodel->FetchDataToInput(inputs,elements,"md.smb.runoff",SmbRunoffEnum);
+        if(meltflag==2){
+                iomodel->FetchDataToInput(inputs,elements,"md.smb.runoff",SmbRunoffEnum);
+        }
         if(iomodel->domaintype!=Domain2DhorizontalEnum){
                 iomodel->FetchDataToInput(inputs,elements,"md.mesh.vertexonbase",MeshVertexonbaseEnum);
@@ -344 +348 @@
         Input* G_input      = element->GetInput(BasalforcingsGeothermalfluxEnum);_assert_(G_input);
         Input* melt_input   = element->GetInput(BasalforcingsGroundediceMeltingRateEnum);_assert_(melt_input);
-        Input* RO_input     = element->GetInput(SmbRunoffEnum);_assert_(RO_input);
+        Input* RO_input     = NULL;
         Input* B_input      = element->GetInput(MaterialsRheologyBEnum);         _assert_(B_input);
         Input* n_input      = element->GetInput(MaterialsRheologyNEnum);         _assert_(n_input);
@@ -370 +374 @@
                 H_input->GetInputValue(&H,gauss);
                 melt_input->GetInputValue(&melt,gauss);
-                RO_input->GetInputValue(&RO,gauss);
 
                 /*Hard code B*/
@@ -388 +391 @@
 
                 /*Compute melt (if necessary)*/
-                if(meltflag = 0){
+                if(meltflag == 0){
                         m = (G + frictionheat)/(rho_ice*L);
                 }
-                if(meltflag = 1){
+                else if(meltflag == 1){
                         m = melt;
                 }
                 else{
-                        m = RO;
+                        Input* RO_input = element->GetInput(SmbRunoffEnum);_assert_(RO_input);
+                        RO_input->GetInputValue(&melt,gauss);
+                        m = melt + RO;
                 }