Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for NEMSCompsetRun on jet, bugfix for calling ccpp_prebuild.py in distclean phase #12

Merged
merged 2 commits into from
Nov 1, 2019
Merged

Update for NEMSCompsetRun on jet, bugfix for calling ccpp_prebuild.py in distclean phase #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d76af3
tests/rtgen: update to run NEMSCompsetRun on xjet
climbfuji Oct 23, 2019
cb1f16d
src/incmake/component_CCPP.mk: bugfix, correct path for calling ccpp_…
climbfuji Oct 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/incmake/component_CCPP.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,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:
Expand Down
5 changes: 1 addition & 4 deletions tests/rtgen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down