Changeset 24016

Timestamp:

06/13/19 12:16:40 (6 years ago)

Author:

tpelle

Message:

CHG: Update geothermalflux module to support ISMIP6, PICO, and PICOP melt parameterizations in HO, also update test475

Location:

issm/trunk-jpl

Files:

• src/c/modules/GeothermalFluxx/GeothermalFluxx.cpp (modified) (1 diff)
• test/NightlyRun/test475.m (modified) (1 diff)

issm/trunk-jpl/src/c/modules/GeothermalFluxx/GeothermalFluxx.cpp

@@ -20 +20 @@
                 case MismipFloatingMeltRateEnum:
                 case LinearFloatingMeltRateEnum:
+                case BasalforcingsPicoEnum:
+                case BasalforcingsIsmip6Enum:
                         /*Nothing to be done*/
                         break;

issm/trunk-jpl/test/NightlyRun/test475.m

@@ -50 +50 @@
            'Bed2','Surface2','Thickness2','Floatingice2','Vx2','Vy2','Pressure2','FloatingiceMeltingrate2',...
            'Bed3','Surface3','Thickness3','Floatingice3','Vx3','Vy3','Pressure3','FloatingiceMeltingrate3'};
-field_tolerances={7e-09,8e-09,8e-09,7e-09,6e-08,7e-08,6e-09,8e-10,...
-           7e-09,8e-09,8e-09,7e-09,6e-08,7e-08,6e-09,8e-10,...
-           7e-09,8e-09,8e-09,7e-09,6e-08,7e-08,6e-09,8e-10};
+field_tolerances={7e-09,8e-09,8e-09,7e-09,6e-08,7e-08,6e-09,8e-7,...
+           7e-09,8e-09,8e-09,7e-09,6e-08,7e-08,6e-09,8e-7,...
+           7e-09,8e-09,8e-09,7e-09,6e-08,7e-08,6e-09,8e-7};
 field_values={...
            (md.results.TransientSolution(1).Base),...