Rectify total number of Thompson MP species and add UFS-Aerosols to S…

…2S and S2SW (ufs-community#1118) * Rectify total number of Thompson MP species * Implement S2SWA/S2SA build app as the only one enabling prognostic aerosols in fully coupled model. * Update output_fh documentation.
mark-a-potts · Mar 22, 2022 · 1bd68ca · 1bd68ca
1 parent af1e026
commit 1bd68ca
Show file tree

Hide file tree

Showing 15 changed files with 3,808 additions and 3,782 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules/Modules)
 ###############################################################################
 
 # Valid applications and choices
-list(APPEND VALID_APPS ATM ATMAERO ATMW S2S S2SW HAFS HAFSW HAFS-ALL NG-GODAS)
+list(APPEND VALID_APPS ATM ATMAERO ATMW S2S S2SA S2SW S2SWA HAFS HAFSW HAFS-ALL NG-GODAS)
 set(APP NONE CACHE BOOL "Application Name")
 if(NOT (APP IN_LIST VALID_APPS))
   message(FATAL_ERROR "${APP} is not a valid application.\nValid Applications are: ${VALID_APPS}")

diff --git a/FV3 b/FV3
diff --git a/cmake/configure_apps.cmake b/cmake/configure_apps.cmake
@@ -35,19 +35,27 @@ if(APP MATCHES "^(NG-GODAS)$")
   message("Configuring UFS app in (CDEPS) Data Atmosphere mode")
 endif()
 
-if(APP MATCHES "^(S2S|S2SW)$")
+if(APP MATCHES "^(S2S|S2SA|S2SW|S2SWA)$")
+  set(APP_MSG "Configuring UFS app in S2S")
   set(CMEPS      ON  CACHE BOOL "Enable CMEPS"               FORCE)
   set(FMS        ON  CACHE BOOL "Enable FMS"                 FORCE)
   set(FV3        ON  CACHE BOOL "Enable FV3"                 FORCE)
   set(MOM6       ON  CACHE BOOL "Enable MOM6"                FORCE)
   set(CICE6      ON  CACHE BOOL "Enable CICE6"               FORCE)
   set(STOCH_PHYS ON  CACHE BOOL "Enable Stochastic Physics"  FORCE)
-  if(APP MATCHES "S2SW")
+  if(APP MATCHES "^S2SW")
     set(WW3      ON  CACHE BOOL "Enable WAVEWATCH III"       FORCE)
-    message("Configuring UFS app in S2S with Waves mode")
-  else()
-    message("Configuring UFS app in S2S mode")
+    string(CONCAT APP_MSG ${APP_MSG} " with Waves")
+  endif()
+  if(APP MATCHES "A$")
+    set(UFS_GOCART ON  CACHE BOOL "Enable GOCART"            FORCE)
+    if(WW3)
+      string(CONCAT APP_MSG ${APP_MSG} " and Aerosols")
+    else()
+      string(CONCAT APP_MSG ${APP_MSG} " with Aerosols")
+    endif()
   endif()
+  message("${APP_MSG} mode")
 endif()
 
 if(APP MATCHES "^(HAFS|HAFSW|HAFS-ALL)$")

diff --git a/doc/UsersGuide/source/InputsOutputs.rst b/doc/UsersGuide/source/InputsOutputs.rst
@@ -1206,6 +1206,7 @@ shows the following parameters that can be set in *model_configure* at run-time.
      - history file output forecast hours or history file output frequency if the second elelment is -1
      - real
      - -1 (negative: turn off the option, otherwise overwritten nfhout/nfhout_fh; 6 -1: output every 6 hoursr; 6 9: output history files at fh=6 and 9)
+     - -1 (negative: turn off the option, otherwise overwritten nfhout/nfhout_fh; 6 -1: output every 6 hoursr; 6 9: output history files at fh=6 and 9. Note: output_fh can only take 277 elements)
 
 :numref:`Table %s <ModelConfigParamsNotChanged>` shows the following parameters in *model_configure* that
 are not usually changed.

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.conf b/tests/rt.conf
@@ -2,7 +2,7 @@
 # S2S tests                                                                                                                                                                    #
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=S2SW -DUFS_GOCART=ON -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp,FV3_GFS_v17_coupled_p8      | - wcoss_cray                            | fv3 |
+COMPILE | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp,FV3_GFS_v17_coupled_p8     | - wcoss_cray                            | fv3 |
 RUN     | cpld_control_p8                                                                                                         | - wcoss_cray                            | fv3 |
 RUN     | cpld_2threads_p8                                                                                                        | - wcoss_cray                            |     |
 RUN     | cpld_decomp_p8                                                                                                          | - wcoss_cray jet.intel                  |     |
@@ -24,7 +24,7 @@ RUN     | cpld_restart_c192_p8
 RUN     | cpld_control_c384_p8                                                                                                    | - wcoss_cray jet.intel                  | fv3 |
 RUN     | cpld_restart_c384_p8                                                                                                    | - wcoss_cray jet.intel                  |     | cpld_control_c384_p8
 
-COMPILE | -DAPP=S2S -DDEBUG=ON -DUFS_GOCART=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                               | - wcoss_cray                            | fv3 |
+COMPILE | -DAPP=S2SA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                              | - wcoss_cray                            | fv3 |
 RUN     | cpld_debug_p8                                                                                                           | - wcoss_cray                            | fv3 |
 
 ###################################################################################################################################################################################

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=20220318
+BL_DATE=20220321
 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