Skip to content

Bug fix to explicit in-canopy vertical diffusion of tracers #3186

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 21 commits into from
Apr 23, 2026
Merged

Bug fix to explicit in-canopy vertical diffusion of tracers #3186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
99ac4f6
Update UFSATM submodule to fix_canopy_vdf
iri01 Apr 8, 2026
681bad8
Reverting GOCART hash to upstream develop.
drnimbusrain Apr 8, 2026
c012475
Update UFSATM branch fix_canopy_vdf
iri01 Apr 10, 2026
478e269
Merge branch 'ufs-community:develop' into fix_canopy_vdf
drnimbusrain Apr 10, 2026
f6ae8c5
RT logs for fix_canopy_vdf
iri01 Apr 10, 2026
4197735
Merge branch 'develop' into fix_canopy_vdf
iri01 Apr 16, 2026
a8774e6
Update UFSATM submodule to canopy
iri01 Apr 16, 2026
48d3539
Update UFSATM submodule to branch fix_canopy_vdf
iri01 Apr 17, 2026
e80b3d7
Merge branch 'develop' into fix_canopy_vdf
iri01 Apr 17, 2026
4990e84
update bl date
gspetro-NOAA Apr 18, 2026
38550d4
orion rt log - passed
gspetro-NOAA Apr 20, 2026
ac6e107
hercules rt log - passed
gspetro-NOAA Apr 20, 2026
21c7ca7
ursa rt log - passed
gspetro-NOAA Apr 20, 2026
d951721
derecho rt log - passed
gspetro-NOAA Apr 20, 2026
e749123
gaea c6 log - passed
gspetro-NOAA Apr 20, 2026
c3015e0
WCOSS2 RT Log: passed
BrianCurtis-NOAA Apr 21, 2026
ce56829
ursa control_p8 ORT
gspetro-NOAA Apr 21, 2026
c97facc
Merge branch 'fix_canopy_vdf' of https://github.com/noaa-oar-arl/ufs-…
gspetro-NOAA Apr 21, 2026
f501dd5
regional_control ORT
gspetro-NOAA Apr 21, 2026
b483568
Merge branch 'fix_canopy_vdf' of https://github.com/noaa-oar-arl/ufs-…
gspetro-NOAA Apr 21, 2026
9896006
Reverting .gitmodules and UFSATM.
drnimbusrain Apr 22, 2026
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 1 files
+1 −1 ccpp/physics
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20260408
export BL_DATE=20260417
62 changes: 31 additions & 31 deletions tests/logs/OpnReqTests_control_p8_ursa.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Apr 17 02:54:40 UTC 2026
Tue Apr 21 12:35:39 UTC 2026
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_629504/bit_base_bit_base
baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
working dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3005930/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 = 145.023443
0: The maximum resident set size (KB) = 2618888
0: The total amount of wall time = 649.751382
0: The maximum resident set size (KB) = 2618076

Test bit_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_629504/dbg_base_dbg_base
baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
working dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3005930/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 = 1277.908137
0: The maximum resident set size (KB) = 2543880
0: The total amount of wall time = 1317.416775
0: The maximum resident set size (KB) = 2504188

Test dbg_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_629504/dcp_dcp
baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3005930/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 = 144.276475
0: The maximum resident set size (KB) = 2522296
0: The total amount of wall time = 117.446488
0: The maximum resident set size (KB) = 2521912

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_629504/mpi_mpi
baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3005930/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 = 128.930990
0: The maximum resident set size (KB) = 2507224
0: The total amount of wall time = 676.921160
Comment thread
gspetro-NOAA marked this conversation as resolved.
0: The maximum resident set size (KB) = 2527408

Test mpi PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_629504/rst_rst
baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3005930/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 = 125.920831
0: The maximum resident set size (KB) = 2504944
0: The total amount of wall time = 118.593250
0: The maximum resident set size (KB) = 2511000

Test rst PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_629504/std_base_std_base
baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3005930/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 = 117.974399
0: The maximum resident set size (KB) = 2520084
0: The total amount of wall time = 662.151742
0: The maximum resident set size (KB) = 2511452

Test std_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_629504/thr_thr
baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3005930/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 = 123.176998
0: The maximum resident set size (KB) = 2508476
0: The total amount of wall time = 518.140909
0: The maximum resident set size (KB) = 2521228

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Apr 17 04:04:04 UTC 2026
Elapsed time: 01h:09m:25s. Have a nice day!
Tue Apr 21 14:16:59 UTC 2026
Elapsed time: 01h:41m:20s. Have a nice day!
38 changes: 19 additions & 19 deletions tests/logs/OpnReqTests_regional_control_ursa.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Apr 17 02:54:40 UTC 2026
Tue Apr 21 12:36:36 UTC 2026
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_629505/bit_base_bit_base
baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_intel
working dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3014635/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 = 300.769311
0: The maximum resident set size (KB) = 2077764
0: The total amount of wall time = 303.434152
0: The maximum resident set size (KB) = 2072304

Test bit_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_629505/dcp_dcp
baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3014635/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 = 205.199083
0: The maximum resident set size (KB) = 1723940
0: The total amount of wall time = 203.765230
0: The maximum resident set size (KB) = 1712744

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_629505/std_base_std_base
baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3014635/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 = 205.248695
0: The maximum resident set size (KB) = 1724424
0: The total amount of wall time = 211.916375
0: The maximum resident set size (KB) = 1725800

Test std_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_629505/thr_thr
baseline dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-stmp/Gillian.Petro/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/Gillian.Petro/ORT-ptmp/Gillian.Petro/FV3_OPNREQ_TEST/opnReqTest_3014635/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 = 204.114756
0: The maximum resident set size (KB) = 1710888
0: The total amount of wall time = 202.261375
0: The maximum resident set size (KB) = 1708456

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Apr 17 03:34:10 UTC 2026
Elapsed time: 00h:39m:31s. Have a nice day!
Tue Apr 21 13:14:03 UTC 2026
Elapsed time: 00h:37m:28s. Have a nice day!
Loading
Loading