Skip to content

diag_table clean up ; Disable concurrent builds with the same PR label (was #3006); fix time-averaged radiation (was #2996) #3004

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
gspetro-NOAA merged 19 commits into from
Dec 10, 2025
Merged

diag_table clean up ; Disable concurrent builds with the same PR label (was #3006); fix time-averaged radiation (was #2996) #3004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
25d46ad
non-baseline changing diag_table cleanup
DeniseWorthen Dec 3, 2025
49e2db0
if files have parsable variables, make them .IN files
DeniseWorthen Dec 3, 2025
944362b
parse the .IN as default
DeniseWorthen Dec 3, 2025
4d651cf
add ursa log
DeniseWorthen Dec 3, 2025
d971ecc
add test_changes list
DeniseWorthen Dec 3, 2025
cd8df74
Merge branch 'develop' into feature/diagtable_cleanup
DeniseWorthen Dec 4, 2025
4fb9dec
add CI fix for concurrent builds
DeniseWorthen Dec 8, 2025
a1d42e1
point to ATM
DeniseWorthen Dec 9, 2025
3ce3c78
Merge branch 'develop' into feature/diagtable_cleanup
DeniseWorthen Dec 9, 2025
75120c9
add log for ursa; test_changes.list remains empty
DeniseWorthen Dec 9, 2025
b9f6292
hercules rt log - passed
gspetro-NOAA Dec 9, 2025
ef975d2
Acorn RT Log: Passed
BrianCurtis-NOAA Dec 9, 2025
2631a53
WCOSS2 RT Log: passed
BrianCurtis-NOAA Dec 9, 2025
072a6cf
orion rt log - passed
gspetro-NOAA Dec 9, 2025
98ed026
ORT Jobs Completed.
epic-cicd-jenkins Dec 9, 2025
33f09d0
add hera RT log passed
FernandoAndrade-NOAA Dec 10, 2025
9c17a95
add gaeaC6 RT log passed
FernandoAndrade-NOAA Dec 10, 2025
62a3d1d
add ursa RT log passed
FernandoAndrade-NOAA Dec 10, 2025
31982e7
update ATM and revert gitmodules
DeniseWorthen Dec 10, 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
2 changes: 1 addition & 1 deletion UFSATM
Open in desktop
Submodule UFSATM updated 2 files
+3 −1 fv3/atmos_model.F90
+10 −10 io/fv3atm_history_io.F90
3 changes: 3 additions & 0 deletions tests/ci/Jenkinsfile.ort
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
pipeline {
agent none
options {
disableConcurrentBuilds()
}
stages {
stage('Run ORTs') {
agent {
Expand Down
5 changes: 3 additions & 2 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ export_fv3
export USE_MERRA2=.false.
export WRITE_NSFLIP=.false.

export DIAG_TABLE=diag_table_gfsv16
export DIAG_TABLE=diag_table_gfsv16.IN
export FIELD_TABLE=field_table_gfsv16
export FV3_RUN=control_run.IN
export INPUT_NML=control.nml.IN
Expand Down Expand Up @@ -1968,6 +1968,7 @@ export_datm_cdeps ()
export SMONTH=10
export SDAY=01
export SHOUR=00
export CHOUR=00
export FHMAX=24
export DT_ATMOS=900
export FHROT=0
Expand Down Expand Up @@ -2017,7 +2018,7 @@ export_datm_cdeps ()

# datm defaults
export INPUT_NML=input.mom6.nml.IN
export DIAG_TABLE=diag_table_template
export DIAG_TABLE=diag_table_cpld.IN
export DATM_SRC=CFSR
export FILEBASE_DATM=cfsr
export MESH_ATM=mesh.datm.1760x880.nc
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 @@
Thu Dec 4 22:11:09 UTC 2025
Tue Dec 9 20:50:21 UTC 2025
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4184803/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2094011/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 = 254.475986
0: The maximum resident set size (KB) = 1532416
0: The total amount of wall time = 256.746573
0: The maximum resident set size (KB) = 1553320

Test bit_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4184803/dbg_base_dbg_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2094011/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 = 874.177735
0: The maximum resident set size (KB) = 1527972
0: The total amount of wall time = 883.998240
0: The maximum resident set size (KB) = 1529536

Test dbg_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4184803/dcp_dcp
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2094011/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 = 232.051773
0: The maximum resident set size (KB) = 1527828
0: The total amount of wall time = 234.587542
0: The maximum resident set size (KB) = 1511816

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4184803/mpi_mpi
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2094011/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 = 230.377104
0: The maximum resident set size (KB) = 1533748
0: The total amount of wall time = 231.297307
0: The maximum resident set size (KB) = 1523920

Test mpi PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4184803/rst_rst
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2094011/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 = 229.309643
0: The maximum resident set size (KB) = 1522600
0: The total amount of wall time = 229.601282
0: The maximum resident set size (KB) = 1522332

Test rst PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4184803/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2094011/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 = 230.860865
0: The maximum resident set size (KB) = 1499132
0: The total amount of wall time = 230.782627
0: The maximum resident set size (KB) = 1523964

Test std_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4184803/thr_thr
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2094011/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 = 232.808908
0: The maximum resident set size (KB) = 1522508
0: The total amount of wall time = 232.546040
0: The maximum resident set size (KB) = 1524000

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu Dec 4 23:17:28 UTC 2025
Elapsed time: 01h:06m:19s. Have a nice day!
Tue Dec 9 22:00:28 UTC 2025
Elapsed time: 01h:10m:08s. 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 @@
Thu Dec 4 20:42:51 UTC 2025
Tue Dec 9 19:11:21 UTC 2025
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3635548/dbg_base_dbg_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1648499/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 = 2345.585180
0: The maximum resident set size (KB) = 1639812
0: The total amount of wall time = 2297.514651
0: The maximum resident set size (KB) = 1643212

Test dbg_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3635548/rst_rst
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1648499/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 = 579.203190
0: The maximum resident set size (KB) = 1636696
0: The total amount of wall time = 593.198980
0: The maximum resident set size (KB) = 1635728

Test rst PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3635548/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1648499/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 = 590.306844
0: The maximum resident set size (KB) = 1633844
0: The total amount of wall time = 586.378138
0: The maximum resident set size (KB) = 1625260

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu Dec 4 22:11:09 UTC 2025
Elapsed time: 01h:28m:18s. Have a nice day!
Tue Dec 9 20:50:20 UTC 2025
Elapsed time: 01h:39m:00s. 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 @@
Thu Dec 4 19:49:16 UTC 2025
Tue Dec 9 18:16:55 UTC 2025
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3471151/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1536564/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 = 614.943262
0: The maximum resident set size (KB) = 881004
0: The total amount of wall time = 617.561148
0: The maximum resident set size (KB) = 899520

Test bit_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3471151/dcp_dcp
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1536564/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 = 511.238259
0: The maximum resident set size (KB) = 863788
0: The total amount of wall time = 494.731562
0: The maximum resident set size (KB) = 854572

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3471151/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1536564/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 = 502.099435
0: The maximum resident set size (KB) = 864864
0: The total amount of wall time = 501.140853
0: The maximum resident set size (KB) = 853688

Test std_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3471151/thr_thr
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1536564/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 = 497.216111
0: The maximum resident set size (KB) = 837772
0: The total amount of wall time = 503.806547
0: The maximum resident set size (KB) = 862260

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu Dec 4 20:42:51 UTC 2025
Elapsed time: 00h:53m:35s. Have a nice day!
Tue Dec 9 19:11:20 UTC 2025
Elapsed time: 00h:54m:25s. Have a nice day!
Loading