Changeset 12312

Timestamp:

06/01/12 12:37:28 (13 years ago)

Author:

schlegel

Message:

fixed cut and paste problem

File:

• issm/trunk-jpl/externalpackages/dakota/install-discover.sh (modified) (5 diffs)

issm/trunk-jpl/externalpackages/dakota/install-discover.sh

@@ -1 +1 @@
 #!/bin/bash
-
-echo "Currently, this script must be pasted line by line into the terminal"
 
 #Get number of cpus
@@ -8 +6 @@
 #Some cleanup
 rm -rf Dakota
-rm -rf src 
-rm -rf install 
-mkdir src install 
+rm -rf src
+rm -rf install
+mkdir src install
 
 #Download from ISSM server
@@ -33 +31 @@
 #Configure dakota
 cd src
-
-./configure \ 
-        --prefix="$ISSM_DIR/externalpackages/dakota/install/" \
-        --without-graphics  \
-        --with-pic \
-        --disable-mpi \
-        --with-blas="-L/usr/local/intel/mkl/10.1.2.024/lib/64/ -lmkl -lmkl_lapack -liomp5 -lpthread" \
-        --with-lapack="-L/usr/local/intel/mkl/10.1.2.024/lib/64/ -lmkl -lmkl_lapack -liomp5 -lpthread" 
-
+./configure \
+--prefix="$ISSM_DIR/externalpackages/dakota/install/" \
+--without-graphics  \
+--with-pic \
+--disable-mpi \
+--with-blas="-L/usr/local/intel/mkl/10.1.2.024/lib/64/ -lmkl -lmkl_lapack -liomp5 -lpthread" \
+--with-lapack="-L/usr/local/intel/mkl/10.1.2.024/lib/64/ -lmkl -lmkl_lapack -liomp5 -lpthread"
 cd ..
 
@@ -57 +53 @@
 
 cat ./src/methods/hopspack/src-cddlib/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp
-mv temp  ./src/methods/hopspack/src-cddlib/Makefile 
+mv temp  ./src/methods/hopspack/src-cddlib/Makefile
 
 cat ./src/methods/hopspack/src-shared/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp
-mv temp  ./src/methods/hopspack/src-shared/Makefile 
+mv temp  ./src/methods/hopspack/src-shared/Makefile
 
 cat ./src/methods/hopspack/src-shared/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2  -fPIC/g' > temp
-mv temp  ./src/methods/hopspack/src-shared/Makefile 
+mv temp  ./src/methods/hopspack/src-shared/Makefile
 
 cat ./src/methods/hopspack/src-conveyor/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp
-mv temp  ./src/methods/hopspack/src-conveyor/Makefile 
+mv temp  ./src/methods/hopspack/src-conveyor/Makefile
 
 cat ./src/methods/hopspack/src-appspack/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2  -fPIC/g' > temp
-mv temp ./src/methods/hopspack/src-appspack/Makefile 
+mv temp ./src/methods/hopspack/src-appspack/Makefile
 
 cat ./src/methods/acro/packages/colin/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp
@@ -78 +74 @@
 
 cat ./src/methods/acro/packages/tpl/3po/Makefile | sed 's/CFLAGS = -O2/CFLAGS = -O2 -fPIC/g' > temp
-mv temp  ./src/methods/acro/packages/tpl/3po/Makefile 
+mv temp  ./src/methods/acro/packages/tpl/3po/Makefile
 
 cat ./src/methods/acro/packages/tpl/3po/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CFLAGS = -O2 -fpermissive -fPIC/g' > temp
-mv temp  ./src/methods/acro/packages/tpl/3po/Makefile 
+mv temp  ./src/methods/acro/packages/tpl/3po/Makefile
 
 cat ./src/packages/ampl/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp
-mv temp  ./src/packages/ampl/Makefile 
+mv temp  ./src/packages/ampl/Makefile
 
 #Compile and install dakota
-cd src 
+cd src
 if [ -z $NUMCPUS ];
 then