Skip to content

CMake Atmosphere Dycore Generalization + Fix for JEDI cubed sphere grid #2708 #2604

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

Merged
jkbk2004 merged 20 commits into from
Apr 23, 2025
Merged

CMake Atmosphere Dycore Generalization + Fix for JEDI cubed sphere grid #2708 #2604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5306d6e
FV3: reorganize project structure to allow multiple dycores. Isolate …
scrasmussen Dec 26, 2024
ce65665
cmake-atmosphere-generalization branch. Reorganize project structure …
scrasmussen Dec 26, 2024
742a9ae
Merge branch 'develop' into fv3atm-cmake-generalization-0214
grantfirl Apr 21, 2025
355a98d
fv3 feature branch hash update
jkbk2004 Apr 22, 2025
048be1d
add hera RT log: passed
jkbk2004 Apr 22, 2025
394c4fc
Merge branch 'develop' into fv3atm-cmake-generalization-0214
jkbk2004 Apr 22, 2025
daf2b7d
add derecho Rt log: passed
jkbk2004 Apr 22, 2025
c784aa9
add orion RT log: passed
jkbk2004 Apr 22, 2025
694fcc5
add hercules RT log: passed
jkbk2004 Apr 22, 2025
c096818
Update repo_check.sh
jkbk2004 Apr 22, 2025
f9bcd2f
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Apr 22, 2025
f9acf73
Acorn RT Log: Passed
BrianCurtis-NOAA Apr 22, 2025
b90c996
add gaeaC5 RT log passed
FernandoAndrade-NOAA Apr 22, 2025
620c69f
add gaeaC6 RT log passed
FernandoAndrade-NOAA Apr 22, 2025
accadb2
ORT Jobs Completed.
epic-cicd-jenkins Apr 22, 2025
d444348
ORT Jobs Completed.
epic-cicd-jenkins Apr 23, 2025
91b1249
ORT Jobs Completed.
epic-cicd-jenkins Apr 23, 2025
5805d35
update fv3 hash and revert change in gitmodules
jkbk2004 Apr 23, 2025
b149837
ORT Jobs Completed.
epic-cicd-jenkins Apr 23, 2025
acd6452
Update .gitmodules: clean up whitespace
jkbk2004 Apr 23, 2025
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
13 changes: 9 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ include(cmake/configure_apps.cmake)

message("")
message("FMS .............. ${FMS}")
message("FV3 .............. ${FV3}")
message("FV3_dy ........... ${FV3}")
message("AQM .............. ${AQM}")
message("GOCART ........... ${UFS_GOCART}")
message("MOM6 ............. ${MOM6}")
Expand Down Expand Up @@ -193,6 +193,11 @@ endif()

###############################################################################
### Atmosphere Components [FV3, MPAS?]
### DJS2024: There will be a generalized atmospheric component with multiple
### dycores, not multiple atmospheric components (one for each dycore).
### So, - rename the atmospheric component FV3 to UFSATM or ATM, then
### - if FV3 or MPAS, add_sudirectory(UFSATM or ATM)
###
###############################################################################
if(FV3)
add_subdirectory(FV3)
Expand Down Expand Up @@ -321,9 +326,9 @@ if(STOCH_PHYS)
endif()

if(FV3)
add_dependencies(ufs fv3atm)
list(APPEND _ufs_defs_private FRONT_FV3=fv3atm_cap_mod)
list(APPEND _ufs_libs_public fv3atm)
add_dependencies(ufs ufsatm_fv3)
list(APPEND _ufs_defs_private FRONT_FV3=${DYCORE_TARGET_CAP_MOD})
list(APPEND _ufs_libs_public ${DYCORE_TARGET})
endif()

if(MOM6)
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated from 463686 to 2f5482
2 changes: 1 addition & 1 deletion tests/ci/repo_check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ pathes[noahmp]='NOAHMP-interface/noahmp'

