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

Jump to bottom

update MOM6 to its main repo 20231025 (NCAR candidate) and 20231031(GMAO FMS_cap) updating #1972

Closed
wants to merge 6 commits into from
Closed

update MOM6 to its main repo 20231025 (NCAR candidate) and 20231031(GMAO FMS_cap) updating #1972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c4df012
use MOM6 test branch, modify mom6_files.cmake
jiandewang Oct 31, 2023
8dbb477
Merge branch 'ufs-community:develop' into feature/update-MOM6-20231031
jiandewang Nov 1, 2023
714708d
update MOM6 to include 20231106 NOAA-GFDL/rtd_fix
jiandewang Nov 6, 2023
14f3c35
Merge branch 'ufs-community:develop' into feature/update-MOM6-20231031
jiandewang Nov 6, 2023
0057e97
Merge branch 'ufs-community:develop' into feature/update-MOM6-20231031
jiandewang Nov 8, 2023
b2322c5
Merge branch 'ufs-community:develop' into feature/update-MOM6-20231031
jiandewang Nov 13, 2023
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
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
branch = emc/develop
[submodule "MOM6"]
path = MOM6-interface/MOM6
url = https://github.com/NOAA-EMC/MOM6
branch = dev/emc
url = https://github.com/jiandewang/MOM6
branch = feature/update-NCAR-GMAO-20231031
[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 37 files
+0 −4 .github/workflows/coupled-api.yml
+9 −2 .readthedocs.yml
+0 −7 .testing/Makefile
+8 −0 config_src/drivers/FMS_cap/ocean_model_MOM.F90
+0 −0 config_src/drivers/STALE_mct_cap/mom_ocean_model_mct.F90
+0 −0 config_src/drivers/STALE_mct_cap/mom_surface_forcing_mct.F90
+0 −0 config_src/drivers/STALE_mct_cap/ocn_cap_methods.F90
+0 −0 config_src/drivers/STALE_mct_cap/ocn_comp_mct.F90
+0 −0 config_src/drivers/STALE_mct_cap/ocn_cpl_indices.F90
+46 −19 config_src/drivers/nuopc_cap/mom_cap.F90
+13 −7 config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90
+3 −40 config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
+2 −1 config_src/drivers/solo_driver/MOM_surface_forcing.F90
+10 −3 config_src/infra/FMS1/MOM_ensemble_manager_infra.F90
+10 −3 config_src/infra/FMS2/MOM_ensemble_manager_infra.F90
+2 −0 docs/requirements.txt
+5 −3 src/core/MOM.F90
+77 −3 src/core/MOM_dynamics_split_RK2.F90
+27 −42 src/core/MOM_forcing_type.F90
+1 −1 src/core/MOM_unit_tests.F90
+2 −13 src/core/MOM_variables.F90
+2 −0 src/diagnostics/MOM_obsolete_params.F90
+8 −1 src/framework/MOM_file_parser.F90
+1 −1 src/framework/MOM_get_input.F90
+345 −34 src/parameterizations/lateral/MOM_hor_visc.F90
+16 −0 src/parameterizations/vertical/MOM_CVMix_KPP.F90
+2 −1 src/parameterizations/vertical/MOM_set_viscosity.F90
+396 −0 src/parameterizations/vertical/MOM_vert_friction.F90
+195 −144 src/tracer/MOM_CFC_cap.F90
+272 −146 src/tracer/MOM_hor_bnd_diffusion.F90
+376 −88 src/tracer/MOM_neutral_diffusion.F90
+7 −4 src/tracer/MOM_tracer_flow_control.F90
+176 −99 src/tracer/MOM_tracer_hor_diff.F90
+31 −43 src/tracer/MOM_tracer_registry.F90
+13 −17 src/tracer/MOM_tracer_types.F90
+1 −1 src/tracer/oil_tracer.F90
+31 −6 src/user/MOM_wave_interface.F90
2 changes: 1 addition & 1 deletion MOM6-interface/mom6_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ list(APPEND mom6_src_files

MOM6/src/tracer/MOM_OCMIP2_CFC.F90
MOM6/src/tracer/MOM_generic_tracer.F90
MOM6/src/tracer/MOM_lateral_boundary_diffusion.F90
MOM6/src/tracer/MOM_hor_bnd_diffusion.F90
MOM6/src/tracer/MOM_neutral_diffusion.F90
MOM6/src/tracer/nw2_tracers.F90
MOM6/src/tracer/MOM_offline_aux.F90
Expand Down