Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update MOM6 to its main branch 20220820 #1379

Merged
merged 11 commits into from
Aug 24, 2022
Merged

update MOM6 to its main branch 20220820 #1379

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a970efe
* add 2 new MOM6 files in cmake
jiandewang Aug 21, 2022
89d3b42
Merge branch 'ufs-community:develop' into feature/update-MOM6-20220820
jiandewang Aug 22, 2022
0f04e0f
[AutoRT] orion.intel Job Completed.
BrianCurtis-NOAA Aug 22, 2022
3fb2d11
[AutoRT] hera.intel Job Completed.
BrianCurtis-NOAA Aug 22, 2022
881ef93
[AutoRT] hera.gnu Job Completed.
BrianCurtis-NOAA Aug 22, 2022
ba9bd79
[AutoRT] jet.intel Job Completed.
BrianCurtis-NOAA Aug 23, 2022
55a6a2f
add cheyenne intel/gnu RT logs: passed
jkbk2004 Aug 23, 2022
5d44abc
add wcoss 2 log
jiandewang Aug 23, 2022
1f7c328
add gaea.intel RT log: passed
jkbk2004 Aug 24, 2022
7c80320
revert MOM6 back to dev/emc
jiandewang Aug 24, 2022
d3edf08
fix typo in submodule
jiandewang Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
[submodule "MOM6"]
path = MOM6-interface/MOM6
url = https://github.com/NOAA-EMC/MOM6
branch = dev/emc
path = MOM6-interface/MOM6
[submodule "CICE"]
path = CICE-interface/CICE
url = https://github.com/NOAA-EMC/CICE
Expand Down
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Open in desktop
Submodule MOM6 updated 101 files
26 changes: 14 additions & 12 deletions MOM6-interface/mom6_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

)

Expand Down
430 changes: 215 additions & 215 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

2,022 changes: 988 additions & 1,034 deletions tests/RegressionTests_cheyenne.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,989 changes: 1,001 additions & 988 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

328 changes: 164 additions & 164 deletions tests/RegressionTests_hera.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

1,092 changes: 540 additions & 552 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

942 changes: 471 additions & 471 deletions tests/RegressionTests_jet.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,052 changes: 527 additions & 525 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

718 changes: 359 additions & 359 deletions tests/RegressionTests_wcoss2.intel.log
View file
Open in desktop

Large diffs are not rendered by default.