Changeset 27830

Timestamp:

07/17/23 13:44:11 (20 months ago)

Author:

jdquinn

Message:

CHG: MATLAB -> Python; eased tolerances

Location:

issm/trunk-jpl

Files:

• src/m/classes/SMBsemic.py (modified) (1 diff)
• src/m/solve/parseresultsfromdisk.py (modified) (1 diff)
• test/NightlyRun/test541.m (modified) (1 diff)
• test/NightlyRun/test541.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/SMBsemic.py

@@ -174 +174 @@
                   'SmbMassBalanceSecmi', 'SmbMelt', 'SmbRefreeze','SmbAccumulation',
                   'SmbHIce', 'SmbHSnow', 'SmbAlbedo', 'SmbAlbedoSnow', 'TemperatureSEMIC',
-                  'SmbSemicQmr']
+                  'SmbSemicQmr', 'TotalSmb', 'TotalSmbMelt', 'TotalSmbRefreeze']
         else:
             list = ['default','SmbMassBalance']

issm/trunk-jpl/src/m/solve/parseresultsfromdisk.py

@@ -211 +211 @@
             field = field / pow(10.0, 12) * yts # (GigaTon/year)
         elif fieldname == 'TotalSmbScaled':
+            field = field / pow(10.0, 12) * yts # (GigaTon/year)
+        elif fieldname == 'TotalSmbMelt':
+            field = field / pow(10.0, 12) * yts # (GigaTon/year)
+        elif fieldname == 'TotalSmbRefreeze':
             field = field / pow(10.0, 12) * yts # (GigaTon/year)
         elif fieldname == 'GroundinglineMassFlux':

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

@@ -34 +34 @@
         };
 field_tolerances={...
-        1e-11,2e-11,2e-11,1e-12,2e-11,6e-12,9e-12,1e-12,...
+        1e-11,2e-11,2e-11,1e-12,2e-11,6e-12,9e-12,2e-12,...
         1e-11,2e-11,2e-11,2e-9,2e-11,...
         2e-11,1e-11,1e-11,9e-12,2e-11,3e-11,2e-11,1e-11,...

issm/trunk-jpl/test/NightlyRun/test541.py

@@ -41 +41 @@
                'Vx10', 'Vy10', 'Vel10', 'Pressure10', 'Bed10', 'Surface10', 'Thickness10', 'MaskIceLevelset10',
                'IceVolume10', 'IceVolumeAboveFloatation10', 'TotalSmb10', 'TotalGroundedBmb10', 'TotalFloatingBmb10']
-field_tolerances = [1e-11, 2e-11, 2e-11, 1e-12, 2e-11, 6e-12, 9e-12, 1e-12,
+field_tolerances = [1e-11, 2e-11, 2e-11, 1e-12, 2e-11, 6e-12, 9e-12, 2e-12,
                     1e-11, 2e-11, 2e-11, 2e-9, 2e-11,
                     2e-11, 1e-11, 1e-11, 9e-12, 2e-11, 3e-11, 2e-11, 1e-11,