urls[cubed_sphere]='https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere'
branches[cubed_sphere]='dev/emc'
pathes[cubed_sphere]='FV3/atmos_cubed_sphere'
pathes[cubed_sphere]='FV3/fv3/atmos_cubed_sphere'

for submodule in $submodules; do
url=${urls[$submodule]}
Expand Down
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 @@
Mon Apr 21 04:41:46 UTC 2025
Wed Apr 23 13:39:45 UTC 2025
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_2835588/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1952387/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 = 261.664448
0: The maximum resident set size (KB) = 1459100
0: The total amount of wall time = 266.900210
0: The maximum resident set size (KB) = 1454928

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_2835588/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1952387/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 = 886.008950
0: The maximum resident set size (KB) = 1433868
0: The total amount of wall time = 905.680453
0: The maximum resident set size (KB) = 1433612

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_2835588/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1952387/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 = 240.181124
0: The maximum resident set size (KB) = 1438924
0: The total amount of wall time = 238.502576
0: The maximum resident set size (KB) = 1438040

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_2835588/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1952387/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 = 238.075144
0: The maximum resident set size (KB) = 1435216
0: The total amount of wall time = 237.522526
0: The maximum resident set size (KB) = 1433808

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_2835588/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1952387/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 = 236.771351
0: The maximum resident set size (KB) = 1425760
0: The total amount of wall time = 239.670413
0: The maximum resident set size (KB) = 1421944

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_2835588/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1952387/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 = 240.906603
0: The maximum resident set size (KB) = 1425596
0: The total amount of wall time = 246.274383
0: The maximum resident set size (KB) = 1425120

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_2835588/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1952387/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 = 243.480752
0: The maximum resident set size (KB) = 1438400
0: The total amount of wall time = 236.134539
0: The maximum resident set size (KB) = 1435616

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Apr 21 05:51:12 UTC 2025
Elapsed time: 01h:09m:26s. Have a nice day!
Wed Apr 23 14:59:42 UTC 2025
Elapsed time: 01h:19m:58s. 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 @@
Mon Apr 21 03:09:32 UTC 2025
Wed Apr 23 12:08:58 UTC 2025
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_2744982/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1317767/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 = 2367.069476
0: The maximum resident set size (KB) = 1508308
0: The total amount of wall time = 2390.779709
0: The maximum resident set size (KB) = 1505020

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_2744982/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1317767/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 = 677.548899
0: The maximum resident set size (KB) = 1505232
0: The total amount of wall time = 672.118658
0: The maximum resident set size (KB) = 1504832

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_2744982/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1317767/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 = 695.609365
0: The maximum resident set size (KB) = 1507964
0: The total amount of wall time = 752.335653
0: The maximum resident set size (KB) = 1507316

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Apr 21 04:41:46 UTC 2025
Elapsed time: 01h:32m:14s. Have a nice day!
Wed Apr 23 13:39:44 UTC 2025
Elapsed time: 01h:30m:47s. 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 @@
Mon Apr 21 00:34:26 UTC 2025
Wed Apr 23 09:35:38 UTC 2025
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_2594928/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_355745/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 = 1470.001379
0: The maximum resident set size (KB) = 769924
0: The total amount of wall time = 1436.819320
0: The maximum resident set size (KB) = 778728

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_2594928/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_355745/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 = 2293.156833
0: The maximum resident set size (KB) = 731044
0: The total amount of wall time = 2242.190082
0: The maximum resident set size (KB) = 741656

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_2594928/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_355745/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 = 2213.298532
0: The maximum resident set size (KB) = 743252
0: The total amount of wall time = 2205.744848
0: The maximum resident set size (KB) = 740460

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_2594928/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_355745/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 = 2207.186865
0: The maximum resident set size (KB) = 732088
0: The total amount of wall time = 2210.625528
0: The maximum resident set size (KB) = 746768

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Apr 21 03:09:31 UTC 2025
Elapsed time: 02h:35m:05s. Have a nice day!
Wed Apr 23 12:08:57 UTC 2025
Elapsed time: 02h:33m:19s. Have a nice day!
Loading