From 16e1b9423b7d66b89d1ff016ae2b20be743043af Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Mon, 6 Apr 2020 08:58:02 -0400 Subject: [PATCH] add s4 rules (#49) --- src/conf/module-setup.csh.inc | 6 ++++++ src/conf/module-setup.sh.inc | 6 ++++++ src/incmake/buildenv.mk | 1 + src/incmake/env/ssec/detect.mk | 10 ++++++++++ src/incmake/env/ssec/s4.intel.mk | 7 +++++++ 5 files changed, 30 insertions(+) create mode 100644 src/incmake/env/ssec/detect.mk create mode 100644 src/incmake/env/ssec/s4.intel.mk diff --git a/src/conf/module-setup.csh.inc b/src/conf/module-setup.csh.inc index 1d72b8ef..15103ca8 100644 --- a/src/conf/module-setup.csh.inc +++ b/src/conf/module-setup.csh.inc @@ -14,6 +14,12 @@ else if ( { test -d /scratch1 -a ! -d /scratch } ) then source /apps/lmod/lmod/init/$__ms_shell endif module purge +else if ( { test -d /data } ) then + # We are on SSEC Wisconsin S4 + if ( ! { module help >& /dev/null } ) then + source /usr/share/lmod/lmod/init/$__ms_shell + endif + module purge else if ( { test -d /gpfs/hps -a -e /etc/SuSE-release } ) then # We are on NOAA Luna or Surge if ( ! { module help >& /dev/null } ) then diff --git a/src/conf/module-setup.sh.inc b/src/conf/module-setup.sh.inc index 7bd64f4c..ad71b406 100644 --- a/src/conf/module-setup.sh.inc +++ b/src/conf/module-setup.sh.inc @@ -28,6 +28,12 @@ elif [[ -d /scratch1 && ! -d /scratch ]] ; then source /apps/lmod/lmod/init/$__ms_shell fi module purge +elif [[ -d /data ]] ; then + # We are on SSEC Wisconsin S4 + if ( ! eval module help > /dev/null 2>&1 ) ; then + source /usr/share/lmod/lmod/init/$__ms_shell + fi + module purge elif [[ -d /gpfs/hps && -e /etc/SuSE-release ]] ; then # We are on NOAA Luna or Surge if ( ! eval module help > /dev/null 2>&1 ) ; then diff --git a/src/incmake/buildenv.mk b/src/incmake/buildenv.mk index 9c147782..dd5b46a1 100644 --- a/src/incmake/buildenv.mk +++ b/src/incmake/buildenv.mk @@ -63,6 +63,7 @@ include $(call locate_incmake_file,env/app_extras/detect.mk) include $(call locate_incmake_file,env/wcoss/detect.mk) include $(call locate_incmake_file,env/rdhpcs/detect.mk) include $(call locate_incmake_file,env/cisl/detect.mk) +include $(call locate_incmake_file,env/ssec/detect.mk) include $(call locate_incmake_file,env/intel/detect.mk) include $(call locate_incmake_file,env/tacc/detect.mk) include $(call locate_incmake_file,env/lrz/detect.mk) diff --git a/src/incmake/env/ssec/detect.mk b/src/incmake/env/ssec/detect.mk new file mode 100644 index 00000000..e5b6573b --- /dev/null +++ b/src/incmake/env/ssec/detect.mk @@ -0,0 +1,10 @@ +######################################################################## +# +# Main driver for SSEC Wisconsin S4 machine support +# +######################################################################## + +ifneq (,$(wildcard /data )) + NEMS_COMPILER?=intel + $(call add_build_env,s4.$(NEMS_COMPILER),env/ssec/s4.$(NEMS_COMPILER).mk) +endif diff --git a/src/incmake/env/ssec/s4.intel.mk b/src/incmake/env/ssec/s4.intel.mk new file mode 100644 index 00000000..95655421 --- /dev/null +++ b/src/incmake/env/ssec/s4.intel.mk @@ -0,0 +1,7 @@ +MACHINE_ID=s4 +FULL_MACHINE_ID=s4 +USE_MODULES=YES +DEFAULT_MODULE=$(FULL_MACHINE_ID)/ESMF_NUOPC +BUILD_TARGET=$(FULL_MACHINE_ID).$(NEMS_COMPILER) +NEMS_COMPILER=intel +MODULE_LOGIC=$(call ULIMIT_MODULE_LOGIC,60000)