update MOM6 to its main repository 20230504 updating (ufs-community#1736

) * pointing MOM6 to test branch, modify mom6_files.cmake to reflect new files being added
Qingfu-Liu · May 22, 2023 · 7d015e1 · 7d015e1
1 parent 52cee26
commit 7d015e1
Show file tree

Hide file tree

Showing 10 changed files with 3,660 additions and 3,751 deletions.
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/MOM6-interface/mom6_files.cmake b/MOM6-interface/mom6_files.cmake
@@ -12,7 +12,6 @@ list(APPEND mom6_src_files
   MOM6/src/ALE/coord_hycom.F90
   MOM6/src/ALE/coord_rho.F90
   MOM6/src/ALE/coord_sigma.F90
-  MOM6/src/ALE/coord_slight.F90
   MOM6/src/ALE/coord_zlike.F90
   MOM6/src/ALE/MOM_hybgen_regrid.F90
   MOM6/src/ALE/MOM_hybgen_remap.F90
@@ -22,6 +21,7 @@ list(APPEND mom6_src_files
   MOM6/src/ALE/regrid_edge_values.F90
   MOM6/src/ALE/regrid_interp.F90
   MOM6/src/ALE/regrid_solvers.F90
+  MOM6/src/ALE/remapping_attic.F90
 
   MOM6/src/core/MOM.F90
   MOM6/src/core/MOM_CoriolisAdv.F90
@@ -109,7 +109,6 @@ list(APPEND mom6_src_files
   MOM6/src/framework/MOM_data_override.F90
   MOM6/src/framework/MOM_diag_mediator.F90
   MOM6/src/framework/MOM_diag_remap.F90
-  MOM6/src/framework/MOM_diag_vkernels.F90
   MOM6/src/framework/MOM_document.F90
   MOM6/src/framework/MOM_domains.F90
   MOM6/src/framework/MOM_dyn_horgrid.F90
@@ -122,6 +121,8 @@ list(APPEND mom6_src_files
   MOM6/src/framework/MOM_interpolate.F90
   MOM6/src/framework/MOM_intrinsic_functions.F90
   MOM6/src/framework/MOM_io.F90
+  MOM6/src/framework/MOM_io_file.F90
+  MOM6/src/framework/MOM_netcdf.F90
   MOM6/src/framework/posix.F90
   MOM6/src/framework/MOM_random.F90
   MOM6/src/framework/MOM_restart.F90

diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log