Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable inline post. #27

Merged
merged 12 commits into from
Apr 15, 2021
Merged
13 changes: 2 additions & 11 deletions Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ required = True

[ufs_utils]
protocol = git
repo_url = https://github.com/NOAA-EMC/UFS_UTILS
repo_url = https://github.com/NOAA-GSL/UFS_UTILS
# Specify either a branch name or a hash but not both.
#branch = develop
hash = 005f9a0a
hash = RRFS_cloud
local_path = src/UFS_UTILS
required = True

Expand All @@ -24,14 +24,5 @@ branch = RRFS_cloud
local_path = src/ufs_weather_model
required = True

[EMC_post]
protocol = git
repo_url = https://github.com/NOAA-EMC/EMC_post
# Specify either a branch name or a hash but not both.
#branch = develop
hash = 9fa1e088
local_path = src/EMC_post
required = True

[externals_description]
schema_version = 1.0.0
6 changes: 3 additions & 3 deletions env/build_hera_intel.env
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ module use /contrib/sutils/modulefiles
module load sutils
module load cmake/3.16.1

module use /scratch2/NCEPDEV/nwprod/hpc-stack/test/modulefiles/stack
module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack

module load hpc/1.0.0-beta1
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
Expand All @@ -27,7 +27,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.4

module load gfsio/1.4.1
module load sfcio/1.4.1
Expand Down
3 changes: 3 additions & 0 deletions env/wflow_aws.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
module use /contrib/apps/modules
module load rocoto

module use /contrib/apps/miniconda3/modulefiles
module load miniconda3
source activate regional_workflow
10 changes: 2 additions & 8 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
set(CCPP_SUITES "rrfs_gfsv16,FV3_GFS_v15_thompson_mynn")
endif()

ExternalProject_Add(ufs_weather_model
Expand All @@ -20,13 +20,7 @@ ExternalProject_Add(ufs_weather_model
"-DCMAKE_C_COMPILER=${MPI_C_COMPILER}"
"-DCMAKE_CXX_COMPILER=${MPI_CXX_COMPILER}"
"-DCMAKE_Fortran_COMPILER=${MPI_Fortran_COMPILER}"
"-DSTATIC=Y"
"-DNETCDF_DIR=$ENV{NETCDF}"
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/
)

ExternalProject_Add(EMC_post
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/EMC_post
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/EMC_post
INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
)