Update docs and full_integration suite

Author: matthewhoffman

compass/landice/suites/full_integration.txt

@@ -18,8 +18,8 @@ landice/dome/2000m/fo_restart_test
 landice/dome/variable_resolution/fo_decomposition_test
 landice/dome/variable_resolution/fo_restart_test
 landice/circular_shelf/decomposition_test
-landice/mismipplus/smoke_test/2000m
-landice/mismipplus/smoke_test/debris_friction/2000m
+landice/mismipplus/smoke_test/2000m/regularized_coulomb
+landice/mismipplus/smoke_test/2000m/debris_friction
 landice/greenland/fo_decomposition_test
 landice/greenland/fo_restart_test
 landice/thwaites/fo_decomposition_test

docs/developers_guide/landice/test_groups/mismipplus.rst

@@ -23,8 +23,11 @@ requires building MALI with the Albany library.
 The test group has a shared ``namelist.landice`` file with
 a few common namelist options related to model numerics,
 and a shared ``streams.landice`` file that defines ``input``, ``restart``, and
-``output``, and ``globalStatsOutPut`` streams. There also is an 
-``albany_input.yaml`` file that is needed for running the FO solver.
+``output``, and ``globalStatsOutPut`` streams. There are three Albany input
+templates used by the ``smoke_test`` basal-friction variants:
+``albany_input_weertman.yaml``,
+``albany_input_regularized_coulomb.yaml`` and
+``albany_input_debrisfriction.yaml``.
 
 
 setup_mesh
@@ -45,7 +48,11 @@ run_model
 
 The class :py:class:`compass.landice.tests.mismipplus.run_model.RunModel`
 defines a step for setting up the input files (i.e. streams, namelist, 
-``albany_input.yaml``) needed to run MALI. The initial condition can either 
+``albany_input.yaml``) needed to run MALI. To support basal-friction variants,
+``RunModel`` selects one of the three packaged Albany YAML templates based on
+``basal_friction`` and stages it as a local ``albany_input.yaml`` file in the
+step work directory.
+The initial condition can either 
 be downloaded from the shared data server (for the 
 :ref:`landice_mismipplus_smoke_test` testcase) or generated by the 
 :py:class:`compass.landice.tests.mismipplus.setup_mesh.SetupMesh` step 
@@ -99,6 +106,20 @@ smoke_test
 ~~~~~~~~~~
 
 The :py:class:`compass.landice.tests.mismipplus.smoke_test.SmokeTest`
-performs a 5 year version of the `Ice0` experiment. There is a validation step 
-that compares the output file against itself.  This is to allow the test to be 
-compared against a baseline if desired.
+performs a 5 year version of the `Ice0` experiment.
+
+The smoke test currently supports only ``resolution=2000`` and includes three
+basal-friction variants:
+
+* ``landice/mismipplus/smoke_test/2000m/weertman``
+* ``landice/mismipplus/smoke_test/2000m/regularized_coulomb``
+* ``landice/mismipplus/smoke_test/2000m/debris_friction``
+
+These appear in ``compass list`` as unique test names:
+
+* ``smoke_test_2000m_weertman``
+* ``smoke_test_2000m_regularized_coulomb``
+* ``smoke_test_2000m_debris_friction``
+
+There is a validation step that compares the output file against itself. This
+is to allow the test to be compared against a baseline if desired.

docs/users_guide/landice/suites.rst

@@ -45,6 +45,8 @@ it is run on different numbers of cores (``decomposition_test``).
     landice/humboldt/mesh-3km_decomposition_test/velo-none_calving-none_subglacialhydro
     landice/humboldt/mesh-3km_restart_test/velo-none_calving-none_subglacialhydro
     landice/circular_shelf/decomposition_test
+    landice/mismipplus/smoke_test/2000m/regularized_coulomb
+    landice/mismipplus/smoke_test/2000m/debris_friction
     landice/dome/2000m/fo_decomposition_test
     landice/dome/2000m/fo_restart_test
     landice/dome/variable_resolution/fo_restart_test

docs/users_guide/landice/test_groups/mismipplus.rst

@@ -42,7 +42,15 @@ five years using a spun-up
 `2km mesh <https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-albany-landice/MISMIP_2km_20220502.nc>`_.
 The simulation is run with the adaptive timestepper on.
 There are no configuration options for this test case.
-Currently 2000m is the only resolution supported. In the future, the 
+Currently 2000m is the only resolution supported.
+
+The smoke test is available in three basal-friction variants:
+
+* ``landice/mismipplus/smoke_test/2000m/weertman``
+* ``landice/mismipplus/smoke_test/2000m/regularized_coulomb``
+* ``landice/mismipplus/smoke_test/2000m/debris_friction``
+
+In the future, the 
 ``spin_up`` test case will be used to generate new versions of the
 mesh at 8000m, 4000m, 2000m, and 1000m resolutions.