Skip to content

Commit

Permalink
Adding a few JEDI-related aliases into the fd_ufs.yaml file+Add opt…
Browse files Browse the repository at this point in the history 
…ion to specify fv3atm history and inline post files output directory ufs-community#2254 + Bump jinja2 from 3.1.3 to 3.1.4 in /doc/UsersGuide ufs-community#2270 (ufs-community#2215)

* UFSWM - Add several aliases in `fd_ufs.yaml` needed for JEDI-UFS. Add new model_configure option (fv3atm_output_dir) to specify directory in which all fv3atm history and inline post files will be saved.
 * FV3 -  Add new model_configure option (fv3atm_output_dir) to specify directory in which all history and inline post files will be saved.

---------

Co-authored-by: Fabio L R Diniz <[email protected]>
Co-authored-by: Dom Heinzeller <[email protected]>
Co-authored-by:  Dusan Jovic <[email protected]>
  • Loading branch information
@fabiolrdiniz @climbfuji @DusanJovic-NOAA
4 people authored May 9, 2024
1 parent 223b9ae commit 85d73f2
Show file tree
Hide file tree
Showing 15 changed files with 2,407 additions and 2,593 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 5 files
+2 −3 .github/workflows/GCC.yml
+31 −29 io/module_fv3_io_def.F90
+15 −6 io/module_wrt_grid_comp.F90
+41 −39 io/post_fv3.F90
+1 −1 upp
2 changes: 1 addition & 1 deletion doc/UsersGuide/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ importlib-metadata==7.0.1
# via
# sphinx
# sphinxcontrib-bibtex
jinja2==3.1.3
jinja2==3.1.4
# via sphinx
latexcodec==2.0.1
# via pybtex
Expand Down
48 changes: 24 additions & 24 deletions tests/logs/OpnReqTests_control_p8_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon May 6 03:31:26 UTC 2024
Wed May 8 13:41:14 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_2102271/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1887419/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 = 272.641469
0: The maximum resident set size (KB) = 1268416
0: The total amount of wall time = 268.660502
0: The maximum resident set size (KB) = 1268232

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_2102271/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1887419/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 = 939.651847
0: The maximum resident set size (KB) = 1254768
0: The total amount of wall time = 952.646761
0: The maximum resident set size (KB) = 1255292

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_2102271/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1887419/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 = 241.788160
0: The maximum resident set size (KB) = 1249176
0: The total amount of wall time = 242.733088
0: The maximum resident set size (KB) = 1245144

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_2102271/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1887419/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 = 244.812605
0: The maximum resident set size (KB) = 1246164
0: The total amount of wall time = 239.108039
0: The maximum resident set size (KB) = 1248916

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_2102271/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1887419/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.401979
0: The maximum resident set size (KB) = 1247912
0: The total amount of wall time = 242.313139
0: The maximum resident set size (KB) = 1247708

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_2102271/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1887419/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 = 245.916587
0: The maximum resident set size (KB) = 1245720
0: The total amount of wall time = 237.668319
0: The maximum resident set size (KB) = 1248200

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_2102271/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1887419/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 = 244.965128
0: The maximum resident set size (KB) = 1242856
0: The total amount of wall time = 243.736914
0: The maximum resident set size (KB) = 1248980

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon May 6 04:33:54 UTC 2024
Elapsed time: 01h:02m:28s. Have a nice day!
Wed May 8 14:43:48 UTC 2024
Elapsed time: 01h:02m:35s. Have a nice day!
169 changes: 12 additions & 157 deletions tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon May 6 21:46:21 UTC 2024
Wed May 8 22:03:04 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_2042345/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3951357/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -66,159 +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 = 1337.937513
0: The maximum resident set size (KB) = 1366960
0: The total amount of wall time = 1313.925417
0: The maximum resident set size (KB) = 1367280

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_2042345/rst_rst
Checking test rst results ....
Comparing sfcf021.tile1.nc ............MISSING file
Comparing sfcf021.tile2.nc ............MISSING file
Comparing sfcf021.tile3.nc ............MISSING file
Comparing sfcf021.tile4.nc ............MISSING file
Comparing sfcf021.tile5.nc ............MISSING file
Comparing sfcf021.tile6.nc ............MISSING file
Comparing atmf021.tile1.nc ............MISSING file
Comparing atmf021.tile2.nc ............MISSING file
Comparing atmf021.tile3.nc ............MISSING file
Comparing atmf021.tile4.nc ............MISSING file
Comparing atmf021.tile5.nc ............MISSING file
Comparing atmf021.tile6.nc ............MISSING file
Comparing sfcf024.tile1.nc ............MISSING file
Comparing sfcf024.tile2.nc ............MISSING file
Comparing sfcf024.tile3.nc ............MISSING file
Comparing sfcf024.tile4.nc ............MISSING file
Comparing sfcf024.tile5.nc ............MISSING file
Comparing sfcf024.tile6.nc ............MISSING file
Comparing atmf024.tile1.nc ............MISSING file
Comparing atmf024.tile2.nc ............MISSING file
Comparing atmf024.tile3.nc ............MISSING file
Comparing atmf024.tile4.nc ............MISSING file
Comparing atmf024.tile5.nc ............MISSING file
Comparing atmf024.tile6.nc ............MISSING file
Comparing RESTART/20210323.060000.coupler.res ............MISSING file
Comparing RESTART/20210323.060000.fv_core.res.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_core.res.tile1.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_core.res.tile2.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_core.res.tile3.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_core.res.tile4.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_core.res.tile5.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_core.res.tile6.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_tracer.res.tile1.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_tracer.res.tile2.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_tracer.res.tile3.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_tracer.res.tile4.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_tracer.res.tile5.nc ............MISSING file
Comparing RESTART/20210323.060000.fv_tracer.res.tile6.nc ............MISSING file
Comparing RESTART/20210323.060000.phy_data.tile1.nc ............MISSING file
Comparing RESTART/20210323.060000.phy_data.tile2.nc ............MISSING file
Comparing RESTART/20210323.060000.phy_data.tile3.nc ............MISSING file
Comparing RESTART/20210323.060000.phy_data.tile4.nc ............MISSING file
Comparing RESTART/20210323.060000.phy_data.tile5.nc ............MISSING file
Comparing RESTART/20210323.060000.phy_data.tile6.nc ............MISSING file
Comparing RESTART/20210323.060000.sfc_data.tile1.nc ............MISSING file
Comparing RESTART/20210323.060000.sfc_data.tile2.nc ............MISSING file
Comparing RESTART/20210323.060000.sfc_data.tile3.nc ............MISSING file
Comparing RESTART/20210323.060000.sfc_data.tile4.nc ............MISSING file
Comparing RESTART/20210323.060000.sfc_data.tile5.nc ............MISSING file
Comparing RESTART/20210323.060000.sfc_data.tile6.nc ............MISSING file
Comparing RESTART/20210323.060000.MOM.res.nc ............MISSING file
Comparing RESTART/iced.2021-03-23-21600.nc ............MISSING file
Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc ............MISSING file


