Changeset 23948

Timestamp:

05/29/19 15:05:34 (6 years ago)

Author:

felicity

Message:

BUG: minor fixes

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyGlaDSAnalysis.cpp (modified) (10 diffs)
• cores/hydrology_core.cpp (modified) (1 diff)

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

@@ -70 +70 @@
         }
         iomodel->FetchDataToInput(elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
-
+        iomodel->FetchDataToInput(elements,"md.mask.groundedice_levelset",MaskGroundediceLevelsetEnum);
+        iomodel->FetchDataToInput(elements,"md.hydrology.bump_height",HydrologyBumpHeightEnum);
         iomodel->FetchDataToInput(elements,"md.hydrology.sheet_conductivity",HydrologySheetConductivityEnum);
         iomodel->FetchDataToInput(elements,"md.initialization.watercolumn",HydrologySheetThicknessEnum);
@@ -106 +107 @@
         parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.pressure_melt_coefficient",HydrologyPressureMeltCoefficientEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.cavity_spacing",HydrologyCavitySpacingEnum));
-        parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.bump_height",HydrologyBumpHeightEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.ischannels",HydrologyIschannelsEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.channel_conductivity",HydrologyChannelConductivityEnum));
@@ -155 +155 @@
         element->FindParam(&dt,TimesteppingTimeStepEnum);
         element->FindParam(&c_t,HydrologyPressureMeltCoefficientEnum);
-        element->FindParam(&k,HydrologySheetConductivityEnum);
+        Input* k_input   = element->GetInput(HydrologySheetConductivityEnum);_assert_(k_input);
         Input* phi_input = element->GetInput(HydraulicPotentialEnum);      _assert_(phi_input);
         Input* h_input   = element->GetInput(HydrologySheetThicknessEnum); _assert_(h_input);
@@ -170 +170 @@
                 phi_input->GetInputDerivativeValue(&dphi[0],xyz_list,gauss);
                 h_input->GetInputValue(&h,gauss);
+                k_input->GetInputValue(&k,gauss);
 
                 /*Get norm of gradient of hydraulic potential and make sure it is >0*/
@@ -201 +202 @@
 
         /*Intermediaries */
-        IssmDouble  Jdet,w,v,vx,vy,ub,h,N;
+        IssmDouble  Jdet,w,v,vx,vy,ub,h,N,h_r;
         IssmDouble  G,m,frictionheat,alpha2;
         IssmDouble  A,B,n;
@@ -215 +216 @@
         /*Retrieve all inputs and parameters*/
         element->GetVerticesCoordinates(&xyz_list);
-        IssmDouble  h_r     = element->FindParam(HydrologyBumpHeightEnum);
-        IssmDouble  l_r     = element->FindParam(HydrologyBumpSpacingEnum);
         IssmDouble  L       = element->FindParam(MaterialsLatentheatEnum);
         IssmDouble  rho_ice = element->FindParam(MaterialsRhoIceEnum);
+        IssmDouble l_r      = element->FindParam(HydrologyCavitySpacingEnum);
+        Input* hr_input = element->GetInput(HydrologyBumpHeightEnum);_assert_(hr_input);
         Input* vx_input = element->GetInput(VxEnum);_assert_(vx_input);
         Input* vy_input = element->GetInput(VyEnum);_assert_(vy_input);
@@ -246 +247 @@
                 n_input->GetInputValue(&n,gauss);
                 N_input->GetInputValue(&N,gauss);
+                hr_input->GetInputValue(&h_r,gauss);
 
                 /*Get basal velocity*/
@@ -359 +361 @@
 
         /*Intermediaries */
-        IssmDouble  Jdet,w,v,vx,vy,ub,h_old,N;
+        IssmDouble  Jdet,w,v,vx,vy,ub,h_old,N,h_r;
         IssmDouble  A,B,n;
 
@@ -369 +371 @@
 
         /*Retrieve all inputs and parameters*/
-        IssmDouble  h_r = element->FindParam(HydrologyBumpHeightEnum);
-        IssmDouble  l_r = element->FindParam(HydrologyBumpSpacingEnum);
         IssmDouble  dt  = element->FindParam(TimesteppingTimeStepEnum);
+        IssmDouble  l_r = element->FindParam(HydrologyCavitySpacingEnum);
+        Input* hr_input = element->GetInput(HydrologyBumpHeightEnum);_assert_(hr_input);
         Input* vx_input = element->GetInput(VxEnum);_assert_(vx_input);
         Input* vy_input = element->GetInput(VyEnum);_assert_(vy_input);
@@ -391 +393 @@
                 n_input->GetInputValue(&n,gauss);
                 N_input->GetInputValue(&N,gauss);
+                hr_input->GetInputValue(&h_r,gauss);
 
                 /*Get basal velocity*/

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

@@ -192 +192 @@
 
         /*Using the GlaDS model*/
-        else if (hydrology_model==HydrologyGlaDSAnalysisEnum){
+        else if (hydrology_model==HydrologyGlaDSEnum){
                 femmodel->SetCurrentConfiguration(HydrologyGlaDSAnalysisEnum);
                 InputDuplicatex(femmodel,HydraulicPotentialEnum,HydraulicPotentialOldEnum);