[develop] Update build environments for newer version of weather mode…

…l (hash 2f1c8e1) (#140) ## DESCRIPTION OF CHANGES: This PR (along with https://github.com/NOAA-EMC/regional_workflow/pull/492) update the UFS SRW App to work with a more up-to-date hash of the ufs-weather-model (2f1c8e1) ## TESTS CONDUCTED: Ran full suite of tests on Hera (aside from nco tests) with updated environment files (/scratch2/BMC/det/kavulich/workdir/update_app_master/step-by-step/expt_dirs/). The only new failures are only for older versions of NAM input; this is due to a change in the weather model, and will need to be handled in a separate PR. Ran several end-to-end tests on Cheyenne (Intel 19.1.1) and Jet. Also ran the Graduate Student Test case on Orion. No failures outside of those outlined above and a few previously-known failures. **Tests have not been run on WCOSS platforms; these will likely fail without being updated to the latest ESMF modules but DTC does not have access to update and test** ## ISSUE: Fixes issue #134
ufs-community · Jun 2, 2021 · 339f189 · 339f189
1 parent be49e65
commit 339f189
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 51 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -3,7 +3,7 @@ protocol = git
 repo_url = https://github.com/NOAA-EMC/regional_workflow
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = 3586e11
+hash = 40cfeff
 local_path = regional_workflow
 required = True
 
@@ -21,7 +21,7 @@ protocol = git
 repo_url = https://github.com/ufs-community/ufs-weather-model
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = ea8a7aa
+hash = 2f1c8e1
 local_path = src/ufs_weather_model
 required = True
 

diff --git a/devbuild.sh b/devbuild.sh
@@ -70,7 +70,7 @@ fi
 
 mkdir -p ${BUILD_DIR}
 cd ${BUILD_DIR}
-cmake .. -DCMAKE_INSTALL_PREFIX=..
-make -j ${BUILD_JOBS:-4}
+cmake .. -DCMAKE_INSTALL_PREFIX=.. 2>&1 | tee log.cmake
+make -j ${BUILD_JOBS:-4} 2>&1 | tee log.make
 
 exit 0
diff --git a/env/build_cheyenne_gnu.env b/env/build_cheyenne_gnu.env
@@ -18,7 +18,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.2
-module load esmf/8_1_0_beta_snapshot_27
+module load esmf/8_1_1
 module load bacio/2.4.1
 module load crtm/2.3.0
 module load g2/3.4.1
@@ -28,7 +28,7 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.6
 
 module load gfsio/1.4.1
 module load sfcio/1.4.1

diff --git a/env/build_cheyenne_intel.env b/env/build_cheyenne_intel.env
@@ -7,17 +7,19 @@ module load mpt/2.22
 module load ncarcompilers/0.5.0
 module load cmake/3.16.4
 
-module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-nco-20201113/modulefiles/stack
-module load hpc/1.0.0-beta1
+module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.1.0/modulefiles/stack
+module load hpc/1.1.0
 module load hpc-intel/19.1.1
 module load hpc-mpt/2.22
+
 module load jasper/2.0.22
 module load zlib/1.2.11
 module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
+module load pio/2.5.2
+module load esmf/8_1_1
+
 module load bacio/2.4.1
 module load crtm/2.3.0
 module load g2/3.4.1
@@ -27,7 +29,7 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.6
 
 module load gfsio/1.4.1
 module load sfcio/1.4.1

diff --git a/env/build_hera_intel.env b/env/build_hera_intel.env
@@ -2,41 +2,38 @@
 
 module purge
 
-module load cmake/3.16.1
-module load hpss
 module use /contrib/sutils/modulefiles
 module load sutils
+module load cmake/3.16.1
 
-### hpc-stack ###
 module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
+
 module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
-
+module load jasper/2.0.22
+module load zlib/1.2.11
+module load png/1.6.35
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load pio/2.5.2
+module load esmf/8_1_1
 module load bacio/2.4.1
 module load crtm/2.3.0
-module load gfsio/1.4.1
 module load g2/3.4.1
-module load g2tmpl/1.10.0
+module load g2tmpl/1.9.1
 module load ip/3.3.3
-module load jasper/2.0.22
 module load nemsio/2.5.2
-module load png/1.6.35
-module load sfcio/1.4.1
-module load sigio/2.3.2
 module load sp/2.3.3
-module load wgrib2/2.0.8
+module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load zlib/1.2.11
+module load upp/10.0.6
 
-### Additional modules ###
-module load esmf/8_1_0_beta_snapshot_27
-module load hdf5/1.10.6
+module load gfsio/1.4.1
+module load sfcio/1.4.1
 module load landsfcutil/2.4.1
 module load nemsiogfs/2.5.3
-module load netcdf/4.7.4
-module load upp/10.0.0
-module load w3emc/2.7.3
+module load wgrib2/2.0.8
 
 
 export CMAKE_C_COMPILER=mpiicc

diff --git a/env/build_jet_intel.env b/env/build_jet_intel.env
@@ -6,17 +6,17 @@ module load sutils
 module load cmake/3.16.1
 
 module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack
+
 module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.4.274
-
 module load jasper/2.0.22
 module load zlib/1.2.11
 module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
+module load pio/2.5.2
+module load esmf/8_1_1
 module load bacio/2.4.1
 module load crtm/2.3.0
 module load g2/3.4.1
@@ -26,7 +26,7 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.6
 
 module load gfsio/1.4.1
 module load sfcio/1.4.1

diff --git a/env/build_orion_intel.env b/env/build_orion_intel.env
@@ -1,43 +1,39 @@
 #Setup instructions for MSU Orion using Intel-18.0.5 (bash shell)
 
-module purge
+module load contrib noaatools
 
 module load cmake/3.17.3
-module load contrib noaatools
 module load python/3.7.5
 
-### hpc-stack ###
 module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack
+
 module load hpc/1.1.0
 module load hpc-intel/2018.4
 module load hpc-impi/2018.4
 
+module load jasper/2.0.22
+module load zlib/1.2.11
+module load png/1.6.35
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load pio/2.5.2
+module load esmf/8_1_1
 module load bacio/2.4.1
 module load crtm/2.3.0
-module load gfsio/1.4.1
 module load g2/3.4.1
 module load g2tmpl/1.9.1
 module load ip/3.3.3
-module load jasper/2.0.22
 module load nemsio/2.5.2
-module load png/1.6.35
-module load sfcio/1.4.1
-module load sigio/2.3.2
 module load sp/2.3.3
-module load wgrib2/2.0.8
-module load wrf_io/1.1.1
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load zlib/1.2.11
+module load upp/10.0.6
 
-### Additional modules ###
-module load esmf/8_1_0_beta_snapshot_27
-module load hdf5/1.10.6
+module load gfsio/1.4.1
+module load sfcio/1.4.1
 module load landsfcutil/2.4.1
 module load nemsiogfs/2.5.3
-module load netcdf/4.7.4
-module load upp/10.0.0
-module load w3emc/2.7.3
+module load wgrib2/2.0.8
 
 
 export CMAKE_C_COMPILER=mpiicc

diff --git a/env/wflow_orion.env b/env/wflow_orion.env
@@ -1,5 +1,7 @@
 # Python environment for workflow on Orion
 
+module load rocoto
+
 module use -a /apps/contrib/miniconda3-noaa-gsl/modulefiles
 module load miniconda3
 conda activate regional_workflow
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ ExternalProject_Add(UFS_UTILS
   )
 
 if(NOT CCPP_SUITES)
-  set(CCPP_SUITES "FV3_CPT_v0,FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GSD_SAR,FV3_GSD_v0,FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_RRFS_v1beta,FV3_HRRR")
+  set(CCPP_SUITES "FV3_CPT_v0,FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GSD_SAR,FV3_GSD_v0,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR,FV3_RRFS_v1alpha")
 endif()
 
 ExternalProject_Add(ufs_weather_model
@@ -21,6 +21,8 @@ ExternalProject_Add(ufs_weather_model
                "-DCMAKE_CXX_COMPILER=${MPI_CXX_COMPILER}"
                "-DCMAKE_Fortran_COMPILER=${MPI_Fortran_COMPILER}"
                "-DNETCDF_DIR=$ENV{NETCDF}"
+               "-D32BIT=ON"
+               "-DAPP=ATM"
   INSTALL_COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/bin && cp ${CMAKE_CURRENT_BINARY_DIR}/ufs_weather_model/src/ufs_weather_model-build/ufs_model ${CMAKE_INSTALL_PREFIX}/bin/
   )