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

Enable cpl_scalars export from ATM and NoahMP for use by CMEPS #2175

Merged
merged 40 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
aaa66d0
use cpl_scalars instead of tilesize
DeniseWorthen Mar 3, 2024
e6a9d84
baseline test on gaea
DeniseWorthen Mar 4, 2024
36a9a72
Merge branch 'ufs-community:develop' into feature/cplscalars
DeniseWorthen Mar 5, 2024
83e6a83
fix ufs config for mom6 hafs case
DeniseWorthen Mar 5, 2024
889fe10
point to feature branches
DeniseWorthen Mar 5, 2024
1d2898f
b4b except for cpl.hi files for 3 hafs tests
DeniseWorthen Mar 5, 2024
ecb3c03
b4b tests for fv3,cmeps
DeniseWorthen Mar 6, 2024
2103b02
update submodules
DeniseWorthen Mar 13, 2024
63a7278
Merge branch 'develop' into feature/cplscalars
DeniseWorthen Mar 13, 2024
44a6886
add test_changes.list
DeniseWorthen Mar 13, 2024
314e00d
update submodules
DeniseWorthen Mar 19, 2024
fccbb6a
Merge branch 'develop' into feature/cplscalars
DeniseWorthen Mar 19, 2024
d0c07c6
update FV3 and NoahMP
DeniseWorthen Mar 20, 2024
2426fa2
Merge branch 'develop' into feature/cplscalars
DeniseWorthen Mar 20, 2024
cf9d7d9
Merge branch 'ufs-community:develop' into feature/cplscalars
DeniseWorthen Mar 24, 2024
b8274f9
update FV3, CMEPS
DeniseWorthen Mar 29, 2024
6de9f57
Merge branch 'develop' into feature/cplscalars
DeniseWorthen Mar 29, 2024
af23828
switch CMEPS feature branch
DeniseWorthen Mar 29, 2024
1f88eac
Merge branch 'ufs-community:develop' into feature/cplscalars
DeniseWorthen Mar 29, 2024
50f1492
commit list of changed tests
DeniseWorthen Mar 30, 2024
0ff6ccc
rename fv3 branch
DeniseWorthen Mar 30, 2024
7059cc1
rename noahmp branch
DeniseWorthen Mar 30, 2024
1d39432
update FV3
DeniseWorthen Apr 1, 2024
e69c1b0
Merge branch 'develop' into feature/cplscalars
DeniseWorthen Apr 1, 2024
2ec8af0
Update bl_date.conf
FernandoAndrade-NOAA Apr 2, 2024
63a49c3
add jet RT logs: passed
zach1221 Apr 2, 2024
3e6b929
add gaea RT logs: passed
zach1221 Apr 2, 2024
e6937e4
add orion RT logs: passed
zach1221 Apr 2, 2024
7fb4bf1
add hercules RT logs: passed
zach1221 Apr 2, 2024
9562918
WCOSS2 RT Log
BrianCurtis-NOAA Apr 2, 2024
4cab3a5
Acorn (welcome back) RT Log: Passed!
BrianCurtis-NOAA Apr 2, 2024
12f9331
Update aux.yml
jkbk2004 Apr 2, 2024
8db4e9a
Update aux.yml
jkbk2004 Apr 2, 2024
15017dc
add hera RT log + time increase
FernandoAndrade-NOAA Apr 3, 2024
13effa0
add control_p8_gnu ORT logs: passed
zach1221 Apr 3, 2024
7dca222
add regional_control_gnu ORT logs: passed
zach1221 Apr 3, 2024
d6e537e
add cpld_control_gnu ORT logs: passed
zach1221 Apr 3, 2024
94c58f9
update CMEPS and revert gitmodules
DeniseWorthen Apr 3, 2024
990da82
update NoahMP and revert gitmodule
DeniseWorthen Apr 3, 2024
01d3dac
Update FV3 and revert gitmodules
DeniseWorthen Apr 3, 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
8 changes: 5 additions & 3 deletions .github/workflows/aux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,18 @@ jobs:
steps:
- name: Check up-to-dateness and post comment
run: |
head_sha=${{ github.event.workflow_run.head_sha }}
git clone -q ${{ github.event.workflow_run.head_repository.html_url }} .
head_sha=${{ github.event.pull_request.head.sha }}
head_brc=${{ github.event.pull_request.head.ref }}
head_url=${{ github.event.pull_request.head.repo.html_url }}
git clone -q -b $head_brc $head_url .
git checkout -q $head_sha
git submodule -q update --init --recursive
cd ${{ github.workspace }}/tests/ci
url=$GITHUB_API_URL/repos/$GITHUB_REPOSITORY
pr_number=$(curl -sS -H $app $url/pulls \
| jq -r '.[] | select(.head.sha == "'"$head_sha"'") | .number')
echo "pr_number is $pr_number"
pr_uid=${{ github.event.workflow_run.head_repository.owner.login }}
pr_uid=${{ github.event.pull_request.head.repo.owner.login }}
echo "pr_uid is $pr_uid"
comment="$(./repo_check.sh $pr_uid 2>/dev/null)"
echo "comment is $comment"
Expand Down
2 changes: 1 addition & 1 deletion FV3
7 changes: 4 additions & 3 deletions NOAHMP-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ list(APPEND _noahmp_cap_files noahmp/drivers/nuopc/lnd_comp_kind.F90
noahmp/drivers/nuopc/lnd_comp_domain.F90
noahmp/drivers/nuopc/lnd_comp_import_export.F90
noahmp/drivers/nuopc/lnd_comp_nuopc.F90
noahmp/drivers/nuopc/lnd_comp_driver.F90)
noahmp/drivers/nuopc/lnd_comp_driver.F90
noahmp/drivers/nuopc/lnd_comp_cplscalars.F90)

