Update test scripts to support Python3, update MOM. mom-ocean#328

nikizadehgfdl · Nov 28, 2016 · f4edf7b · f4edf7b
1 parent 94910d2
commit f4edf7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/MOM6 b/src/MOM6
diff --git a/tools/tests/test_diagnostic_output.py b/tools/tests/test_diagnostic_output.py
@@ -127,7 +127,7 @@ def is_layer(diag):
         coord_diags = filter(is_sigma, available_diags)
     layer_diags = filter(is_layer, available_diags)
 
-    dump_diags(exp, coord_diags + layer_diags)
+    dump_diags(exp, list(coord_diags) + list(layer_diags))
 
     return coord_diags, layer_diags
 
@@ -210,6 +210,7 @@ def test_cmp_z_zold_remapping(self, exp):
                     compare_z_to_zold_diags(old, new)
                     break
 
+    @pytest.mark.skip(reason="Rho remapping not supported yet.")
     @pytest.mark.rho_remap
     def test_rho_remapping(self, exp_diags_not_dumped):
         """
@@ -221,6 +222,7 @@ def test_rho_remapping(self, exp_diags_not_dumped):
         compare_rho_to_layer(rho_diags, layer_diags)
 
 
+    @pytest.mark.skip(reason="Sigma remapping not supported yet.")
     @pytest.mark.sigma_remap
     def test_sigma_remapping(self, exp_diags_not_dumped):
         """
+12 −375		src/ALE/MOM_ALE.F90
+593 −73		src/ALE/MOM_regridding.F90
+38 −8		src/ALE/regrid_consts.F90
+0 −39		src/diagnostics/MOM_diag_to_Z.F90
+1 −0		src/diagnostics/MOM_obsolete_params.F90
+247 −133		src/framework/MOM_diag_mediator.F90
+139 −272		src/framework/MOM_diag_remap.F90
+111 −21		src/framework/MOM_string_functions.F90
+4 −3		src/initialization/MOM_state_initialization.F90
+1 −1		src/initialization/MOM_tracer_initialization_from_Z.F90