Merge pull request #92 from grantfirl/ufs-dev-PR42

UFS-dev PR#42
NCAR · Apr 12, 2023 · 8b276be · 8b276be
2 parents a72d438 + ae67c56
commit 8b276be
Show file tree

Hide file tree

Showing 24 changed files with 1,518 additions and 1,140 deletions.
diff --git a/AQM b/AQM
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -83,6 +83,28 @@ if(CMAKE_Platform)
   endif()
 endif()
 
+option(BUILD_WITH_IFI "Build NCEPpost with In-Flight Icing (IFI) library if present" OFF)
+option(REQUIRE_IFI "Abort if libIFI is not found ; enables BUILD_WITH_IFI=ON" OFF)
+option(INTERNAL_IFI "Compile with IFI inside the executable, instead of a library" OFF)
+
+if(INTERNAL_IFI)
+  message("Building with libIFI inside executable. Do not distribute executable outside of WCOSS2.")
+  set(BUILD_WITH_IFI OFF)
+  set(REQUIRE_IFI OFF)
+endif()
+
+if(REQUIRE_IFI)
+  set(BUILD_WITH_IFI ON)
+endif()
+
+if(BUILD_WITH_IFI)
+  if(REQUIRE_IFI)
+    find_package(IFI CONFIG REQUIRED)
+  else()
+    find_package(IFI CONFIG)
+  endif()
+endif()
+
 message("")
 message("32BIT ............ ${32BIT}")
 message("CCPP_32BIT ....... ${CCPP_32BIT}")
@@ -316,6 +338,7 @@ target_link_libraries(ufs PUBLIC "${_ufs_libs_public}")
 add_executable(ufs_model driver/UFS.F90)
 add_dependencies(ufs_model ufs)
 target_link_libraries(ufs_model ufs esmf w3emc::w3emc_d)
+set_target_properties(ufs_model PROPERTIES LINKER_LANGUAGE Fortran)
 
 ###############################################################################
 ### Install

diff --git a/FV3 b/FV3
diff --git a/modulefiles/ufs_acorn.intel.lua b/modulefiles/ufs_acorn.intel.lua
@@ -28,6 +28,9 @@ load(pathJoin("hpc-cray-mpich", hpc_cray_mpich_ver))
 
 load("ufs_common")
 
+prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/UPP_IFI/modulefiles")
+load("ifi/20230118-intel-19.1.3.304")
+
 setenv("CC", "cc")
 setenv("CXX", "CC")
 setenv("FC", "ftn")

diff --git a/modulefiles/ufs_acorn.intel_debug.lua b/modulefiles/ufs_acorn.intel_debug.lua
@@ -28,6 +28,9 @@ load(pathJoin("hpc-cray-mpich", hpc_cray_mpich_ver))
 
 load("ufs_common_debug")
 
+prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/UPP_IFI/modulefiles")
+load("ifi/20230118-intel-19.1.3.304")
+
 setenv("CC", "cc")
 setenv("CXX", "CC")
 setenv("FC", "ftn")

diff --git a/modulefiles/ufs_hera.intel.lua b/modulefiles/ufs_hera.intel.lua
@@ -36,4 +36,7 @@ setenv("CXX", "mpiicpc")
 setenv("FC", "mpiifort")
 setenv("CMAKE_Platform", "hera.intel")
 
+prepend_path("MODULEPATH", "/scratch2/BMC/ifi/modulefiles")
+try_load("ifi/20230118-intel-2022.1.2")
+
 whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_hera.intel_debug.lua b/modulefiles/ufs_hera.intel_debug.lua
@@ -36,4 +36,7 @@ setenv("CXX", "mpiicpc")
 setenv("FC", "mpiifort")
 setenv("CMAKE_Platform", "hera.intel")
 
