Merge branch 'develop' into feature/pice

DeniseWorthen · May 16, 2024 · 839be5e · 839be5e
2 parents c1f7dd8 + 1c6b4d4
commit 839be5e
Show file tree

Hide file tree

Showing 30 changed files with 3,056 additions and 2,416 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,6 +73,7 @@ set(JEDI_DRIVER     OFF CACHE BOOL "Enable JEDI as top level driver")
 set(CMEPS_AOFLUX    OFF CACHE BOOL "Enable atmosphere-ocean flux calculation in mediator")
 set(PDLIB           OFF CACHE BOOL "Enable Domain Decomposition in WW3 via PDLIB")
 set(CDEPS_INLINE    OFF CACHE BOOL "Enable CDEPS inline capability")
+set(HYDRO           OFF CACHE BOOL "Enable hydrostatic set")
 
 set(CMAKE_Platform $ENV{CMAKE_Platform})
 if(CMAKE_Platform)
@@ -122,6 +123,7 @@ message("PARALLEL_NETCDF .. ${PARALLEL_NETCDF}")
 message("JEDI_DRIVER ...... ${JEDI_DRIVER}")
 message("CMEPS_AOFLUX ..... ${CMEPS_AOFLUX}")
 message("CDEPS_INLINE ..... ${CDEPS_INLINE}")
+message("HYDRO  ........... ${HYDRO}")
 
 message("")
 

diff --git a/FV3 b/FV3
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/NOAHMP-interface/CMakeLists.txt b/NOAHMP-interface/CMakeLists.txt
@@ -56,8 +56,10 @@ endif()
 
 #------------------------------------------------------------------------------
 # Add model-specific flags for C/C++/Fortran preprocessor
-add_definitions(-DMOIST_CAPPA -DUSE_COND -DNEMS_GSM)
-add_definitions(-DINTERNAL_FILE_NML)
+if (NOT HYDRO)
+add_definitions(-DMOIST_CAPPA -DUSE_COND)
+endif()
+add_definitions(-DINTERNAL_FILE_NML -DNEMS_GSM)
 
 #------------------------------------------------------------------------------
 # NOAHMP

diff --git a/doc/UsersGuide/requirements.txt b/doc/UsersGuide/requirements.txt
@@ -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

diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20240430
+export BL_DATE=20240503
diff --git a/tests/ci/Jenkinsfile.combined b/tests/ci/Jenkinsfile.combined
@@ -69,6 +69,10 @@ def generateStage(nodeLabel) {
                             cd $WORKSPACE/tests/
                           elif [[ $machine =~ "Orion" ]]
                           then
+                            cd ..
+                            module load git/2.28.0
+                            git submodule update --init --recursive
+                            cd tests
                             echo "Creating baselines on $machine"
                             export dprefix=/work2/noaa/$ACCNR/$USER
                             sed -i 's|/work/noaa/stmp/${USER}|/work/noaa/epic/stmp/role-epic/|g' rt.sh
@@ -214,6 +218,10 @@ def generateStage(nodeLabel) {
                           elif [[ $machine =~ "Orion" ]]
                           then
                            echo "Running regression tests on $machine"
+                            cd ..
+                            module load git/2.28.0
+                            git submodule update --init --recursive
+                            cd tests
                             export dprefix=/work2/noaa/$ACCNR/$USER
                             sed "s|/noaa/stmp/|/noaa/$ACCNR/stmp/|g" -i rt.sh
                             ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -556,6 +556,14 @@ export EXTERNAL_IC=.true.
 export MAKE_NH=.true.
 export MOUNTAIN=.false.
 export NA_INIT=1
+export DO_VORT_DAMP=.true.
+export HYDROSTATIC=.false.
+export KORD_XX=9
+export KORD_TM=-9
+export D_CON=1.
+export HORD_XX=5
+export HORD_DP=-5
+export HORD_TR=8
 
 # Radiation
 export DO_RRTMGP=.false.

diff --git a/tests/logs/OpnReqTests_control_p8_hera.log b/tests/logs/OpnReqTests_control_p8_hera.log
@@ -1,9 +1,9 @@
-Wed May  1 16:47:10 UTC 2024
+Mon May 13 18:14:19 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_1433614/bit_base_bit_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/bit_base_bit_base
 Checking test bit_base results ....
 Moving baseline bit_base files ....
  Moving sfcf000.nc .........OK
@@ -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                        = 273.804433
-  0: The maximum resident set size (KB)                   = 1253420
+  0: The total amount of wall time                        = 270.538118
+  0: The maximum resident set size (KB)                   = 1254096
 
 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_1433614/dbg_base_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/dbg_base_dbg_base
 Checking test dbg_base results ....
 Moving baseline dbg_base files ....
  Moving sfcf000.nc .........OK
@@ -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                        = 960.167656
-  0: The maximum resident set size (KB)                   = 1231384
+  0: The total amount of wall time                        = 975.476688
+  0: The maximum resident set size (KB)                   = 1230856
 
 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_1433614/dcp_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/dcp_dcp
 Checking test dcp results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -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                        = 247.343877
-  0: The maximum resident set size (KB)                   = 1232416
+  0: The total amount of wall time                        = 237.920448
+  0: The maximum resident set size (KB)                   = 1231760
 
 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_1433614/mpi_mpi
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/mpi_mpi
 Checking test mpi results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -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                        = 245.896195
-  0: The maximum resident set size (KB)                   = 1231104
+  0: The total amount of wall time                        = 238.597717
+  0: The maximum resident set size (KB)                   = 1233284
 
 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_1433614/rst_rst
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/rst_rst
 Checking test rst results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -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                        = 251.053244
-  0: The maximum resident set size (KB)                   = 1228068
+  0: The total amount of wall time                        = 237.803525
+  0: The maximum resident set size (KB)                   = 1234508
 
 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_1433614/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving sfcf000.nc .........OK
@@ -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                        = 253.154960
-  0: The maximum resident set size (KB)                   = 1233000
+  0: The total amount of wall time                        = 241.082583
+  0: The maximum resident set size (KB)                   = 1232320
 
 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_1433614/thr_thr
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/thr_thr
 Checking test thr results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -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.649383
-  0: The maximum resident set size (KB)                   = 1233424
+  0: The total amount of wall time                        = 246.042458
+  0: The maximum resident set size (KB)                   = 1232080
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Wed May  1 17:54:31 UTC 2024
-Elapsed time: 01h:07m:25s. Have a nice day!
+Mon May 13 19:16:46 UTC 2024
+Elapsed time: 01h:02m:28s. Have a nice day!
diff --git a/tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log b/tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
@@ -1,9 +1,9 @@
-Wed May  1 15:19:59 UTC 2024
+Tue May 14 03:58:00 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_2945403/dbg_base_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2934958/dbg_base_dbg_base
 Checking test dbg_base results ....
 Moving baseline dbg_base files ....
  Moving sfcf021.tile1.nc .........OK
@@ -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                        = 1448.267808
-  0: The maximum resident set size (KB)                   = 1364020
+  0: The total amount of wall time                        = 1357.491643
+  0: The maximum resident set size (KB)                   = 1368672
 
 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_2945403/rst_rst
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2934958/rst_rst
 Checking test rst results ....
  Comparing sfcf021.tile1.nc .....USING NCCMP......OK
  Comparing sfcf021.tile2.nc .....USING NCCMP......OK
@@ -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                        = 444.246604
-  0: The maximum resident set size (KB)                   = 1359328
+  0: The total amount of wall time                        = 388.602017
+  0: The maximum resident set size (KB)                   = 1356348
 
 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_2945403/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2934958/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving sfcf021.tile1.nc .........OK
@@ -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                        = 448.797587
-  0: The maximum resident set size (KB)                   = 1359444
+  0: The total amount of wall time                        = 392.294030
+  0: The maximum resident set size (KB)                   = 1358828
 
 Test std_base PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Wed May  1 16:30:01 UTC 2024
-Elapsed time: 01h:10m:03s. Have a nice day!
+Tue May 14 04:56:24 UTC 2024
+Elapsed time: 00h:58m:24s. Have a nice day!
+2 −3		.github/workflows/GCC.yml
+8 −1		CMakeLists.txt
+1 −1		atmos_cubed_sphere
+4 −2		ccpp/CMakeLists.txt
+31 −29		io/module_fv3_io_def.F90
+15 −6		io/module_wrt_grid_comp.F90
+78 −55		io/post_fv3.F90
+1 −1		upp