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

gmtb/develop: update hera config #2

Merged
merged 2 commits into from
Aug 27, 2019
Merged

gmtb/develop: update hera config #2

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
028e1e8
Update src/incmake/env/rdhpcs/detect.mk, src/conf/module-setup.csh.in…
DomHeinzeller Aug 27, 2019
e142f4e
src/incmake/env/rdhpcs/detect.mk: test for hostname prefix, since her…
DomHeinzeller Aug 27, 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
3 changes: 1 addition & 2 deletions src/conf/module-setup.csh.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ if ( { test -d /lfs3 } ) then
source /apps/lmod/lmod/init/$__ms_shell
endif
module purge
#else if ( { test -d /scratch1 } ) then
else if ( { test -d /tds_scratch1 } ) then
else if ( { test -d /scratch1 } ) then
# We are on NOAA Hera
if ( ! { module help >& /dev/null } ) then
source /apps/lmod/lmod/init/$__ms_shell
Expand Down
3 changes: 1 addition & 2 deletions src/conf/module-setup.sh.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ if [[ -d /lfs3 ]] ; then
source /apps/lmod/lmod/init/$__ms_shell
fi
module purge
#elif [[ -d /scratch1 ]] ; then
elif [[ -d /tds_scratch1 ]] ; then
elif [[ -d /scratch1 ]] ; then
# We are on NOAA Hera
if ( ! eval module help > /dev/null 2>&1 ) ; then
source /apps/lmod/lmod/init/$__ms_shell
Expand Down
19 changes: 8 additions & 11 deletions src/incmake/env/rdhpcs/detect.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,21 @@
#
########################################################################

ifneq (,$(and $(wildcard /scratch4),$(wildcard /scratch3)))
ifneq (,$(and $(wildcard /scratch1),$(wildcard /scratch2),$(shell hostname | grep -i hfe)))
NEMS_COMPILER?=intel
$(call add_build_env,theia.$(NEMS_COMPILER),env/rdhpcs/theia.$(NEMS_COMPILER).mk)
$(call add_build_env,hera.$(NEMS_COMPILER),env/rdhpcs/hera.$(NEMS_COMPILER).mk)
else
ifneq (,$(and $(wildcard /lfs1),$(wildcard /lfs3)))
ifneq (,$(and $(wildcard /scratch4),$(wildcard /scratch3),$(shell hostname | grep -i tfe)))
NEMS_COMPILER?=intel
$(call add_build_env,jet.$(NEMS_COMPILER),env/rdhpcs/jet.$(NEMS_COMPILER).mk)
$(call add_build_env,theia.$(NEMS_COMPILER),env/rdhpcs/theia.$(NEMS_COMPILER).mk)
else
ifneq (,$(shell hostname | grep -i gaea))
ifneq (,$(and $(wildcard /lfs1),$(wildcard /lfs3)))
NEMS_COMPILER?=intel
$(call add_build_env,gaea.$(NEMS_COMPILER),env/rdhpcs/gaea.$(NEMS_COMPILER).mk)
$(call add_build_env,jet.$(NEMS_COMPILER),env/rdhpcs/jet.$(NEMS_COMPILER).mk)
else
# DH*
#ifneq (,$(and $(wildcard /scratch1),$(wildcard /scratch2)))
ifneq (,$(wildcard /tds_scratch1))
# *DH juno test system
ifneq (,$(shell hostname | grep -i gaea))
NEMS_COMPILER?=intel
$(call add_build_env,hera.$(NEMS_COMPILER),env/rdhpcs/hera.$(NEMS_COMPILER).mk)
$(call add_build_env,gaea.$(NEMS_COMPILER),env/rdhpcs/gaea.$(NEMS_COMPILER).mk)
endif
endif
endif
Expand Down