[issm-svn] r20768 - in issm/trunk: configs externalpackages/metis externalpackages/triangle

[glperez at issm.ess.uci.edu]

Author: glperez
Date: 2016-06-17 12:47:12 -0700 (Fri, 17 Jun 2016)
New Revision: 20768

Added:
   issm/trunk/configs/config-win10.sh
   issm/trunk/externalpackages/metis/install-4.0-win10.sh
   issm/trunk/externalpackages/triangle/install-win10.sh
Removed:
   issm/trunk/externalpackages/metis/install-4.0-win7.sh
   issm/trunk/externalpackages/triangle/install-win7.sh
Log:

ADD: added a new config script for Windows 10.
MOV: Moved Triangle and Metis install scripts from Win7 to Win10.


Added: issm/trunk/configs/config-win10.sh
===================================================================
--- issm/trunk/configs/config-win10.sh	                        (rev 0)
+++ issm/trunk/configs/config-win10.sh	2016-06-17 19:47:12 UTC (rev 20768)
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+./configure --prefix=$ISSM_DIR \
+	--with-vendor=MSVC-Win64  \
+	--with-cxxoptflags='' \
+   --disable-static \
+	--enable-standalone-libraries \
+	--with-fortran=no  \
+	--without-Gia \
+	--without-kriging \
+	--without-kml \
+	--with-matlab-dir=$MATLAB_PATH \
+	--with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
+	--with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
+	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib/  \
+	--with-mpi-libdir="$ISSM_DIR/externalpackages/petsc/install/lib" \
+	--with-mpi-libflags="-Wl,libpetsc.lib" \
+	--with-mpi-include="$ISSM_DIR/externalpackages/petsc/install/include/petsc/mpiuni"

Copied: issm/trunk/externalpackages/metis/install-4.0-win10.sh (from rev 20767, issm/trunk/externalpackages/metis/install-4.0-win7.sh)
===================================================================
--- issm/trunk/externalpackages/metis/install-4.0-win10.sh	                        (rev 0)
+++ issm/trunk/externalpackages/metis/install-4.0-win10.sh	2016-06-17 19:47:12 UTC (rev 20768)
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -eu
+
+#Some cleanup
+rm -rf install metis-4.0
+mkdir install
+
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/metis-4.0.tar.gz' 'metis-4.0.tar.gz'
+
+#Untar 
+tar -zxvf  metis-4.0.tar.gz
+
+#Move metis into install directory
+mv metis-4.0/* install
+rm -rf metis-4.0
+
+#Apply patches
+cd install 
+patch -p1 < ../metis-4.0.patch
+patch -R Lib/Makefile ../configs/4.0/win7/Makefile.patch
+patch Makefile.in ../configs/4.0/win7/Makefile.in.patch
+
+#Compile
+make

Deleted: issm/trunk/externalpackages/metis/install-4.0-win7.sh
===================================================================
--- issm/trunk/externalpackages/metis/install-4.0-win7.sh	2016-06-17 19:16:48 UTC (rev 20767)
+++ issm/trunk/externalpackages/metis/install-4.0-win7.sh	2016-06-17 19:47:12 UTC (rev 20768)
@@ -1,25 +0,0 @@
-#!/bin/bash
-set -eu
-
-#Some cleanup
-rm -rf install metis-4.0
-mkdir install
-
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/metis-4.0.tar.gz' 'metis-4.0.tar.gz'
-
-#Untar 
-tar -zxvf  metis-4.0.tar.gz
-
-#Move metis into install directory
-mv metis-4.0/* install
-rm -rf metis-4.0
-
-#Apply patches
-cd install 
-patch -p1 < ../metis-4.0.patch
-patch -R Lib/Makefile ../configs/4.0/win7/Makefile.patch
-patch Makefile.in ../configs/4.0/win7/Makefile.in.patch
-
-#Compile
-make

Copied: issm/trunk/externalpackages/triangle/install-win10.sh (from rev 20767, issm/trunk/externalpackages/triangle/install-win7.sh)
===================================================================
--- issm/trunk/externalpackages/triangle/install-win10.sh	                        (rev 0)
+++ issm/trunk/externalpackages/triangle/install-win10.sh	2016-06-17 19:47:12 UTC (rev 20768)
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -eu
+
+#Some cleanup 
+rm -rf install triangle
+mkdir install
+
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/triangle.zip' 'triangle.zip'
+
+#Untar 
+cd install
+cp ../triangle.zip ./
+unzip triangle.zip
+
+#copy new makefile
+cp ../configs/win7/configure.make ./
+cp ../configs/win7/makefile ./
+
+#Compile triangle
+make
+
+#Patch triangle.h
+patch triangle.h ../triangle.h.patch
+cat triangle.h

Deleted: issm/trunk/externalpackages/triangle/install-win7.sh
===================================================================
--- issm/trunk/externalpackages/triangle/install-win7.sh	2016-06-17 19:16:48 UTC (rev 20767)
+++ issm/trunk/externalpackages/triangle/install-win7.sh	2016-06-17 19:47:12 UTC (rev 20768)
@@ -1,25 +0,0 @@
-#!/bin/bash
-set -eu
-
-#Some cleanup 
-rm -rf install triangle
-mkdir install
-
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/triangle.zip' 'triangle.zip'
-
-#Untar 
-cd install
-cp ../triangle.zip ./
-unzip triangle.zip
-
-#copy new makefile
-cp ../configs/win7/configure.make ./
-cp ../configs/win7/makefile ./
-
-#Compile triangle
-make
-
-#Patch triangle.h
-patch triangle.h ../triangle.h.patch
-cat triangle.h