# CCPP interface
# CCPP interface
list(APPEND _noahmp_ccpp_files noahmp/drivers/ccpp/noahmpdrv.F90
noahmp/drivers/ccpp/sfc_diff.f
noahmp/drivers/ccpp/machine.F
Expand All @@ -25,7 +26,7 @@ list(APPEND _noahmp_files noahmp/src/module_sf_noahmplsm.F90
noahmp/src/module_sf_noahmp_glacier.F90)

#------------------------------------------------------------------------------
# Set CCPP flags for C/C++/Fortran preprocessor
# Set CCPP flags for C/C++/Fortran preprocessor
add_definitions(-DCCPP)

#------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion tests/bl_date.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20240315
export BL_DATE=20240401
1 change: 0 additions & 1 deletion tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,6 @@ export_ww3

# Set CMEPS component defauls
export_cmeps
export ATMTILESIZE=`expr $NPX - 1`

# FV3 defaults
export FRAC_GRID=.true.
Expand Down
48 changes: 24 additions & 24 deletions tests/logs/OpnReqTests_control_p8_hera.log
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon Apr 1 12:58:41 UTC 2024
Wed Apr 3 13:03:42 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_3809779/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1734208/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 = 268.251032
0: The maximum resident set size (KB) = 1265156
0: The total amount of wall time = 270.499708
0: The maximum resident set size (KB) = 1267976

Test bit_base 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_3809779/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1734208/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 = 965.834768
0: The maximum resident set size (KB) = 1256504
0: The total amount of wall time = 949.421879
0: The maximum resident set size (KB) = 1254204

Test dbg_base 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_3809779/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1734208/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 = 246.586805
0: The maximum resident set size (KB) = 1233548
0: The total amount of wall time = 238.203503
0: The maximum resident set size (KB) = 1247000

Test dcp 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_3809779/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1734208/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 = 235.970450
0: The maximum resident set size (KB) = 1247740
0: The total amount of wall time = 238.209192
0: The maximum resident set size (KB) = 1246248

Test mpi 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_3809779/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1734208/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 = 242.245564
0: The maximum resident set size (KB) = 1242900
0: The total amount of wall time = 239.223169
0: The maximum resident set size (KB) = 1247272

Test rst 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_3809779/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1734208/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 = 237.390294
0: The maximum resident set size (KB) = 1248812
0: The total amount of wall time = 242.202633
0: The maximum resident set size (KB) = 1247172

Test std_base 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_3809779/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1734208/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 = 242.382720
0: The maximum resident set size (KB) = 1242900
0: The total amount of wall time = 242.018158
0: The maximum resident set size (KB) = 1247888

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Apr 1 14:07:52 UTC 2024
Elapsed time: 01h:09m:14s. Have a nice day!
Wed Apr 3 14:13:02 UTC 2024
Elapsed time: 01h:09m:20s. Have a nice day!
22 changes: 11 additions & 11 deletions tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon Apr 1 18:08:14 UTC 2024
Wed Apr 3 18:01:51 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_4186917/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1612891/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 = 1299.447405
0: The maximum resident set size (KB) = 1367532
0: The total amount of wall time = 1309.881667
0: The maximum resident set size (KB) = 1366736

Test dbg_base 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_4186917/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1612891/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 = 604.635134
0: The maximum resident set size (KB) = 1359688
0: The total amount of wall time = 385.164336
0: The maximum resident set size (KB) = 1359652

Test rst 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_4186917/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1612891/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 = 385.824022
0: The maximum resident set size (KB) = 1360152
0: The total amount of wall time = 386.874326
0: The maximum resident set size (KB) = 1362372

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Apr 1 19:12:24 UTC 2024
Wed Apr 3 19:06:01 UTC 2024
Elapsed time: 01h:04m:10s. Have a nice day!
24 changes: 12 additions & 12 deletions tests/logs/OpnReqTests_regional_control_hera.log
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon Apr 1 16:00:46 UTC 2024
Wed Apr 3 15:46:00 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_3322710/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1137011/dcp_dcp
Checking test dcp results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
Expand All @@ -14,14 +14,14 @@ Checking test dcp results ....
Comparing NATLEV.GrbF00 .....USING CMP......OK
Comparing NATLEV.GrbF06 .....USING CMP......OK

0: The total amount of wall time = 2150.095224
0: The maximum resident set size (KB) = 553404
0: The total amount of wall time = 2148.497446
0: The maximum resident set size (KB) = 557116

Test dcp 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_3322710/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1137011/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving dynf000.nc .........OK
Expand All @@ -33,14 +33,14 @@ Moving baseline std_base files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

0: The total amount of wall time = 2151.572064
0: The maximum resident set size (KB) = 563124
0: The total amount of wall time = 2165.195419
0: The maximum resident set size (KB) = 563120

Test std_base 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_3322710/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1137011/thr_thr
Checking test thr results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
Expand All @@ -51,11 +51,11 @@ Checking test thr results ....
Comparing NATLEV.GrbF00 .....USING CMP......OK
Comparing NATLEV.GrbF06 .....USING CMP......OK

0: The total amount of wall time = 2129.213652
0: The maximum resident set size (KB) = 560932
0: The total amount of wall time = 2186.776168
0: The maximum resident set size (KB) = 554324

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Apr 1 17:59:32 UTC 2024
Elapsed time: 01h:58m:47s. Have a nice day!
Wed Apr 3 17:45:29 UTC 2024
Elapsed time: 01h:59m:30s. Have a nice day!
Loading