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.

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

(1) update MOM6 to its main branch 20220629 updating (NCAR 20220603 candidate) (2) add temperature limiter in SPPT #1302

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
61944ea
pointing MOM6 to test branch
jiandewang Jun 29, 2022
240ac05
Merge branch 'ufs-community:develop' into feature/update-MOM6-20220603
jiandewang Jun 30, 2022
210142c
Merge branch 'ufs-community:develop' into feature/update-MOM6-20220603
jiandewang Jul 7, 2022
0c81f95
Merge branch 'ufs-community:develop' into feature/update-MOM6-20220603
jiandewang Jul 13, 2022
82f0b9e
Merge branch 'ufs-community:develop' into feature/update-MOM6-20220603
jiandewang Jul 15, 2022
5bdf1f7
add temperature limiter for SPPT in MOM6
jiandewang Jul 16, 2022
f1e9994
add Phil code change for MOM_diabatic_driver in MOM
jiandewang Jul 18, 2022
67cafed
Merge branch 'ufs-community:develop' into feature/update-MOM6-20220603
jiandewang Jul 19, 2022
2207be6
Merge branch 'ufs-community:develop' into feature/update-MOM6-20220603
jiandewang Jul 20, 2022
62a9d9d
add new BL_DATE
jkbk2004 Jul 20, 2022
8ebb184
[AutoRT] cheyenne.gnu Job Completed.
BrianCurtis-NOAA Jul 20, 2022
7fbe845
[AutoRT] cheyenne.intel Job Completed.
BrianCurtis-NOAA Jul 21, 2022
f0f712e
[AutoRT] orion.intel Job Completed.
BrianCurtis-NOAA Jul 21, 2022
f716c3a
[AutoRT] hera.gnu Job Completed.
BrianCurtis-NOAA Jul 21, 2022
5ba40e1
[AutoRT] jet.intel Job Completed.
BrianCurtis-NOAA Jul 21, 2022
a0d45fd
[AutoRT] hera.intel Job Completed.
BrianCurtis-NOAA Jul 21, 2022
0056d20
[AutoRT] gaea.intel Job Completed.
BrianCurtis-NOAA Jul 21, 2022
630593b
revert MOM6 submodule
jiandewang Jul 21, 2022
0a16dd4
update MOM6 to dev/emc
jiandewang Jul 21, 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 MOM6-interface/MOM6
Submodule MOM6 updated 38 files
+2 −2 .testing/tc2/MOM_input
+1 −1 config_src/drivers/FMS_cap/ocean_model_MOM.F90
+1 −1 config_src/drivers/mct_cap/mom_ocean_model_mct.F90
+138 −61 config_src/drivers/nuopc_cap/mom_cap.F90
+206 −57 config_src/drivers/nuopc_cap/mom_cap_methods.F90
+14 −8 config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90
+56 −18 config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
+3 −2 config_src/drivers/solo_driver/MOM_driver.F90
+8 −1 src/ALE/MOM_regridding.F90
+68 −11 src/core/MOM.F90
+103 −9 src/core/MOM_CoriolisAdv.F90
+44 −65 src/core/MOM_PressureForce_FV.F90
+23 −14 src/core/MOM_density_integrals.F90
+54 −3 src/core/MOM_dynamics_split_RK2.F90
+157 −109 src/core/MOM_forcing_type.F90
+67 −5 src/core/MOM_isopycnal_slopes.F90
+220 −0 src/core/MOM_stoch_eos.F90
+3 −0 src/core/MOM_variables.F90
+35 −2 src/diagnostics/MOM_diagnostics.F90
+8 −1 src/diagnostics/MOM_sum_output.F90
+9 −9 src/equation_of_state/MOM_EOS.F90
+1 −0 src/equation_of_state/TEOS10/gsw_mod_error_functions.f90
+1 −1 src/framework/MOM_diag_remap.F90
+1 −0 src/framework/MOM_random.F90
+1 −1 src/parameterizations/lateral/MOM_MEKE.F90
+7 −2 src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90
+31 −3 src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
+66 −76 src/parameterizations/lateral/MOM_thickness_diffuse.F90
+87 −125 src/parameterizations/vertical/MOM_CVMix_KPP.F90
+30 −20 src/parameterizations/vertical/MOM_diabatic_aux.F90
+28 −14 src/parameterizations/vertical/MOM_diabatic_driver.F90
+9 −6 src/parameterizations/vertical/MOM_tidal_mixing.F90
+109 −79 src/tracer/MOM_CFC_cap.F90
+17 −4 src/tracer/MOM_tracer_flow_control.F90
+72 −137 src/tracer/MOM_tracer_registry.F90
+130 −0 src/tracer/MOM_tracer_types.F90
+15 −3 src/tracer/pseudo_salt_tracer.F90
+469 −64 src/user/MOM_wave_interface.F90
3 changes: 3 additions & 0 deletions MOM6-interface/mom6_files.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ list(APPEND mom6_src_files
MOM6/src/core/MOM_isopycnal_slopes.F90
MOM6/src/core/MOM_open_boundary.F90
MOM6/src/core/MOM_porous_barriers.F90
MOM6/src/core/MOM_stoch_eos.F90
MOM6/src/core/MOM_transcribe_grid.F90
MOM6/src/core/MOM_unit_tests.F90
MOM6/src/core/MOM_variables.F90
Expand Down Expand Up @@ -77,6 +78,7 @@ list(APPEND mom6_src_files
MOM6/src/equation_of_state/TEOS10/gsw_gibbs.f90
MOM6/src/equation_of_state/TEOS10/gsw_gibbs_ice.f90
MOM6/src/equation_of_state/TEOS10/gsw_gibbs_pt0_pt0.f90
MOM6/src/equation_of_state/TEOS10/gsw_mod_error_functions.f90
MOM6/src/equation_of_state/TEOS10/gsw_mod_freezing_poly_coefficients.f90
MOM6/src/equation_of_state/TEOS10/gsw_mod_gibbs_ice_coefficients.f90
MOM6/src/equation_of_state/TEOS10/gsw_mod_kinds.f90
Expand Down Expand Up @@ -207,6 +209,7 @@ list(APPEND mom6_src_files
MOM6/src/tracer/MOM_tracer_flow_control.F90
MOM6/src/tracer/MOM_tracer_hor_diff.F90
MOM6/src/tracer/MOM_tracer_registry.F90
MOM6/src/tracer/MOM_tracer_types.F90
MOM6/src/tracer/RGC_tracer.F90
MOM6/src/tracer/advection_test_tracer.F90
MOM6/src/tracer/boundary_impulse_tracer.F90
Expand Down
422 changes: 211 additions & 211 deletions tests/RegressionTests_cheyenne.gnu.log

Large diffs are not rendered by default.

1,362 changes: 675 additions & 687 deletions tests/RegressionTests_cheyenne.intel.log

Large diffs are not rendered by default.

1,419 changes: 668 additions & 751 deletions tests/RegressionTests_gaea.intel.log

Large diffs are not rendered by default.

422 changes: 211 additions & 211 deletions tests/RegressionTests_hera.gnu.log

Large diffs are not rendered by default.

1,439 changes: 678 additions & 761 deletions tests/RegressionTests_hera.intel.log

Large diffs are not rendered by default.

2,883 changes: 1,264 additions & 1,619 deletions tests/RegressionTests_jet.intel.log

Large diffs are not rendered by default.

1,441 changes: 679 additions & 762 deletions tests/RegressionTests_orion.intel.log

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
TEST_35D=true
fi

BL_DATE=20220719
BL_DATE=20220720

RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}

Expand Down