Changeset 23952

Timestamp:

05/29/19 16:12:44 (6 years ago)

Author:

felicity

Message:

BUG: input/parameter updates for GlaDS

File:

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

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

@@ -65 +65 @@
         iomodel->FetchDataToInput(elements,"md.geometry.thickness",ThicknessEnum);
         iomodel->FetchDataToInput(elements,"md.geometry.base",BaseEnum);
+        iomodel->FetchDataToInput(elements,"md.geometry.bed",BedEnum);
+        iomodel->FetchDataToInput(elements,"md.basalforcings.geothermalflux",BasalforcingsGeothermalfluxEnum);
         if(iomodel->domaintype!=Domain2DhorizontalEnum){
                 iomodel->FetchDataToInput(elements,"md.mesh.vertexonbase",MeshVertexonbaseEnum);
@@ -105 +107 @@
 
         parameters->AddObject(new IntParam(HydrologyModelEnum,hydrology_model));
+        parameters->AddObject(iomodel->CopyConstantObject("md.friction.law",FrictionLawEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.pressure_melt_coefficient",HydrologyPressureMeltCoefficientEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.cavity_spacing",HydrologyCavitySpacingEnum));