From 56d278f0b2eec31e84d0b35da1511420b26b9b12 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 9 Jun 2020 13:36:24 -0600 Subject: [PATCH 1/3] Update .gitmodules and submodule pointer for fv3atm for code review and testing --- .gitmodules | 6 ++++-- FV3 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8a3a77983d..65e931515e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-GSD/fv3atm - branch = gsd/develop + #url = https://github.com/NOAA-GSD/fv3atm + #branch = gsd/develop + url = https://github.com/climbfuji/fv3atm + branch = rollback_thompson [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index 18d2dc1c16..ac8f47ad34 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 18d2dc1c16a16766a527f6e793fd124c54c61377 +Subproject commit ac8f47ad342dfdda9cc66ac8b1fd8af0130b1b3d From 21767c1ddf99baf8d6a8a926d933fc8c11f47cd3 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 3 Jun 2020 14:28:14 -0600 Subject: [PATCH 2/3] Change the way the sutils module is loaded on hera.{gnu,intel} and jet.intel --- modulefiles/hera.gnu/fv3 | 3 ++- modulefiles/hera.intel/fv3 | 3 ++- modulefiles/jet.intel/fv3 | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modulefiles/hera.gnu/fv3 b/modulefiles/hera.gnu/fv3 index 6bd47c2458..4e60e56f0b 100644 --- a/modulefiles/hera.gnu/fv3 +++ b/modulefiles/hera.gnu/fv3 @@ -15,7 +15,8 @@ setenv NCEPLIBS /scratch2/NCEPDEV/nwprod/NCEPLIBS ## load contrib environment ## load slurm utils (arbitrary.pl layout.pl) ## -module load contrib sutils +module use -a /contrib/sutils/modulefiles +module load sutils ## ## load programming environment diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3 index 0e86d773a2..1ec64cb138 100644 --- a/modulefiles/hera.intel/fv3 +++ b/modulefiles/hera.intel/fv3 @@ -15,7 +15,8 @@ setenv NCEPLIBS /scratch2/NCEPDEV/nwprod/NCEPLIBS ## load contrib environment ## load slurm utils (arbitrary.pl layout.pl) ## -module load contrib sutils +module use -a /contrib/sutils/modulefiles +module load sutils ## ## load programming environment diff --git a/modulefiles/jet.intel/fv3 b/modulefiles/jet.intel/fv3 index f8c264b6a8..f24b2cfd6a 100644 --- a/modulefiles/jet.intel/fv3 +++ b/modulefiles/jet.intel/fv3 @@ -13,7 +13,8 @@ module purge ## load contrib environment ## load slurm utils (arbitrary.pl layout.pl) ## -module load contrib sutils +module use -a /contrib/sutils/modulefiles +module load sutils module load intel/18.0.5.274 module load impi/2018.4.274 From 0e1a680da1062ceeb3a2b1805c502faba03c160d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 12 Jun 2020 14:52:59 -0600 Subject: [PATCH 3/3] Revert change to .gitmodules and update submodule pointer for fv3atm --- .gitmodules | 6 ++---- FV3 | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 65e931515e..8a3a77983d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "FV3"] path = FV3 - #url = https://github.com/NOAA-GSD/fv3atm - #branch = gsd/develop - url = https://github.com/climbfuji/fv3atm - branch = rollback_thompson + url = https://github.com/NOAA-GSD/fv3atm + branch = gsd/develop [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index ac8f47ad34..4deb1174f6 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit ac8f47ad342dfdda9cc66ac8b1fd8af0130b1b3d +Subproject commit 4deb1174f6cddf2568996f5ad4cbe1fd9f065ec8