Updated optimised Makefile to run on lho and llo

gstlal-inspiral/share/O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0

@@ -19,30 +19,30 @@ LALSUITE_REPO:=${PWD}/git/lalsuite
 INSTALL_DIR:=${LAL_PATH}
 
 # Set to build from git (0 = repo, 1 = git)
-LALSUITE_GIT=1
-GSTLAL_GIT=1
+LALSUITE_GIT=0
+GSTLAL_GIT=0
 
 # Set package release versions
-GSTLALINSPIRAL=gstlal-inspiral-1.1.0
-GSTLALCALIBRATION=gstlal-calibration-1.0.6
-GSTLALUGLY=gstlal-ugly-1.1.0
-GSTLAL=gstlal-1.1.0
+GSTLALINSPIRAL=gstlal-inspiral-1.4.1
+GSTLALCALIBRATION=gstlal-calibration-1.1.4
+GSTLALUGLY=gstlal-ugly-1.3.1
+GSTLAL=gstlal-1.2.1
 DOXYGEN=doxygen-1.8.9.1
-PYLAL=pylal-0.12.0
-GLUE=glue-1.53.0
-LALAPPS=lalapps-6.20.0
-LALSTOCHASTIC=lalstochastic-1.1.19
-LALINFERENCE=lalinference-1.8.0
-LALPULSAR=lalpulsar-1.15.0
-LALINSPIRAL=lalinspiral-1.7.6
-LALDETCHAR=laldetchar-0.3.4
-LALBURST=lalburst-1.4.3
-LALSIMULATION=lalsimulation-1.6.1
-LALMETAIO=lalmetaio-1.3.0
-LALFRAME=lalframe-1.4.2
-LAL=lal-6.17.0
-GDS=gds-2.17.11
-LDASTOOLSFRAMECPP=ldas-tools-framecpp-2.5.4
+PYLAL=pylal-0.13.1
+GLUE=glue-1.54.1
+LALAPPS=lalapps-6.21.0
+LALSTOCHASTIC=lalstochastic-1.1.20
+LALINFERENCE=lalinference-1.9.0
+LALPULSAR=lalpulsar-1.16.0
+LALINSPIRAL=lalinspiral-1.7.7
+LALDETCHAR=laldetchar-0.3.5
+LALBURST=lalburst-1.4.4
+LALSIMULATION=lalsimulation-1.7.0
+LALMETAIO=lalmetaio-1.3.1
+LALFRAME=lalframe-1.4.3
+LAL=lal-6.18.0
+GDS=gds-2.17.13
+LDASTOOLSFRAMECPP=ldas-tools-framecpp-2.5.5
 LDASTOOLSAL=ldas-tools-al-2.5.6
 SWIG=swig-3.0.7
 METAIO=metaio-8.4.0
@@ -138,6 +138,8 @@ CORES:=8
 CLUSTER:=$(shell hostname -d)
 
 ICC_CIT:=/ldcg/intel/2016u1/bin/compilervars.sh
+ICC_LHO:=/ldcg/intel/2017u2/bin/compilervars.sh
+ICC_LLO:=/ldcg/intel/2017u2/bin/compilervars.sh
 ICC_UWM:=/opt/intel/bin/compilervars.sh
 ICC_ATLAS:=/opt/intel/2015/intel.sh
 
@@ -155,6 +157,12 @@ env.sh :
 	@if [ ${CLUSTER} = "ligo.caltech.edu" ] ; then \
 		echo "source ${ICC_CIT} intel64" >> $@ ; \
 		echo 'LDFLAGS_INTEL="-L${MKLROOT}/lib/intel64"' >> $@ ; \
+	elif [ ${CLUSTER} = "ligo-wa.caltech.edu" ] ; then \
+		echo "source ${ICC_LHO} intel64" >> $@ ; \
+		echo 'LDFLAGS_INTEL="-L${MKLROOT}/lib/intel64"' >> $@ ; \
+	elif [ ${CLUSTER} = "ligo-la.caltech.edu" ] ; then \
+		echo "source ${ICC_LLO} intel64" >> $@ ; \
+		echo 'LDFLAGS_INTEL="-L${MKLROOT}/lib/intel64"' >> $@ ; \
 	elif [ ${CLUSTER} = "nemo.uwm.edu" ] ; then \
 		echo "source ${ICC_UWM} intel64" >> $@ ; \
 		echo 'LDFLAGS_INTEL="-L/opt/intel/composer_xe_2015.5.223/mkl/lib/intel64"' >> $@ ; \
@@ -724,22 +732,22 @@ git-pull :
 
 $(LOGS_DIR) :
 	mkdir -p $(SRC_DIR) $(INSTALL_DIR) $(PATCH_DIR) $(LOGS_DIR) $(TAR_DIR)
-	if [ "${GSTLAL_GIT}" = "1" ]; then \
+	if [ "${LALSUITE_GIT}" = "1" ]; then \
 		if [ -f $@ ] ; then \
-			echo "Gstlal git repo exists" ; \
+			echo "Lalsuite git repo exists" ; \
 		else \
-			mkdir -p $(GSTLAL_REPO) ; \
+			mkdir -p $(LALSUITE_REPO) ; \
 			ecp-cookie-init LIGO.ORG https://versions.ligo.org/git $(USER) ; \
-			git clone https://versions.ligo.org/git/gstlal.git $(GSTLAL_REPO) ; \
+			git clone https://versions.ligo.org/git/lalsuite.git $(LALSUITE_REPO) ; \
 		fi ; \
 	fi ;
-	if [ "${LALSUITE_GIT}" = "1" ]; then \
+	if [ "${GSTLAL_GIT}" = "1" ]; then \
 		if [ -f $@ ] ; then \
-			echo "Lalsuite git repo exists" ; \
+			echo "Gstlal git repo exists" ; \
 		else \
-			mkdir -p $(LALSUITE_REPO) ; \
+			mkdir -p $(GSTLAL_REPO) ; \
 			ecp-cookie-init LIGO.ORG https://versions.ligo.org/git $(USER) ; \
-			git clone https://versions.ligo.org/git/lalsuite.git $(LALSUITE_REPO) ; \
+			git clone https://versions.ligo.org/git/gstlal.git $(GSTLAL_REPO) ; \
 		fi ; \
 	fi ;