update MOM6 to its main branch 20220820 (ufs-community#1379)

* * add 2 new MOM6 files in cmake * switch to use infra/FMS2 code in cmake * using MOM6 testing branch
grantfirl · Aug 24, 2022 · 5477338 · 5477338
1 parent a221241
commit 5477338
Show file tree

Hide file tree

Showing 10 changed files with 4,280 additions and 4,321 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
@@ -271,19 +271,21 @@ list(APPEND mom6_src_files
   MOM6/config_src/external/ODA_hooks/write_ocean_obs.F90
   MOM6/config_src/external/drifters/MOM_particles.F90
   MOM6/config_src/external/drifters/MOM_particles_types.F90
+  MOM6/config_src/external/database_comms/MOM_database_comms.F90
+  MOM6/config_src/external/database_comms/database_client_interface.F90
 
-  MOM6/config_src/infra/FMS1/MOM_coms_infra.F90
-  MOM6/config_src/infra/FMS1/MOM_constants.F90
-  MOM6/config_src/infra/FMS1/MOM_couplertype_infra.F90
-  MOM6/config_src/infra/FMS1/MOM_cpu_clock_infra.F90
-  MOM6/config_src/infra/FMS1/MOM_data_override_infra.F90
-  MOM6/config_src/infra/FMS1/MOM_diag_manager_infra.F90
-  MOM6/config_src/infra/FMS1/MOM_domain_infra.F90
-  MOM6/config_src/infra/FMS1/MOM_ensemble_manager_infra.F90
-  MOM6/config_src/infra/FMS1/MOM_error_infra.F90
-  MOM6/config_src/infra/FMS1/MOM_interp_infra.F90
-  MOM6/config_src/infra/FMS1/MOM_io_infra.F90
-  MOM6/config_src/infra/FMS1/MOM_time_manager.F90
+  MOM6/config_src/infra/FMS2/MOM_coms_infra.F90
+  MOM6/config_src/infra/FMS2/MOM_constants.F90
+  MOM6/config_src/infra/FMS2/MOM_couplertype_infra.F90
+  MOM6/config_src/infra/FMS2/MOM_cpu_clock_infra.F90
+  MOM6/config_src/infra/FMS2/MOM_data_override_infra.F90
+  MOM6/config_src/infra/FMS2/MOM_diag_manager_infra.F90
+  MOM6/config_src/infra/FMS2/MOM_domain_infra.F90
+  MOM6/config_src/infra/FMS2/MOM_ensemble_manager_infra.F90
+  MOM6/config_src/infra/FMS2/MOM_error_infra.F90
+  MOM6/config_src/infra/FMS2/MOM_interp_infra.F90
+  MOM6/config_src/infra/FMS2/MOM_io_infra.F90
+  MOM6/config_src/infra/FMS2/MOM_time_manager.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