Skip to content

Commit 6d0454c

Browse files
jiandewangjiandewang
authored
update to MOM6 main 20240729 commit (gfdl-to-main-2024-05-31) (#2381)
* using MOM6 test branch add MOM_dynamics_split_RK2b.F90 and MOM_EOS_base_type.F90 in cmake list add extra 8PE for cpld_debug_pdlib job set DEFAULT_ANSWER_DATE=20231231 in 5x5 case add USE_HUYNH_STENCIL_BUG = True in MOM_input using MOM6 restart file as BL for sfs and hafs_mom jobs * remove USE_HUYNH_STENCIL_BUG = True in MOM_input switch FIX_USTAR_GUSTLESS_BUG=F to USTAR_GUSTLESS_BUG=T * switch FIX_USTAR_GUSTLESS_BUG to USTAR_GUSTLESS_BUG for MOM_input_hafs * set USE_HUYNH_STENCIL_BUG = True
1 parent a1143cc commit 6d0454c

21 files changed

+1904
-1918
lines changed

‎MOM6-interface/MOM6‎

Submodule MOM6 updated 155 files

‎MOM6-interface/mom6_files.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ list(APPEND mom6_src_files
3636
MOM6/src/core/MOM_continuity_PPM.F90
3737
MOM6/src/core/MOM_density_integrals.F90
3838
MOM6/src/core/MOM_dynamics_split_RK2.F90
39+
MOM6/src/core/MOM_dynamics_split_RK2b.F90
3940
MOM6/src/core/MOM_dynamics_unsplit.F90
4041
MOM6/src/core/MOM_dynamics_unsplit_RK2.F90
4142
MOM6/src/core/MOM_forcing_type.F90
@@ -59,6 +60,7 @@ list(APPEND mom6_src_files
5960
MOM6/src/diagnostics/MOM_sum_output.F90
6061
MOM6/src/diagnostics/MOM_wave_speed.F90
6162

63+
MOM6/src/equation_of_state/MOM_EOS_base_type.F90
6264
MOM6/src/equation_of_state/MOM_EOS.F90
6365
MOM6/src/equation_of_state/MOM_EOS_Jackett06.F90
6466
MOM6/src/equation_of_state/MOM_EOS_Roquet_SpV.F90

‎tests/bl_date.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export BL_DATE=20240730
1+
export BL_DATE=20240813

‎tests/logs/OpnReqTests_control_p8_hera.log‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Fri Aug 9 04:00:06 UTC 2024
1+
Wed Aug 14 04:49:29 UTC 2024
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
6-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3660377/bit_base_bit_base
6+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1991485/bit_base_bit_base
77
Checking test bit_base results ....
88
Moving baseline bit_base files ....
99
Moving sfcf000.nc .........OK
@@ -51,14 +51,14 @@ Moving baseline bit_base files ....
5151
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
5252
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
5353

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

5757
Test bit_base PASS
5858

5959

6060
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
61-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3660377/dbg_base_dbg_base
61+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1991485/dbg_base_dbg_base
6262
Checking test dbg_base results ....
6363
Moving baseline dbg_base files ....
6464
Moving sfcf000.nc .........OK
@@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
106106
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
107107
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
108108

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

112112
Test dbg_base PASS
113113

114114

115115
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
116-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3660377/dcp_dcp
116+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1991485/dcp_dcp
117117
Checking test dcp results ....
118118
Comparing sfcf000.nc .....USING NCCMP......OK
119119
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -160,14 +160,14 @@ Checking test dcp results ....
160160
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
161161
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
162162

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

166166
Test dcp PASS
167167

168168

169169
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
170-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3660377/mpi_mpi
170+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1991485/mpi_mpi
171171
Checking test mpi results ....
172172
Comparing sfcf000.nc .....USING NCCMP......OK
173173
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -214,14 +214,14 @@ Checking test mpi results ....
214214
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
215215
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
216216

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

220220
Test mpi PASS
221221

222222

223223
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
224-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3660377/rst_rst
224+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1991485/rst_rst
225225
Checking test rst results ....
226226
Comparing sfcf000.nc .....USING NCCMP......OK
227227
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -268,14 +268,14 @@ Checking test rst results ....
268268
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
269269
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
270270

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

274274
Test rst PASS
275275

276276

277277
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
278-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3660377/std_base_std_base
278+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1991485/std_base_std_base
279279
Checking test std_base results ....
280280
Moving baseline std_base files ....
281281
Moving sfcf000.nc .........OK
@@ -323,14 +323,14 @@ Moving baseline std_base files ....
323323
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
324324
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
325325

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

329329
Test std_base PASS
330330

331331

332332
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
333-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3660377/thr_thr
333+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1991485/thr_thr
334334
Checking test thr results ....
335335
Comparing sfcf000.nc .....USING NCCMP......OK
336336
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -377,11 +377,11 @@ Checking test thr results ....
377377
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
378378
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
379379

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

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Fri Aug 9 05:05:03 UTC 2024
387-
Elapsed time: 01h:04m:57s. Have a nice day!
386+
Wed Aug 14 05:57:13 UTC 2024
387+
Elapsed time: 01h:07m:47s. Have a nice day!

‎tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Fri Aug 9 02:56:32 UTC 2024
1+
Wed Aug 14 03:34:34 UTC 2024
22
Start Operation Requirement Test
33

44

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

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

7272
Test dbg_base PASS
7373

7474

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

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

141141
Test rst PASS
142142

143143

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

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

211211
Test std_base PASS
212212

213213
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
214-
Fri Aug 9 04:00:06 UTC 2024
215-
Elapsed time: 01h:03m:35s. Have a nice day!
214+
Wed Aug 14 04:49:26 UTC 2024
215+
Elapsed time: 01h:14m:53s. Have a nice day!

‎tests/logs/OpnReqTests_regional_control_hera.log‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Fri Aug 9 00:27:51 UTC 2024
1+
Tue Aug 13 21:40:20 UTC 2024
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
6-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2714443/bit_base_bit_base
6+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3112206/bit_base_bit_base
77
Checking test bit_base results ....
88
Moving baseline bit_base files ....
99
Moving dynf000.nc .........OK
@@ -15,14 +15,14 @@ Moving baseline bit_base files ....
1515
Moving NATLEV.GrbF00 .........OK
1616
Moving NATLEV.GrbF06 .........OK
1717

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

2121
Test bit_base PASS
2222

2323

2424
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
25-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2714443/dcp_dcp
25+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3112206/dcp_dcp
2626
Checking test dcp results ....
2727
Comparing dynf000.nc .....USING NCCMP......OK
2828
Comparing dynf006.nc .....USING NCCMP......OK
@@ -33,14 +33,14 @@ Checking test dcp results ....
3333
Comparing NATLEV.GrbF00 .....USING CMP......OK
3434
Comparing NATLEV.GrbF06 .....USING CMP......OK
3535

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

3939
Test dcp PASS
4040

4141

4242
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
43-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2714443/std_base_std_base
43+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3112206/std_base_std_base
4444
Checking test std_base results ....
4545
Moving baseline std_base files ....
4646
Moving dynf000.nc .........OK
@@ -52,14 +52,14 @@ Moving baseline std_base files ....
5252
Moving NATLEV.GrbF00 .........OK
5353
Moving NATLEV.GrbF06 .........OK
5454

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

5858
Test std_base PASS
5959

6060

6161
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
62-
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2714443/thr_thr
62+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3112206/thr_thr
6363
Checking test thr results ....
6464
Comparing dynf000.nc .....USING NCCMP......OK
6565
Comparing dynf006.nc .....USING NCCMP......OK
@@ -70,11 +70,11 @@ Checking test thr results ....
7070
Comparing NATLEV.GrbF00 .....USING CMP......OK
7171
Comparing NATLEV.GrbF06 .....USING CMP......OK
7272

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

7676
Test thr PASS
7777

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

0 commit comments

Comments
 (0)