Test rst FAIL


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_2042345/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf021.tile1.nc .........OK
Moving sfcf021.tile2.nc .........OK
Moving sfcf021.tile3.nc .........OK
Moving sfcf021.tile4.nc .........OK
Moving sfcf021.tile5.nc .........OK
Moving sfcf021.tile6.nc .........OK
Moving atmf021.tile1.nc .........OK
Moving atmf021.tile2.nc .........OK
Moving atmf021.tile3.nc .........OK
Moving atmf021.tile4.nc .........OK
Moving atmf021.tile5.nc .........OK
Moving atmf021.tile6.nc .........OK
Moving sfcf024.tile1.nc .........OK
Moving sfcf024.tile2.nc .........OK
Moving sfcf024.tile3.nc .........OK
Moving sfcf024.tile4.nc .........OK
Moving sfcf024.tile5.nc .........OK
Moving sfcf024.tile6.nc .........OK
Moving atmf024.tile1.nc .........OK
Moving atmf024.tile2.nc .........OK
Moving atmf024.tile3.nc .........OK
Moving atmf024.tile4.nc .........OK
Moving atmf024.tile5.nc .........OK
Moving atmf024.tile6.nc .........OK
Moving RESTART/20210323.060000.coupler.res .........OK
Moving RESTART/20210323.060000.fv_core.res.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile1.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile2.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile3.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile4.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile5.nc .........OK
Moving RESTART/20210323.060000.fv_core.res.tile6.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc .........OK
Moving RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile1.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile2.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile3.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile4.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile5.nc .........OK
Moving RESTART/20210323.060000.fv_tracer.res.tile6.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile1.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile2.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile3.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile4.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile5.nc .........OK
Moving RESTART/20210323.060000.phy_data.tile6.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile1.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile2.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile3.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile4.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
Moving RESTART/20210323.060000.MOM.res.nc .........OK
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 = 398.324973
0: The maximum resident set size (KB) = 1344212

Test std_base PASS

FAILED TESTS:
Test rst failed in check_result failed
OPERATION REQUIREMENT TEST FAILED
Tue May 7 00:38:15 UTC 2024
Elapsed time: 02h:51m:56s. Have a nice day!
Tue May 7 01:53:20 UTC 2024
Start Operation Requirement Test


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_3322035/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3951357/rst_rst
Checking test rst results ....
Comparing sfcf021.tile1.nc .....USING NCCMP......OK
Comparing sfcf021.tile2.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -280,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 = 405.576010
0: The maximum resident set size (KB) = 1340024
0: The total amount of wall time = 618.318216
0: The maximum resident set size (KB) = 1359788

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_3322035/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3951357/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -350,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 = 395.446701
0: The maximum resident set size (KB) = 1344300
0: The total amount of wall time = 541.651862
0: The maximum resident set size (KB) = 1359804

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue May 7 02:25:02 UTC 2024
Elapsed time: 00h:31m:43s. Have a nice day!
Wed May 8 23:07:07 UTC 2024
Elapsed time: 01h:04m:04s. Have a nice day!
Loading

0 comments on commit 85d73f2

Please sign in to comment.