Changeset 26744 for issm/trunk/test/NightlyRun/test243.py

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test243.py (modified) (4 diffs)

issm/trunk/test/NightlyRun/test243.py

@@ -45 +45 @@
 #smb settings
 md.smb.requested_outputs = [
-    'SmbDz', 'SmbT', 'SmbD', 'SmbRe', 'SmbGdn', 'SmbGsp', 'SmbEC',
-    'SmbA', 'SmbMassBalance', 'SmbMAdd', 'SmbDzAdd', 'SmbFAC', 'SmbMeanSHF', 'SmbMeanLHF',
-    'SmbMeanULW', 'SmbNetLW', 'SmbNetSW','SmbAccumulatedMassBalance','SmbAccumulatedRunoff',
-    'SmbAccumulatedMelt','SmbAccumulatedEC','SmbAccumulatedPrecipitation'
+        'SmbDz','SmbT','SmbD','SmbRe','SmbGdn','SmbGsp','SmbEC',
+        'SmbA','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC','SmbMeanSHF','SmbMeanLHF',
+        'SmbMeanULW','SmbNetLW','SmbNetSW','SmbWAdd','SmbRunoff','SmbRefreeze','SmbMelt',
+        'SmbEC','SmbPrecipitation','SmbRain','SmbAccumulatedMassBalance','SmbAccumulatedRunoff',
+        'SmbAccumulatedMelt','SmbAccumulatedEC','SmbAccumulatedPrecipitation','SmbAccumulatedRain',
+        'SmbAccumulatedPrecipitation','SmbAccumulatedRefreeze'
     ]
 
@@ -60 +62 @@
 md.timestepping.final_time = 1966.
 md.timestepping.time_step = 1.0 / 365
-md.timestepping.interp_forcings = 0.
+md.timestepping.interp_forcing = 0.
 
 #Run transient
@@ -70 +72 @@
 
 #Fields and tolerances to track changes
-field_names = ['Layers', 'SmbDz', 'SmbT', 'SmbD', 'SmbRe', 'SmbGdn', 'SmbGsp', 'SmbA', 'SmbEC', 'SmbMassBalance', 'SmbMAdd', 'SmbDzAdd', 'SmbFAC', 'SmbMeanSHF', 'SmbMeanLHF', 'SmbMeanULW', 'SmbNetLW', 'SmbNetSW', 'SmbAccumulatedMassBalance','SmbAccumulatedRunoff','SmbAccumulatedMelt','SmbAccumulatedEC','SmbAccumulatedPrecipitation']
-field_tolerances = [1e-12, 2e-12, 1e-12, 1e-11, 1e-11, 2e-11, 1e-11, 1e-12, 1e-11, 1e-12, 1e-12, 1e-12, 1e-11, 2e-11, 2e-11, 1e-11, 9e-10, 2e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11]
+field_names = ['Layers','SmbDz','SmbT','SmbD','SmbRe','SmbGdn','SmbGsp','SmbA' ,'SmbEC','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC','SmbMeanSHF','SmbMeanLHF','SmbMeanULW','SmbNetLW','SmbNetSW','SmbAccumulatedMassBalance','SmbAccumulatedRunoff','SmbAccumulatedMelt','SmbAccumulatedEC','SmbAccumulatedPrecipitation','SmbAccumulatedRain','SmbAccumulatedRefreeze','SmbRunoff','SmbMelt','SmbEC','SmbPrecipitation','SmbRain','SmbRefreeze','SmbWAdd']
+field_tolerances = [1e-12, 2e-12, 1e-12, 2e-11, 1e-11, 2e-11, 1e-11, 1e-12, 1e-11, 1e-12, 1e-12, 1e-12, 1e-11, 2e-11, 2e-11, 1e-11, 9e-10, 2e-11, 1e-11, 9e-10, 2e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11]
+
+
 # Shape is different in python solution (fixed using reshape) which can cause test failure
 field_values = [
@@ -96 +100 @@
     md.results.TransientSolution[-1].SmbAccumulatedMelt[0],
     md.results.TransientSolution[-1].SmbAccumulatedEC[0],
-    md.results.TransientSolution[-1].SmbAccumulatedPrecipitation[0]
+    md.results.TransientSolution[-1].SmbAccumulatedPrecipitation[0],
+    md.results.TransientSolution[-1].SmbAccumulatedRain[0],
+    md.results.TransientSolution[-1].SmbAccumulatedRefreeze[0],
+    md.results.TransientSolution[199].SmbRunoff[0],
+    md.results.TransientSolution[199].SmbMelt[0],
+    md.results.TransientSolution[199].SmbEC[0],
+    md.results.TransientSolution[199].SmbPrecipitation[0],
+    md.results.TransientSolution[199].SmbRain[0],
+    md.results.TransientSolution[199].SmbRefreeze[0],
+    md.results.TransientSolution[199].SmbWAdd[0]
     ]