From 7fcbe37268587a80dedb5ea443fe6aa74fbfa709 Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Thu, 10 Jun 2021 18:49:18 +0000 Subject: [PATCH 1/5] Adding new NSSL physics to compile list. --- src/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1efc1b9460..97733d9fc1 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") + set(CCPP_SUITES "rrfs_gfsv16,FV3_GFS_v15_thompson_mynn,nssl_mp_no_nsst") endif() ExternalProject_Add(ufs_weather_model @@ -22,5 +22,6 @@ ExternalProject_Add(ufs_weather_model "-DCMAKE_Fortran_COMPILER=${MPI_Fortran_COMPILER}" "-DSTATIC=Y" "-DNETCDF_DIR=$ENV{NETCDF}" + "-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/ ) From 6fcaaa10a293cba0896dccb4e3afcce4d294feb8 Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Thu, 10 Jun 2021 19:11:57 +0000 Subject: [PATCH 2/5] Point to Christina's branch. --- Externals.cfg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 52f26f9a79..0d98a0e74e 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -17,9 +17,10 @@ required = True [ufs_weather_model] protocol = git -repo_url = https://github.com/NOAA-GSL/ufs-weather-model +#repo_url = https://github.com/NOAA-GSL/ufs-weather-model +repo_url = https://github.com/christinaholtNOAA/ufs-weather-model # Specify either a branch name or a hash but not both. -branch = RRFS_cloud +branch = rrfs_cloud_9mem #hash = 63591b6 local_path = src/ufs_weather_model required = True From 9c409495ed5c56c14d62fbfbbbd6285d90c414e5 Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Thu, 10 Jun 2021 20:54:27 +0000 Subject: [PATCH 3/5] Fixed the branch name. --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 0d98a0e74e..81324d03a7 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -20,7 +20,7 @@ protocol = git #repo_url = https://github.com/NOAA-GSL/ufs-weather-model repo_url = https://github.com/christinaholtNOAA/ufs-weather-model # Specify either a branch name or a hash but not both. -branch = rrfs_cloud_9mem +branch = rrfs_cloud_hwt #hash = 63591b6 local_path = src/ufs_weather_model required = True From 970fbef352c41874bc36860f3404a3119143f9d1 Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Thu, 10 Jun 2021 21:56:11 +0000 Subject: [PATCH 4/5] Point to CH's branch --- Externals.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 81324d03a7..88d1ca670d 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,8 +1,8 @@ [regional_workflow] protocol = git -repo_url = https://github.com/NOAA-GSL/regional_workflow +repo_url = https://github.com/christinaholtNOAA/regional_workflow # Specify either a branch name or a hash but not both. -branch = RRFS_cloud +branch = add_configs local_path = regional_workflow required = True From d798dc4a5ce1ff64366b2aeffbc74ce8d8a0e2a8 Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Tue, 15 Jun 2021 01:51:27 +0000 Subject: [PATCH 5/5] Pointing back to RRFS_cloud branches after merges. --- Externals.cfg | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 88d1ca670d..a7b9426f7b 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,8 +1,8 @@ [regional_workflow] protocol = git -repo_url = https://github.com/christinaholtNOAA/regional_workflow +repo_url = https://github.com/NOAA-GSL/regional_workflow # Specify either a branch name or a hash but not both. -branch = add_configs +branch = RRFS_cloud local_path = regional_workflow required = True @@ -17,11 +17,9 @@ required = True [ufs_weather_model] protocol = git -#repo_url = https://github.com/NOAA-GSL/ufs-weather-model -repo_url = https://github.com/christinaholtNOAA/ufs-weather-model +repo_url = https://github.com/NOAA-GSL/ufs-weather-model # Specify either a branch name or a hash but not both. -branch = rrfs_cloud_hwt -#hash = 63591b6 +branch = RRFS_cloud local_path = src/ufs_weather_model required = True