From 8cb713711ff730d69dd744b65e11488f9b70247f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 24 Oct 2019 00:20:23 +0900 Subject: [PATCH 1/5] src/incmake/component_CCPP.mk: update CCPP source/install directories and set CCPP build directory (#11) --- src/incmake/component_CCPP.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/incmake/component_CCPP.mk b/src/incmake/component_CCPP.mk index 00cb6956..827e2553 100644 --- a/src/incmake/component_CCPP.mk +++ b/src/incmake/component_CCPP.mk @@ -3,15 +3,18 @@ ccpp_mk=$(CCPP_BINDIR)/ccpp.mk all_component_mk_files+=$(ccpp_mk) # Location of source code and installation -CCPP_SRCDIR?=$(ROOTDIR)/ccpp -CCPP_BINDIR?=$(ROOTDIR)/ccpp +CCPP_SRCDIR?=$(ROOTDIR)/FV3/ccpp +CCPP_BINDIR?=$(ROOTDIR)/FV3/ccpp + +# Build directory - set to FV3 (later fv3atm) for old make (i.e. in-source) build +CCPP_BUILDDIR?=$(ROOTDIR)/FV3 # Make sure we have a model that supports CCPP: ifeq (,$(findstring FV3,$(COMPONENTS))) $(error CCPP requires FV3) else # Ensure the model is selected. - override CCPP_CONFOPT += --config=ccpp/config/ccpp_prebuild_config.py + override CCPP_CONFOPT += --config=$(CCPP_SRCDIR)/config/ccpp_prebuild_config.py --builddir=$(CCPP_BUILDDIR) override CCPP_MAKEOPT ?= $(FV3_MAKEOPT) override CCPP_BUILDOPT ?= $(FV3_BUILDOPT) endif @@ -47,7 +50,7 @@ $(ccpp_mk): configure set -xue ; \ export PATH_CCPP="$(CCPP_SRCDIR)" ; \ cd $(ROOTDIR) ; \ - ./ccpp/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT) ; \ + $$PATH_CCPP/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT) ; \ cd $$PATH_CCPP ; \ ./build_ccpp.sh ${BUILD_TARGET} "$$PATH_CCPP" $(ccpp_mk) \ "$(CCPP_MAKEOPT)" NO NO ; \ From e0ad502b148e4aac09a8a2e9b978f3d9cd77c656 Mon Sep 17 00:00:00 2001 From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com> Date: Mon, 28 Oct 2019 13:15:19 -0400 Subject: [PATCH 2/5] Revert old src/incmake/component_CCPP.mk (#13) --- src/incmake/component_CCPP.mk | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/incmake/component_CCPP.mk b/src/incmake/component_CCPP.mk index 827e2553..00cb6956 100644 --- a/src/incmake/component_CCPP.mk +++ b/src/incmake/component_CCPP.mk @@ -3,18 +3,15 @@ ccpp_mk=$(CCPP_BINDIR)/ccpp.mk all_component_mk_files+=$(ccpp_mk) # Location of source code and installation -CCPP_SRCDIR?=$(ROOTDIR)/FV3/ccpp -CCPP_BINDIR?=$(ROOTDIR)/FV3/ccpp - -# Build directory - set to FV3 (later fv3atm) for old make (i.e. in-source) build -CCPP_BUILDDIR?=$(ROOTDIR)/FV3 +CCPP_SRCDIR?=$(ROOTDIR)/ccpp +CCPP_BINDIR?=$(ROOTDIR)/ccpp # Make sure we have a model that supports CCPP: ifeq (,$(findstring FV3,$(COMPONENTS))) $(error CCPP requires FV3) else # Ensure the model is selected. - override CCPP_CONFOPT += --config=$(CCPP_SRCDIR)/config/ccpp_prebuild_config.py --builddir=$(CCPP_BUILDDIR) + override CCPP_CONFOPT += --config=ccpp/config/ccpp_prebuild_config.py override CCPP_MAKEOPT ?= $(FV3_MAKEOPT) override CCPP_BUILDOPT ?= $(FV3_BUILDOPT) endif @@ -50,7 +47,7 @@ $(ccpp_mk): configure set -xue ; \ export PATH_CCPP="$(CCPP_SRCDIR)" ; \ cd $(ROOTDIR) ; \ - $$PATH_CCPP/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT) ; \ + ./ccpp/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT) ; \ cd $$PATH_CCPP ; \ ./build_ccpp.sh ${BUILD_TARGET} "$$PATH_CCPP" $(ccpp_mk) \ "$(CCPP_MAKEOPT)" NO NO ; \ From 999dd4465217064610776b3df9794aad53c0e7f6 Mon Sep 17 00:00:00 2001 From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com> Date: Fri, 1 Nov 2019 14:50:02 -0400 Subject: [PATCH 3/5] Get back src/incmake/component_CCPP.mk (#14) * Revert old src/incmake/component_CCPP.mk * Got back src/incmake/component_CCPP.mk file From 17cc2102fb96957754b28880343aae5544be87e2 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 2 Nov 2019 03:50:23 +0900 Subject: [PATCH 4/5] Update for NEMSCompsetRun on jet, bugfix for calling ccpp_prebuild.py in distclean phase (#12) * tests/rtgen: update to run NEMSCompsetRun on xjet * src/incmake/component_CCPP.mk: bugfix, correct path for calling ccpp_prebuild.py in distclean phase --- src/incmake/component_CCPP.mk | 11 ++++++----- tests/rtgen | 5 +---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/incmake/component_CCPP.mk b/src/incmake/component_CCPP.mk index 00cb6956..b71e5934 100644 --- a/src/incmake/component_CCPP.mk +++ b/src/incmake/component_CCPP.mk @@ -58,12 +58,13 @@ $(ccpp_mk): configure # Rule for cleaning intermediate files distclean_CCPP: clean_CCPP - set -x ; \ + set -xue ; \ + export PATH_CCPP="$(CCPP_SRCDIR)" ; \ cd $(ROOTDIR) ; \ - ./ccpp/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT) --clean ; \ - cd "$(CCPP_SRCDIR)" ; \ - rm -rf "$(CCPP_SRCDIR)/lib" ; \ - rm -rf "$(CCPP_SRCDIR)/include" ; \ + $$PATH_CCPP/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT) --clean ; \ + cd $$PATH_CCPP ; \ + rm -rf "$(CCPP_BINDIR)/lib" ; \ + rm -rf "$(CCPP_BINDIR)/include" ; \ rm -f $(ccpp_mk) clean_CCPP: diff --git a/tests/rtgen b/tests/rtgen index f1b1b0d2..ea0db17c 100755 --- a/tests/rtgen +++ b/tests/rtgen @@ -929,12 +929,9 @@ class RTGen(TestGen): out.write('module load emc-utils/1.0.0 ; export have_qoutql=YES\n') elif 'jet' in here.name: out.write('module load hpss\n') - out.write('module use /lfs3/projects/hwrf-vd/soft/modulefiles\n') - out.write('module load rocoto/1.3.0rc2\n') + out.write('module load rocoto/1.3.1\n') out.write('module use /misc/contrib/emc-utils/modulefiles\n') out.write('module load emc-utils/1.1.0\n') - #if produtil.fileop.find_exe('sbatch',raise_missing=False): - # out.write('module load slurm\n') out.write('have_qoutql=YES\n') elif here.name == 'hera': out.write('module use /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles/\n') From 22be22b0ad8836a6c8264075f79cbcca64ba74a7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 2 Nov 2019 07:31:38 +0900 Subject: [PATCH 5/5] Re-apply PR 11 (#15) * src/incmake/component_CCPP.mk: update CCPP source/install directories and set CCPP build directory (#11) * Update for NEMSCompsetRun on jet, bugfix for calling ccpp_prebuild.py in distclean phase (#12) * tests/rtgen: update to run NEMSCompsetRun on xjet * src/incmake/component_CCPP.mk: bugfix, correct path for calling ccpp_prebuild.py in distclean phase --- src/incmake/component_CCPP.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/incmake/component_CCPP.mk b/src/incmake/component_CCPP.mk index b71e5934..19575411 100644 --- a/src/incmake/component_CCPP.mk +++ b/src/incmake/component_CCPP.mk @@ -3,15 +3,18 @@ ccpp_mk=$(CCPP_BINDIR)/ccpp.mk all_component_mk_files+=$(ccpp_mk) # Location of source code and installation -CCPP_SRCDIR?=$(ROOTDIR)/ccpp -CCPP_BINDIR?=$(ROOTDIR)/ccpp +CCPP_SRCDIR?=$(ROOTDIR)/FV3/ccpp +CCPP_BINDIR?=$(ROOTDIR)/FV3/ccpp + +# Build directory - set to FV3 (later fv3atm) for old make (i.e. in-source) build +CCPP_BUILDDIR?=$(ROOTDIR)/FV3 # Make sure we have a model that supports CCPP: ifeq (,$(findstring FV3,$(COMPONENTS))) $(error CCPP requires FV3) else # Ensure the model is selected. - override CCPP_CONFOPT += --config=ccpp/config/ccpp_prebuild_config.py + override CCPP_CONFOPT += --config=$(CCPP_SRCDIR)/config/ccpp_prebuild_config.py --builddir=$(CCPP_BUILDDIR) override CCPP_MAKEOPT ?= $(FV3_MAKEOPT) override CCPP_BUILDOPT ?= $(FV3_BUILDOPT) endif @@ -47,7 +50,7 @@ $(ccpp_mk): configure set -xue ; \ export PATH_CCPP="$(CCPP_SRCDIR)" ; \ cd $(ROOTDIR) ; \ - ./ccpp/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT) ; \ + $$PATH_CCPP/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT) ; \ cd $$PATH_CCPP ; \ ./build_ccpp.sh ${BUILD_TARGET} "$$PATH_CCPP" $(ccpp_mk) \ "$(CCPP_MAKEOPT)" NO NO ; \