+prepend_path("MODULEPATH", "/scratch2/BMC/ifi/modulefiles")
+try_load("ifi/20230118-intel-2022.1.2")
+
 whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_jet.intel.lua b/modulefiles/ufs_jet.intel.lua
@@ -31,4 +31,7 @@ setenv("CXX", "mpiicpc")
 setenv("FC", "mpiifort")
 setenv("CMAKE_Platform", "jet.intel")
 
+prepend_path("MODULEPATH", "/lfs4/BMC/ifi/modulefiles")
+try_load("ifi/20230118-intel-2022.1.2")
+
 whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_jet.intel_debug.lua b/modulefiles/ufs_jet.intel_debug.lua
@@ -31,4 +31,7 @@ setenv("CXX", "mpiicpc")
 setenv("FC", "mpiifort")
 setenv("CMAKE_Platform", "jet.intel")
 
+prepend_path("MODULEPATH", "/lfs4/BMC/ifi/modulefiles")
+try_load("ifi/20230118-intel-2022.1.2")
+
 whatis("Description: UFS build environment")
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.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/fv3_conf/compile_qsub.IN_cheyenne b/tests/fv3_conf/compile_qsub.IN_cheyenne
@@ -5,7 +5,7 @@
 #PBS -A @[ACCNR]
 #PBS -q @[QUEUE]
 #PBS -l select=1:ncpus=8:mpiprocs=1
-#PBS -l walltime=00:30:00
+#PBS -l walltime=00:35:00
 
 set -eux
 

diff --git a/tests/fv3_conf/rrfs_warm_run.IN b/tests/fv3_conf/rrfs_warm_run.IN
@@ -48,6 +48,8 @@ if [ $IMP_PHYSICS = 8 ]; then
   cp    @[INPUTDATA_ROOT]/FV3_input_data_gsd/CCN_ACTIVATE.BIN .
 fi
 
+cp ${PATHRT}/parm/postxconfig-NT-fv3lam.txt postxconfig-NT.txt
+
 if [ $DO_RRTMGP = .true. ]; then
   cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
 fi
diff --git a/tests/parm/aqm/aqm.rc b/tests/parm/aqm/aqm.rc
@@ -16,7 +16,7 @@ csqy_data:   CSQY_DATA_cb6r3_ae6_aq
 optics_data: PHOT_OPTICS.dat
 omi_data:    omi_cmaq_2015_361X179.dat
 
-init_concentrations: true
+init_concentrations: false
 
 run_aerosol: true
 

diff --git a/tests/parm/diag_table/diag_table_hrrr b/tests/parm/diag_table/diag_table_hrrr
@@ -332,6 +332,12 @@
 "gfs_phys",    "skebv_wts",     "skebv_wts",     "fv3_history",  "all", .false., "none", 2
 "gfs_phys",    "shum_wts",      "shum_wts",      "fv3_history",  "all", .false., "none", 2
 
+
+# Lightning threat indexes
+"gfs_sfc",     "ltg1_max",      "ltg1_max",      "fv3_history2d", "all", .false., "none", 2
+"gfs_sfc",     "ltg2_max",      "ltg2_max",      "fv3_history2d", "all", .false., "none", 2
+"gfs_sfc",     "ltg3_max",      "ltg3_max",      "fv3_history2d", "all", .false., "none", 2
+
 #=============================================================================================
 #
 #====> This file can be used with diag_manager/v2.0a (or higher) <====
+2 −2		aqm_files.cmake
+0 −894		src/model/src/aero_depv.F
+25 −33		src/model/src/vdiffacmx.F
+1 −1		.gitignore
+1 −1		atmos_cubed_sphere
+51 −2		ccpp/data/GFS_typedefs.F90
+41 −0		ccpp/data/GFS_typedefs.meta
+35 −0		ccpp/driver/GFS_diagnostics.F90
+1 −1		ccpp/physics
+39 −3		io/post_fv3.F90
+2 −1		io/post_nems_routines.F90
+1 −1		upp