Merge pull request #333 from trhille/update_MALI_submodule

Update MALI-Dev submodule Update the MALI-Dev submodule. This brings in the merge of MALI-Dev/E3SM#18. This also adds updates for COMPASS tests to work with the current version of Albany supported by COMPASS.
MPAS-Dev · Apr 14, 2022 · 149694d · 149694d
2 parents 25730ed + a9b965b
commit 149694d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 19 deletions.
diff --git a/MALI-Dev b/MALI-Dev
diff --git a/compass/landice/tests/circular_shelf/albany_input.yaml b/compass/landice/tests/circular_shelf/albany_input.yaml
@@ -7,9 +7,6 @@ ANONYMOUS:
     LandIce Viscosity:
       Type: 'Glen''s Law'
       Flow Rate Type: Uniform
-      'Glen''s Law Homotopy Parameter': 1.0
-      'Glen''s Law A': 5.7e-06
-      'Glen''s Law n': 3.0
 
 # Discretization Description
   Discretization:

diff --git a/compass/landice/tests/circular_shelf/namelist.landice b/compass/landice/tests/circular_shelf/namelist.landice
@@ -4,4 +4,4 @@ config_block_decomp_file_prefix = 'graph.info.part.'
 config_velocity_solver = 'FO'
 config_ice_density = 910.0
 config_dynamic_thickness = 10.0
-config_default_flowParamA = 4.3905866e-24
+config_default_flowParamA = 1.80745813e-25
diff --git a/compass/landice/tests/greenland/albany_input.yaml b/compass/landice/tests/greenland/albany_input.yaml
@@ -5,14 +5,6 @@ ANONYMOUS:
 # and "Preconditioner Type: MueLu" to " Preconditioner Type: ML" several lines below
   Build Type: Tpetra
 
-  Problem:
-    LandIce Viscosity:
-      Type: 'Glen''s Law'
-      Flow Rate Type: Uniform
-      'Glen''s Law Homotopy Parameter': 1.0
-      'Glen''s Law A': 1.0e-04
-      'Glen''s Law n': 3.0e+00
-
 # Discretization Description
   Discretization:
     Element Shape: Tetrahedron

diff --git a/compass/landice/tests/greenland/decomposition_test/__init__.py b/compass/landice/tests/greenland/decomposition_test/__init__.py
@@ -64,17 +64,17 @@ def validate(self):
                               variables=['thickness', ],
                               filename1='{}/output.nc'.format(name1),
                               filename2='{}/output.nc'.format(name2),
-                              l1_norm=1.0e-11,
-                              l2_norm=1.0e-11,
-                              linf_norm=1.0e-11,
+                              l1_norm=1.0e-4,
+                              l2_norm=1.0e-4,
+                              linf_norm=1.0e-4,
                               quiet=False)
 
             # validate normalVelocity
             compare_variables(test_case=self,
                               variables=['normalVelocity', ],
                               filename1='{}/output.nc'.format(name1),
                               filename2='{}/output.nc'.format(name2),
-                              l1_norm=1.0e-13,
-                              l2_norm=1.0e-15,
-                              linf_norm=1.0e-16,
+                              l1_norm=1.0e-5,
+                              l2_norm=1.0e-5,
+                              linf_norm=1.0e-5,
                               quiet=False)
diff --git a/compass/landice/tests/greenland/streams.landice b/compass/landice/tests/greenland/streams.landice
@@ -28,6 +28,7 @@
     <var name="vertexMask"/>
     <var name="surfaceSpeed"/>
     <var name="basalSpeed"/>
+    <var name="betaSolve"/>
     <var name="daysSinceStart"/>
 
 </stream>