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 to MOM6 main 20240729 commit (gfdl-to-main-2024-05-31) #2381

Merged
merged 23 commits into from
Aug 17, 2024
Merged

update to MOM6 main 20240729 commit (gfdl-to-main-2024-05-31) #2381

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
fd911a0
using MOM6 test branch
jiandewang Jul 30, 2024
d322aa8
Merge branch 'ufs-community:develop' into feature/update-MOM6-20240531
jiandewang Jul 30, 2024
e511aa2
remove USE_HUYNH_STENCIL_BUG = True in MOM_input
jiandewang Jul 31, 2024
97adf10
commit test_changes.list
jiandewang Jul 31, 2024
9267080
remove USE_HUYNH_STENCIL_BUG from HAFS-mom6
jiandewang Jul 31, 2024
670e53b
update MOM6 branch
Aug 7, 2024
76828cc
using own PR test_changes.list
jiandewang Aug 7, 2024
a4b4321
using own test_changes.list
jiandewang Aug 13, 2024
e29f4ef
switch FIX_USTAR_GUSTLESS_BUG to USTAR_GUSTLESS_BUG for MOM_input_hafs
jiandewang Aug 13, 2024
2e6b0bf
Update bl_date.conf
zach1221 Aug 13, 2024
877f1c5
add orion RT logs: passed
zach1221 Aug 14, 2024
ca7f5fc
ORT Jobs Completed.
epic-cicd-jenkins Aug 14, 2024
82d262a
add hercules RT logs: passed
zach1221 Aug 14, 2024
a47ca68
add derecho RT logs: passed
zach1221 Aug 14, 2024
12418d0
add gaea RT logs: passed
zach1221 Aug 15, 2024
d210146
add hera RT log passed
FernandoAndrade-NOAA Aug 15, 2024
09690a0
set USE_HUYNH_STENCIL_BUG = True
jiandewang Aug 15, 2024
c587137
add wcoss2 RT logs: passed
DusanJovic-NOAA Aug 16, 2024
12eb230
rerun gaea RT log pass
FernandoAndrade-NOAA Aug 16, 2024
f9e0775
add orion RT logs: passed
zach1221 Aug 16, 2024
f9c9232
add hercules RT logs: passed
zach1221 Aug 16, 2024
3c4aa28
add derecho RT logs: passed
zach1221 Aug 16, 2024
eb4e537
revert MOM6 submodule
jiandewang Aug 16, 2024
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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
branch = emc/develop
[submodule "MOM6"]
path = MOM6-interface/MOM6
url = https://github.com/NOAA-EMC/MOM6
branch = dev/emc
# url = https://github.com/NOAA-EMC/MOM6
# branch = dev/emc
url = https://github.com/jiandewang/MOM6
branch = feature/update-to-main-20240531
[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 155 files
2 changes: 2 additions & 0 deletions MOM6-interface/mom6_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ list(APPEND mom6_src_files
MOM6/src/core/MOM_continuity_PPM.F90
MOM6/src/core/MOM_density_integrals.F90
MOM6/src/core/MOM_dynamics_split_RK2.F90
MOM6/src/core/MOM_dynamics_split_RK2b.F90
MOM6/src/core/MOM_dynamics_unsplit.F90
MOM6/src/core/MOM_dynamics_unsplit_RK2.F90
MOM6/src/core/MOM_forcing_type.F90
Expand All @@ -59,6 +60,7 @@ list(APPEND mom6_src_files
MOM6/src/diagnostics/MOM_sum_output.F90
MOM6/src/diagnostics/MOM_wave_speed.F90

MOM6/src/equation_of_state/MOM_EOS_base_type.F90
MOM6/src/equation_of_state/MOM_EOS.F90
MOM6/src/equation_of_state/MOM_EOS_Jackett06.F90
MOM6/src/equation_of_state/MOM_EOS_Roquet_SpV.F90
Expand Down
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20240730
export BL_DATE=20240813
48 changes: 24 additions & 24 deletions tests/logs/OpnReqTests_control_p8_hera.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Aug 9 04:00:06 UTC 2024
Wed Aug 14 04:49:29 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3660377/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1991485/bit_base_bit_base
Checking test bit_base results ....
Moving baseline bit_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -51,14 +51,14 @@ Moving baseline bit_base files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 279.679964
0: The maximum resident set size (KB) = 1460412
0: The total amount of wall time = 284.606332
0: The maximum resident set size (KB) = 1454664

Test bit_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3660377/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1991485/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 986.199169
0: The maximum resident set size (KB) = 1426460
0: The total amount of wall time = 963.742336
0: The maximum resident set size (KB) = 1417032

Test dbg_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3660377/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1991485/dcp_dcp
Checking test dcp results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -160,14 +160,14 @@ Checking test dcp results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 250.630229
0: The maximum resident set size (KB) = 1408568
0: The total amount of wall time = 244.954476
0: The maximum resident set size (KB) = 1425708

Test dcp PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3660377/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1991485/mpi_mpi
Checking test mpi results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -214,14 +214,14 @@ Checking test mpi results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 248.429764
0: The maximum resident set size (KB) = 1428500
0: The total amount of wall time = 246.793628
0: The maximum resident set size (KB) = 1424252

Test mpi PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3660377/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1991485/rst_rst
Checking test rst results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -268,14 +268,14 @@ Checking test rst results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 255.808429
0: The maximum resident set size (KB) = 1426564
0: The total amount of wall time = 246.591406
0: The maximum resident set size (KB) = 1425312

Test rst PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3660377/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1991485/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -323,14 +323,14 @@ Moving baseline std_base files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 248.579185
0: The maximum resident set size (KB) = 1433372
0: The total amount of wall time = 253.919221
0: The maximum resident set size (KB) = 1425460

Test std_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3660377/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1991485/thr_thr
Checking test thr results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -377,11 +377,11 @@ Checking test thr results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 253.035278
0: The maximum resident set size (KB) = 1426628
0: The total amount of wall time = 247.819336
0: The maximum resident set size (KB) = 1425916

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Aug 9 05:05:03 UTC 2024
Elapsed time: 01h:04m:57s. Have a nice day!
Wed Aug 14 05:57:13 UTC 2024
Elapsed time: 01h:07m:47s. Have a nice day!
24 changes: 12 additions & 12 deletions tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Aug 9 02:56:32 UTC 2024
Wed Aug 14 03:34:34 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2767517/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_802869/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -66,14 +66,14 @@ Moving baseline dbg_base files ....
Moving RESTART/iced.2021-03-23-21600.nc .........OK
Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK

0: The total amount of wall time = 1360.287918
0: The maximum resident set size (KB) = 1522784
0: The total amount of wall time = 1485.131443
0: The maximum resident set size (KB) = 1540540

Test dbg_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2767517/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_802869/rst_rst
Checking test rst results ....
Comparing sfcf021.tile1.nc .....USING NCCMP......OK
Comparing sfcf021.tile2.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -135,14 +135,14 @@ Checking test rst results ....
Comparing RESTART/iced.2021-03-23-21600.nc .....USING NCCMP......OK
Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......OK

0: The total amount of wall time = 431.635030
0: The maximum resident set size (KB) = 1531952
0: The total amount of wall time = 679.652936
0: The maximum resident set size (KB) = 1529736

Test rst PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2767517/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_802869/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -205,11 +205,11 @@ Moving baseline std_base files ....
Moving RESTART/iced.2021-03-23-21600.nc .........OK
Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK

0: The total amount of wall time = 432.002387
0: The maximum resident set size (KB) = 1541276
0: The total amount of wall time = 432.966302
0: The maximum resident set size (KB) = 1528124

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Aug 9 04:00:06 UTC 2024
Elapsed time: 01h:03m:35s. Have a nice day!
Wed Aug 14 04:49:26 UTC 2024
Elapsed time: 01h:14m:53s. Have a nice day!
30 changes: 15 additions & 15 deletions tests/logs/OpnReqTests_regional_control_hera.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Aug 9 00:27:51 UTC 2024
Tue Aug 13 21:40:20 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2714443/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3112206/bit_base_bit_base
Checking test bit_base results ....
Moving baseline bit_base files ....
Moving dynf000.nc .........OK
Expand All @@ -15,14 +15,14 @@ Moving baseline bit_base files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

0: The total amount of wall time = 1379.789847
0: The maximum resident set size (KB) = 770252
0: The total amount of wall time = 1417.012128
0: The maximum resident set size (KB) = 777980

Test bit_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2714443/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3112206/dcp_dcp
Checking test dcp results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
Expand All @@ -33,14 +33,14 @@ Checking test dcp results ....
Comparing NATLEV.GrbF00 .....USING CMP......OK
Comparing NATLEV.GrbF06 .....USING CMP......OK

0: The total amount of wall time = 2222.469710
0: The maximum resident set size (KB) = 742740
0: The total amount of wall time = 2254.022804
0: The maximum resident set size (KB) = 743156

Test dcp PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2714443/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3112206/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving dynf000.nc .........OK
Expand All @@ -52,14 +52,14 @@ Moving baseline std_base files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

0: The total amount of wall time = 2152.921801
0: The maximum resident set size (KB) = 742124
0: The total amount of wall time = 2149.586191
0: The maximum resident set size (KB) = 720988

Test std_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2714443/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3112206/thr_thr
Checking test thr results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
Expand All @@ -70,11 +70,11 @@ Checking test thr results ....
Comparing NATLEV.GrbF00 .....USING CMP......OK
Comparing NATLEV.GrbF06 .....USING CMP......OK

0: The total amount of wall time = 2261.335740
0: The maximum resident set size (KB) = 720504
0: The total amount of wall time = 2187.962794
0: The maximum resident set size (KB) = 719432

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Aug 9 02:56:30 UTC 2024
Elapsed time: 02h:28m:41s. Have a nice day!
Wed Aug 14 03:34:33 UTC 2024
Elapsed time: 05h:54m:14s. Have a nice day!
Loading
Loading