Add a cdeps test and update mom6, fv3, and weekly tests (#1136)

Co-authored-by: jiandewang <jiande.wang@noaa.gov> Co-authored-by: WenMeng-NOAA <48260754+WenMeng-NOAA@users.noreply.github.com> Co-authored-by: DusanJovic-NOAA <dusan.jovic@noaa.gov>
ufs-community · Mar 24, 2022 · a46c7ed · a46c7ed
1 parent 1bd68ca
commit a46c7ed
Show file tree

Hide file tree

Showing 16 changed files with 4,005 additions and 3,885 deletions.
diff --git a/CDEPS-interface/CMakeLists.txt b/CDEPS-interface/CMakeLists.txt
@@ -1,6 +1,9 @@
 # CDEPS compiler flags
 if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
   set(CMAKE_Fortran_FLAGS "-g -fbacktrace -ffree-line-length-none")
+  if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz")
+  endif()
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
   set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
@@ -69,7 +72,7 @@ add_dependencies(docn share streams dshr)
 set_target_properties(docn PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
 target_include_directories(docn PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
 target_link_libraries(docn PRIVATE dshr share streams)
-target_link_libraries(docn PRIVATE esmf)
+target_link_libraries(docn PRIVATE esmf PIO::PIO_Fortran)
 
 # CDEPS/drof
 add_library(drof OBJECT ${cdeps_drof_files})

diff --git a/FV3 b/FV3
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/rt.sh b/tests/rt.sh
@@ -485,7 +485,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20220321
+BL_DATE=20220322
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -67,3 +67,10 @@ RUN     | cpld_control_c96_noaero_p8
 
 COMPILE | -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                               |                | fv3         |
 RUN     | cpld_debug_noaero_p8                                                                                                    |                | fv3         |
+
+##################################################################################################################################################################
+# CDEPS Data Atmosphere test                                                                                                                                     #
+##################################################################################################################################################################
+
+COMPILE | -DAPP=NG-GODAS                                                                                                          |                | fv3         |
+RUN     | datm_cdeps_control_cfsr                                                                                                 |                | fv3         |
diff --git a/tests/rt_weekly.conf b/tests/rt_weekly.conf
@@ -2,17 +2,22 @@
 # Weekly tests                                                                                                                                                                      #
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_nsstNoahmpUGWPv1 -D32BIT=ON                                     |                             | fv3 |
-RUN     | control_c768                                                                                                    | - wcoss_cray                | fv3 |
+COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_nsstNoahmpUGWPv1 -D32BIT=ON                                     | + hera.intel                | fv3 |
+RUN     | control_c768                                                                                                    | + hera.intel                | fv3 |
 
 # CPLD Benchmark 35d tests
 # The length of forecast is 5 days for the weekly tests.
 COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                                 | + hera.intel                | fv3 |  |
-RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2012010100
-RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2012040100
-RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2012070100
-RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2012100100
-RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2013010100
-RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2013040100
-RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2013070100
-RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2013100100
+RUN     | cpld_bmark_p8_35d                                                                                               | + hera.intel                | fv3 |  | 2012010100
+RUN     | cpld_bmark_p8_35d                                                                                               | + hera.intel                | fv3 |  | 2012040100
+RUN     | cpld_bmark_p8_35d                                                                                               | + hera.intel                | fv3 |  | 2012070100
+RUN     | cpld_bmark_p8_35d                                                                                               | + hera.intel                | fv3 |  | 2012100100
+RUN     | cpld_bmark_p8_35d                                                                                               | + hera.intel                | fv3 |  | 2013010100
+RUN     | cpld_bmark_p8_35d                                                                                               | + hera.intel                | fv3 |  | 2013040100
+RUN     | cpld_bmark_p8_35d                                                                                               | + hera.intel                | fv3 |  | 2013070100
+RUN     | cpld_bmark_p8_35d                                                                                               | + hera.intel                | fv3 |  | 2013100100
+# The coupled p8 tests
+COMPILE | -DAPP=S2SW -DUFS_GOCART=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                 | + jet.intel                 | fv3 |
+RUN     | cpld_bmark_p8                                                                                                   | + jet.intel                 | fv3 |
+RUN     | cpld_control_c192_p8                                                                                            | + jet.intel                 | fv3 |
+RUN     | cpld_control_c384_p8                                                                                            | + jet.intel                 | fv3 |
diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
@@ -56,6 +56,7 @@ export LIST_FILES="sfcf036.tile1.nc \
 
 export_fv3
 export_cpl
+export WLCLK=48
 
 export DAYS=1.5
 export FHMAX=36