Changeset 18622

Timestamp:

10/14/14 02:49:02 (10 years ago)

Author:

jbondzio

Message:

Bug: apply dynamic basal boundary scheme only for isdynamicbasalspc=true

Location:

issm/trunk-jpl

Files:

• src/c/analyses/EnthalpyAnalysis.cpp (modified) (3 diffs)
• test/Archives/Archive432.nc (modified) ( previous)
• test/Archives/Archive436.nc (modified) ( previous)
• test/Archives/Archive437.nc (modified) ( previous)

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

@@ -562 +562 @@
         if(!element->IsOnBase() || element->IsFloating()) return NULL;
 
+        bool isdynamicbasalspc;
         int i, state;
         IssmDouble  dt,Jdet,scalar;
@@ -579 +580 @@
         element->GetVerticesCoordinatesBase(&xyz_list_base);
         element->FindParam(&dt,TimesteppingTimeStepEnum);
+        element->FindParam(&isdynamicbasalspc,ThermalIsdynamicbasalspcEnum);
         Input* vx_input             = element->GetInput(VxEnum);                          _assert_(vx_input);
         Input* vy_input             = element->GetInput(VyEnum);                          _assert_(vy_input);
@@ -601 +603 @@
                 element->NodalFunctions(basis,gauss);
 
-                enthalpy_input->GetInputValue(&enthalpy,gauss);
-                enthalpy_input->GetInputValue(&enthalpyup,gaussup);
-                pressure_input->GetInputValue(&pressure,gauss);
-                pressure_input->GetInputValue(&pressureup,gaussup);
-                watercolumn_input->GetInputValue(&watercolumn,gauss);
-                meltingrate_input->GetInputValue(&meltingrate,gauss);
-
-                state=GetThermalBasalCondition(element, enthalpy, enthalpyup, pressure, pressureup, watercolumn, meltingrate);
+                if(isdynamicbasalspc){
+                        enthalpy_input->GetInputValue(&enthalpy,gauss);
+                        enthalpy_input->GetInputValue(&enthalpyup,gaussup);
+                        pressure_input->GetInputValue(&pressure,gauss);
+                        pressure_input->GetInputValue(&pressureup,gaussup);
+                        watercolumn_input->GetInputValue(&watercolumn,gauss);
+                        meltingrate_input->GetInputValue(&meltingrate,gauss);
+                        state=GetThermalBasalCondition(element, enthalpy, enthalpyup, pressure, pressureup, watercolumn, meltingrate);
+                }
+                else
+                        state=0;
+
                 switch (state) {
                         case 0: