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

Consider sea surface currents in air-sea flux calculation for ufs atmosphere-ocean coupling #2104

Merged
merged 24 commits into from
Feb 1, 2024
Merged

Consider sea surface currents in air-sea flux calculation for ufs atmosphere-ocean coupling #2104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
cce5373
Update FV3 and CMEPS.
binli2337 Jan 18, 2024
9f4e1f5
Update FV3 and CMEPS.
binli2337 Jan 26, 2024
5e5d77d
Merge branch 'develop' into feature/update_ssc
binli2337 Jan 26, 2024
061b112
Merge remote-tracking branch 'remotes/upstream/develop' into feature/…
BinLiu-NOAA Jan 27, 2024
abdbaaf
Update submodule FV3.
BinLiu-NOAA Jan 27, 2024
beb94e0
Update submodule FV3.
BinLiu-NOAA Jan 27, 2024
1353fb3
Add operational HAFS CCPP suites in the hafsw_faster build.
BinLiu-NOAA Jan 27, 2024
3e1b59d
Update FV3.
binli2337 Jan 30, 2024
4001253
Merge branch 'develop' into feature/update_ssc
binli2337 Jan 30, 2024
6489585
Merge remote-tracking branch 'upstream/develop' into feature/update_ssc
BinLiu-NOAA Jan 31, 2024
4cba22f
Update FV3.
binli2337 Jan 31, 2024
2d9959c
Merge branch 'feature/update_ssc' of https://github.com/binli2337/ufs…
binli2337 Jan 31, 2024
58d06b0
add hera RT log passed
FernandoAndrade-NOAA Feb 1, 2024
ea890c9
add orion RT logs: passed
zach1221 Feb 1, 2024
e0cc992
add derecho RT logs: passed
zach1221 Feb 1, 2024
290f403
add jet RT log passed
FernandoAndrade-NOAA Feb 1, 2024
025ab76
add control_p8_gnu ORT logs: passed
zach1221 Feb 1, 2024
a6a7b69
add regional_control_gnu ORT logs: passed
zach1221 Feb 1, 2024
9da9af3
add cpld_control_gnu ORT logs: passed
zach1221 Feb 1, 2024
fe31a76
WCOSS2 RT Log
BrianCurtis-NOAA Feb 1, 2024
2e11465
Acorn RT Log
BrianCurtis-NOAA Feb 1, 2024
a1d49d0
add hercules RT logs: passed
zach1221 Feb 1, 2024
403eea7
Update CMEPS and FV3.
binli2337 Feb 1, 2024
f09eebb
Update FV3.
binli2337 Feb 1, 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
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Open in desktop
Submodule CMEPS updated 2 files
+8 −0 ufs/ccpp/data/MED_typedefs.F90
+20 −0 ufs/ccpp/data/MED_typedefs.meta
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 13 files
+1 −1 atmos_cubed_sphere
+52 −0 atmos_model.F90
+16 −1 ccpp/data/GFS_typedefs.F90
+20 −0 ccpp/data/GFS_typedefs.meta
+22 −0 ccpp/driver/GFS_diagnostics.F90
+1 −1 ccpp/physics
+1 −3 ccpp/suites/suite_FV3_HAFS_v1_thompson.xml
+1 −3 ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml
+1 −3 ccpp/suites_not_used/suite_FV3_HAFS_v1_thompson_noahmp.xml
+1 −3 ccpp/suites_not_used/suite_FV3_HAFS_v1_thompson_noahmp_nonsst.xml
+3 −1 cpl/module_cplfields.F90
+36 −0 moving_nest/fv_moving_nest_physics.F90
+12 −1 moving_nest/fv_moving_nest_types.F90
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 @@
Tue Jan 30 14:01:31 UTC 2024
Wed Jan 31 19:20:35 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_32208/control_p8_gnu_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_24457/control_p8_gnu_bit_base
Checking test bit_base control_p8_gnu results ....
Moving baseline bit_base control_p8_gnu files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -51,14 +51,14 @@ Moving baseline bit_base control_p8_gnu 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 = 285.312637
0: The maximum resident set size (KB) = 1306388
0: The total amount of wall time = 283.367920
0: The maximum resident set size (KB) = 1304280

Test bit_base control_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_32208/control_p8_gnu_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_24457/control_p8_gnu_dbg_base
Checking test dbg_base control_p8_gnu results ....
Moving baseline dbg_base control_p8_gnu files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -106,14 +106,14 @@ Moving baseline dbg_base control_p8_gnu 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 = 918.815407
0: The maximum resident set size (KB) = 1293976
0: The total amount of wall time = 925.385783
0: The maximum resident set size (KB) = 1289116

Test dbg_base control_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_32208/control_p8_gnu_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_24457/control_p8_gnu_dcp
Checking test dcp control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -160,14 +160,14 @@ Checking test dcp control_p8_gnu results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 250.037227
0: The maximum resident set size (KB) = 1285148
0: The total amount of wall time = 251.670387
0: The maximum resident set size (KB) = 1281048

Test dcp control_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_32208/control_p8_gnu_mpi
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_24457/control_p8_gnu_mpi
Checking test mpi control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -214,14 +214,14 @@ Checking test mpi control_p8_gnu results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 248.414161
0: The maximum resident set size (KB) = 1282268
0: The total amount of wall time = 252.393805
0: The maximum resident set size (KB) = 1280764

Test mpi control_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_32208/control_p8_gnu_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_24457/control_p8_gnu_rst
Checking test rst control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -268,14 +268,14 @@ Checking test rst control_p8_gnu results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 247.902008
0: The maximum resident set size (KB) = 1281340
0: The total amount of wall time = 253.888089
0: The maximum resident set size (KB) = 1285060

Test rst control_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_32208/control_p8_gnu_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_24457/control_p8_gnu_std_base
Checking test std_base control_p8_gnu results ....
Moving baseline std_base control_p8_gnu files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -323,14 +323,14 @@ Moving baseline std_base control_p8_gnu 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 = 254.021931
0: The maximum resident set size (KB) = 1285592
0: The total amount of wall time = 249.734159
0: The maximum resident set size (KB) = 1283704

Test std_base control_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_32208/control_p8_gnu_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_24457/control_p8_gnu_thr
Checking test thr control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -377,11 +377,11 @@ Checking test thr control_p8_gnu results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 245.447665
0: The maximum resident set size (KB) = 1285448
0: The total amount of wall time = 247.695087
0: The maximum resident set size (KB) = 1280276

Test thr control_p8_gnu PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Jan 30 15:10:10 UTC 2024
Elapsed time: 01h:08m:40s. Have a nice day!
Wed Jan 31 22:36:38 UTC 2024
Elapsed time: 03h:16m:04s. 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 @@
Tue Jan 30 16:15:55 UTC 2024
Thu Feb 1 02:24:12 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_38780/cpld_control_nowave_noaero_p8_gnu_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_208866/cpld_control_nowave_noaero_p8_gnu_dbg_base
Checking test dbg_base cpld_control_nowave_noaero_p8_gnu results ....
Moving baseline dbg_base cpld_control_nowave_noaero_p8_gnu files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -66,14 +66,14 @@ Moving baseline dbg_base cpld_control_nowave_noaero_p8_gnu 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 = 1210.482711
0: The maximum resident set size (KB) = 1406168
0: The total amount of wall time = 1241.703813
0: The maximum resident set size (KB) = 1409892

Test dbg_base cpld_control_nowave_noaero_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_38780/cpld_control_nowave_noaero_p8_gnu_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_208866/cpld_control_nowave_noaero_p8_gnu_rst
Checking test rst cpld_control_nowave_noaero_p8_gnu results ....
Comparing sfcf021.tile1.nc .........OK
Comparing sfcf021.tile2.nc .........OK
Expand Down Expand Up @@ -135,14 +135,14 @@ Checking test rst cpld_control_nowave_noaero_p8_gnu results ....
Comparing RESTART/iced.2021-03-23-21600.nc .........OK
Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK

0: The total amount of wall time = 378.582612
0: The maximum resident set size (KB) = 1403184
0: The total amount of wall time = 397.708785
0: The maximum resident set size (KB) = 1402992

Test rst cpld_control_nowave_noaero_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_38780/cpld_control_nowave_noaero_p8_gnu_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_208866/cpld_control_nowave_noaero_p8_gnu_std_base
Checking test std_base cpld_control_nowave_noaero_p8_gnu results ....
Moving baseline std_base cpld_control_nowave_noaero_p8_gnu files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -205,11 +205,11 @@ Moving baseline std_base cpld_control_nowave_noaero_p8_gnu 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 = 375.362181
0: The maximum resident set size (KB) = 1402808
0: The total amount of wall time = 385.291097
0: The maximum resident set size (KB) = 1402388

Test std_base cpld_control_nowave_noaero_p8_gnu PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Jan 30 17:25:03 UTC 2024
Elapsed time: 01h:09m:09s. Have a nice day!
Thu Feb 1 03:44:26 UTC 2024
Elapsed time: 01h:20m:14s. Have a nice day!
24 changes: 12 additions & 12 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 @@
Tue Jan 30 15:37:20 UTC 2024
Wed Jan 31 23:59:22 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_164234/regional_control_gnu_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_160200/regional_control_gnu_dcp
Checking test dcp regional_control_gnu results ....
Comparing dynf000.nc .........OK
Comparing dynf006.nc .........OK
Expand All @@ -14,14 +14,14 @@ Checking test dcp regional_control_gnu results ....
Comparing NATLEV.GrbF00 .........OK
Comparing NATLEV.GrbF06 .........OK

0: The total amount of wall time = 522.592279
0: The maximum resident set size (KB) = 588712
0: The total amount of wall time = 528.769334
0: The maximum resident set size (KB) = 590976

Test dcp regional_control_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_164234/regional_control_gnu_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_160200/regional_control_gnu_std_base
Checking test std_base regional_control_gnu results ....
Moving baseline std_base regional_control_gnu files ....
Moving dynf000.nc .........OK
Expand All @@ -33,14 +33,14 @@ Moving baseline std_base regional_control_gnu files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

0: The total amount of wall time = 514.782210
0: The maximum resident set size (KB) = 588100
0: The total amount of wall time = 515.226916
0: The maximum resident set size (KB) = 590664

Test std_base regional_control_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_164234/regional_control_gnu_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_160200/regional_control_gnu_thr
Checking test thr regional_control_gnu results ....
Comparing dynf000.nc .........OK
Comparing dynf006.nc .........OK
Expand All @@ -51,11 +51,11 @@ Checking test thr regional_control_gnu results ....
Comparing NATLEV.GrbF00 .........OK
Comparing NATLEV.GrbF06 .........OK

0: The total amount of wall time = 521.372608
0: The maximum resident set size (KB) = 588836
0: The total amount of wall time = 507.542534
0: The maximum resident set size (KB) = 589080

Test thr regional_control_gnu PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Jan 30 16:13:55 UTC 2024
Elapsed time: 00h:36m:36s. Have a nice day!
Thu Feb 1 01:39:48 UTC 2024
Elapsed time: 01h:40m:27s. Have a nice day!
Loading