From a3db4b0b11d7bafc7ec532ea9fe2fa446f604a09 Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Wed, 31 Mar 2021 23:14:36 +0000 Subject: [PATCH 1/9] Updates for inline post. --- Externals.cfg | 2 +- env/build_hera_intel.env | 6 +++--- src/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index da77971a42..e7571de243 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -29,7 +29,7 @@ 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 +hash = 638c479 local_path = src/EMC_post required = True diff --git a/env/build_hera_intel.env b/env/build_hera_intel.env index 60353b1e49..ea92ca28b5 100644 --- a/env/build_hera_intel.env +++ b/env/build_hera_intel.env @@ -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 @@ -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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a192c821aa..62953bf334 100644 --- 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") + set(CCPP_SUITES "rrfs_gfsv16,FV3_GFS_v15_thompson_mynn,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") endif() ExternalProject_Add(ufs_weather_model From fa52654862e20a15f9c58a3d22f8ff334d698cc9 Mon Sep 17 00:00:00 2001 From: Christina Holt Date: Mon, 5 Apr 2021 14:27:00 +0000 Subject: [PATCH 2/9] Loading upp module. Not building EMC Post --- env/build_aws_intel.env | 4 ++-- src/CMakeLists.txt | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/env/build_aws_intel.env b/env/build_aws_intel.env index 3c6136f109..51199f47e6 100644 --- a/env/build_aws_intel.env +++ b/env/build_aws_intel.env @@ -9,11 +9,11 @@ module load hpc-stack/1.1.0 export CMAKE_C_COMPILER=mpiicc export CMAKE_CXX_COMPILER=mpiicpc export CMAKE_Fortran_COMPILER=mpiifort -export CMAKE_Platform=aws +export CMAKE_Platform=aws.intel export CC=icc export CXX=icpc export FC=ifort module load intel/19.0.5.281 module load impi/2019.0.5 - +module load upp/10.0.5 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 62953bf334..665171f854 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,10 +23,3 @@ ExternalProject_Add(ufs_weather_model "-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}" - ) From 2135fb922596fc25d80c4cbdd32aeca143d8ca35 Mon Sep 17 00:00:00 2001 From: Christina Holt Date: Mon, 5 Apr 2021 14:28:15 +0000 Subject: [PATCH 3/9] Removing EMC_post from externals --- Externals.cfg | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index e7571de243..3300a9d200 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -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 = 638c479 -local_path = src/EMC_post -required = True - [externals_description] schema_version = 1.0.0 From 33e7355fe3149e8a9dee73fcafa5abd59905cd68 Mon Sep 17 00:00:00 2001 From: Christopher Harrop Date: Wed, 7 Apr 2021 17:30:14 +0000 Subject: [PATCH 4/9] Fix AWS build environment settings Change platform from aws.intel to aws. Change Intel MPI module to use the module that supports EFA. --- env/build_aws_intel.env | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/env/build_aws_intel.env b/env/build_aws_intel.env index 51199f47e6..0232e59849 100644 --- a/env/build_aws_intel.env +++ b/env/build_aws_intel.env @@ -9,11 +9,10 @@ module load hpc-stack/1.1.0 export CMAKE_C_COMPILER=mpiicc export CMAKE_CXX_COMPILER=mpiicpc export CMAKE_Fortran_COMPILER=mpiifort -export CMAKE_Platform=aws.intel +export CMAKE_Platform=aws export CC=icc export CXX=icpc export FC=ifort module load intel/19.0.5.281 -module load impi/2019.0.5 -module load upp/10.0.5 +module load intelmpi From ee6e85419fd394604367ef43edbc7c01f997c055 Mon Sep 17 00:00:00 2001 From: Christopher Harrop Date: Fri, 9 Apr 2021 19:28:29 +0000 Subject: [PATCH 5/9] Add workflow env script for AWS --- env/wflow_aws.env | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 env/wflow_aws.env diff --git a/env/wflow_aws.env b/env/wflow_aws.env new file mode 100644 index 0000000000..a7687aa354 --- /dev/null +++ b/env/wflow_aws.env @@ -0,0 +1,3 @@ +module use /contrib/apps/miniconda3/modulefiles +module load miniconda3 +source activate regional_workflow From 26419490a162da8a53a5cf0605e0972e1444029c Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Wed, 14 Apr 2021 20:03:18 +0000 Subject: [PATCH 6/9] Fixes for HWT configs. --- Externals.cfg | 4 ++-- src/CMakeLists.txt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 3300a9d200..52f26f9a79 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 665171f854..1efc1b9460 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,7 @@ ExternalProject_Add(UFS_UTILS ) if(NOT CCPP_SUITES) - set(CCPP_SUITES "rrfs_gfsv16,FV3_GFS_v15_thompson_mynn,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") + set(CCPP_SUITES "rrfs_gfsv16,FV3_GFS_v15_thompson_mynn") endif() ExternalProject_Add(ufs_weather_model @@ -20,6 +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/ ) From a6132ffbe6bd8f2af78bd5b196c1940ed9107653 Mon Sep 17 00:00:00 2001 From: Christina Holt <56881914+christinaholtNOAA@users.noreply.github.com> Date: Thu, 15 Apr 2021 09:47:32 -0600 Subject: [PATCH 7/9] Put this file back to original --- env/build_aws_intel.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/build_aws_intel.env b/env/build_aws_intel.env index f0f3f01592..0232e59849 100644 --- a/env/build_aws_intel.env +++ b/env/build_aws_intel.env @@ -15,4 +15,4 @@ export CXX=icpc export FC=ifort module load intel/19.0.5.281 -module load intelmpi \ No newline at end of file +module load intelmpi From c3b283fd80bdeedd26a73bc9955c6a2f734d5f04 Mon Sep 17 00:00:00 2001 From: Christina Holt <56881914+christinaholtNOAA@users.noreply.github.com> Date: Thu, 15 Apr 2021 09:47:59 -0600 Subject: [PATCH 8/9] Actually put the file back to the original! --- env/build_aws_intel.env | 1 + 1 file changed, 1 insertion(+) diff --git a/env/build_aws_intel.env b/env/build_aws_intel.env index 0232e59849..027b3d80a3 100644 --- a/env/build_aws_intel.env +++ b/env/build_aws_intel.env @@ -16,3 +16,4 @@ export FC=ifort module load intel/19.0.5.281 module load intelmpi + From c7b135d1d61cf9a0466c09692993231371ede3ef Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Thu, 15 Apr 2021 16:23:21 +0000 Subject: [PATCH 9/9] Load rocoto with wflow env. --- env/wflow_aws.env | 3 +++ 1 file changed, 3 insertions(+) diff --git a/env/wflow_aws.env b/env/wflow_aws.env index a7687aa354..9b8902ee29 100644 --- a/env/wflow_aws.env +++ b/env/wflow_aws.env @@ -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