Update documentation

MPAS-Dev · Oct 2, 2023 · 38e4021 · 38e4021
1 parent 83d6dfd
commit 38e4021
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/latest/_modules/compass/ocean/tests/global_ocean/performance_test.html b/latest/_modules/compass/ocean/tests/global_ocean/performance_test.html
@@ -178,6 +178,24 @@ <h1>Source code for compass.ocean.tests.global_ocean.performance_test</h1><div c
 <span class="sd">        Test cases can override this method to perform validation of variables</span>
 <span class="sd">        and timers</span>
 <span class="sd">        &quot;&quot;&quot;</span>
+
+        <span class="n">common_variables</span> <span class="o">=</span> <span class="p">[</span>
+            <span class="s1">&#39;ssh&#39;</span><span class="p">,</span> <span class="s1">&#39;landIcePressure&#39;</span><span class="p">,</span> <span class="s1">&#39;landIceDraft&#39;</span><span class="p">,</span> <span class="s1">&#39;landIceFraction&#39;</span><span class="p">,</span>
+            <span class="s1">&#39;landIceMask&#39;</span><span class="p">,</span> <span class="s1">&#39;topDrag&#39;</span><span class="p">,</span> <span class="s1">&#39;topDragMagnitude&#39;</span><span class="p">,</span>
+            <span class="s1">&#39;landIceFreshwaterFlux&#39;</span><span class="p">,</span> <span class="s1">&#39;landIceHeatFlux&#39;</span><span class="p">,</span>
+            <span class="s1">&#39;accumulatedLandIceMass&#39;</span><span class="p">]</span>
+        <span class="n">land_ice_variables</span> <span class="o">=</span> <span class="p">{</span>
+            <span class="s1">&#39;prognostic_ice_shelf_melt&#39;</span><span class="p">:</span> <span class="n">common_variables</span> <span class="o">+</span> <span class="p">[</span>
+                <span class="s1">&#39;landIceFrictionVelocity&#39;</span><span class="p">,</span> <span class="s1">&#39;heatFluxToLandIce&#39;</span><span class="p">,</span>
+                <span class="s1">&#39;landIceBoundaryLayerTemperature&#39;</span><span class="p">,</span>
+                <span class="s1">&#39;landIceBoundaryLayerSalinity&#39;</span><span class="p">,</span>
+                <span class="s1">&#39;landIceHeatTransferVelocity&#39;</span><span class="p">,</span>
+                <span class="s1">&#39;landIceSaltTransferVelocity&#39;</span><span class="p">,</span>
+                <span class="s1">&#39;landIceInterfaceTemperature&#39;</span><span class="p">,</span>
+                <span class="s1">&#39;landIceInterfaceSalinity&#39;</span><span class="p">,</span> <span class="s1">&#39;accumulatedLandIceHeat&#39;</span><span class="p">],</span>
+            <span class="s1">&#39;data_ice_shelf_melt&#39;</span><span class="p">:</span> <span class="n">common_variables</span>
+        <span class="p">}</span>
+
         <span class="k">for</span> <span class="n">step</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">steps</span><span class="o">.</span><span class="n">values</span><span class="p">():</span>
             <span class="n">step_subdir</span> <span class="o">=</span> <span class="n">step</span><span class="o">.</span><span class="n">subdir</span>
             <span class="n">variables</span> <span class="o">=</span> <span class="p">[</span><span class="s1">&#39;temperature&#39;</span><span class="p">,</span> <span class="s1">&#39;salinity&#39;</span><span class="p">,</span> <span class="s1">&#39;layerThickness&#39;</span><span class="p">,</span>
@@ -187,22 +205,8 @@ <h1>Source code for compass.ocean.tests.global_ocean.performance_test</h1><div c
                               <span class="n">filename1</span><span class="o">=</span><span class="sa">f</span><span class="s1">&#39;</span><span class="si">{</span><span class="n">step_subdir</span><span class="si">}</span><span class="s1">/output.nc&#39;</span><span class="p">)</span>
 
             <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">mesh</span><span class="o">.</span><span class="n">with_ice_shelf_cavities</span><span class="p">:</span>
-                <span class="n">variables</span> <span class="o">=</span> <span class="p">[</span>
-                    <span class="s1">&#39;ssh&#39;</span><span class="p">,</span> <span class="s1">&#39;landIcePressure&#39;</span><span class="p">,</span> <span class="s1">&#39;landIceDraft&#39;</span><span class="p">,</span>
-                    <span class="s1">&#39;landIceFraction&#39;</span><span class="p">,</span> <span class="s1">&#39;landIceMask&#39;</span><span class="p">,</span>
-                    <span class="s1">&#39;landIceFrictionVelocity&#39;</span><span class="p">,</span> <span class="s1">&#39;topDrag&#39;</span><span class="p">,</span>
-                    <span class="s1">&#39;topDragMagnitude&#39;</span><span class="p">,</span> <span class="s1">&#39;landIceFreshwaterFlux&#39;</span><span class="p">,</span>
-                    <span class="s1">&#39;landIceHeatFlux&#39;</span><span class="p">,</span> <span class="s1">&#39;heatFluxToLandIce&#39;</span><span class="p">,</span>
-                    <span class="s1">&#39;landIceBoundaryLayerTemperature&#39;</span><span class="p">,</span>
-                    <span class="s1">&#39;landIceBoundaryLayerSalinity&#39;</span><span class="p">,</span>
-                    <span class="s1">&#39;landIceHeatTransferVelocity&#39;</span><span class="p">,</span>
-                    <span class="s1">&#39;landIceSaltTransferVelocity&#39;</span><span class="p">,</span>
-                    <span class="s1">&#39;landIceInterfaceTemperature&#39;</span><span class="p">,</span>
-                    <span class="s1">&#39;landIceInterfaceSalinity&#39;</span><span class="p">,</span> <span class="s1">&#39;accumulatedLandIceMass&#39;</span><span class="p">,</span>
-                    <span class="s1">&#39;accumulatedLandIceHeat&#39;</span><span class="p">]</span>
-
                 <span class="n">compare_variables</span><span class="p">(</span>
-                    <span class="n">test_case</span><span class="o">=</span><span class="bp">self</span><span class="p">,</span> <span class="n">variables</span><span class="o">=</span><span class="n">variables</span><span class="p">,</span>
+                    <span class="n">test_case</span><span class="o">=</span><span class="bp">self</span><span class="p">,</span> <span class="n">variables</span><span class="o">=</span><span class="n">land_ice_variables</span><span class="p">[</span><span class="n">step</span><span class="o">.</span><span class="n">name</span><span class="p">],</span>
                     <span class="n">filename1</span><span class="o">=</span><span class="sa">f</span><span class="s1">&#39;</span><span class="si">{</span><span class="n">step_subdir</span><span class="si">}</span><span class="s1">/land_ice_fluxes.nc&#39;</span><span class="p">)</span>
 
             <span class="n">timers</span> <span class="o">=</span> <span class="p">[</span><span class="s1">&#39;time integration&#39;</span><span class="p">]</span>