From a4dc928291e25bc2b233ad73c77553b94be27ef4 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 14 May 2020 13:27:04 -0600 Subject: [PATCH 1/4] Remove cheyenne.pgi from CCPP config --- ccpp/build_ccpp.sh | 2 +- ccpp/set_compilers.sh | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/ccpp/build_ccpp.sh b/ccpp/build_ccpp.sh index 8d8ef89ce..fe1f64fe7 100755 --- a/ccpp/build_ccpp.sh +++ b/ccpp/build_ccpp.sh @@ -6,7 +6,7 @@ set -eu # List of valid/tested machines VALID_MACHINES=( wcoss_cray wcoss_dell_p3 gaea.intel jet.intel \ hera.intel hera.gnu orion.intel \ - cheyenne.intel cheyenne.intel-impi cheyenne.gnu cheyenne.pgi endeavor.intel \ + cheyenne.intel cheyenne.intel-impi cheyenne.gnu endeavor.intel \ stampede.intel supermuc_phase2.intel macosx.gnu \ linux.intel linux.gnu linux.pgi ) diff --git a/ccpp/set_compilers.sh b/ccpp/set_compilers.sh index 8efe19dfe..23143a672 100755 --- a/ccpp/set_compilers.sh +++ b/ccpp/set_compilers.sh @@ -74,14 +74,6 @@ case "$MACHINE_ID" in export F77=mpif77 export F90=mpif90 ;; - cheyenne.pgi) - export CPP="mpicc -E" - export CC=mpicc - export CXX=mpicxx - export FC=mpif90 - export F77=mpif77 - export F90=mpif90 - ;; endeavor.intel) export CC=mpiicc export CXX=mpiicpc From 925f9928bbade62ff8645dc933e361dc355d9b9c Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 14 May 2020 13:27:26 -0600 Subject: [PATCH 2/4] Update .gitmodules and submodule pointer for ccpp-framework for code review and testing --- .gitmodules | 6 ++++-- ccpp/framework | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index d253f6966..21ad1e978 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,10 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - url = https://github.com/NCAR/ccpp-framework - branch = master + #url = https://github.com/NCAR/ccpp-framework + #branch = master + url = https://github.com/climbfuji/ccpp-framework + branch = fix_decoding_errors_stampede [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics diff --git a/ccpp/framework b/ccpp/framework index 7c3673d3a..67fdd8c01 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 7c3673d3ab5858e17bf2253867f548b24c47eb49 +Subproject commit 67fdd8c018fa31feeb13c03f3ce4d4f311020c2c From 9a286421da14d16f7f36b1f4e2f6e18ecbdb8cb5 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 1 Jun 2020 09:25:59 -0600 Subject: [PATCH 3/4] Update submodule pointer for ccpp-framework --- ccpp/framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/framework b/ccpp/framework index 67fdd8c01..a477b63ee 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 67fdd8c018fa31feeb13c03f3ce4d4f311020c2c +Subproject commit a477b63ee9bbbb84113239ee526f993da6f47132 From d1379ebe565dbe7bc3cb4f762f933d0e691f7ffd Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 1 Jun 2020 15:03:52 -0600 Subject: [PATCH 4/4] Revert change to .gitmodules and update submodule pointer for ccpp-framework --- .gitmodules | 6 ++---- ccpp/framework | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 21ad1e978..d253f6966 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - #url = https://github.com/NCAR/ccpp-framework - #branch = master - url = https://github.com/climbfuji/ccpp-framework - branch = fix_decoding_errors_stampede + url = https://github.com/NCAR/ccpp-framework + branch = master [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics diff --git a/ccpp/framework b/ccpp/framework index a477b63ee..d31bdb7ac 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit a477b63ee9bbbb84113239ee526f993da6f47132 +Subproject commit d31bdb7ac597bc75fb3252cb49edccfce7eb4000