Changeset 19115

Timestamp:

02/17/15 18:44:05 (10 years ago)

Author:

glperez

Message:

CHG: Jenkins Window file now provides Metis dir.
CHG: Makefile.am in src/m install more python scripts.
CHG: Makefile.am in src/wrappers/python uses directory subojects.

Location:

issm/trunk-jpl

Files:

• jenkins/windows (modified) (2 diffs)
• src/m/Makefile.am (modified) (1 diff)
• src/wrappers/python/Makefile.am (modified) (1 diff)

issm/trunk-jpl/jenkins/windows

@@ -13 +13 @@
         --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
         --with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
+        --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib/  \
         --with-mpi-libdir="$ISSM_DIR/externalpackages/petsc/install/lib" \
@@ -48 +49 @@
                                                 cmake       install.sh                
                                                 petsc       install-3.1-win7.sh
+                                                metis       install-4.0-win7.sh
                                                 triangle    install-win7.sh        
                                                 matlab      install.sh

issm/trunk-jpl/src/m/Makefile.am

@@ -67 +67 @@
                                         ./coordsystems/*.py \
                                         ./interp/*.py \
+                                        ./inversions/*.py \
                                         ./mech/*.py \
                                         ./mesh/*.py \

issm/trunk-jpl/src/wrappers/python/Makefile.am

@@ -1 +1 @@
 AM_CPPFLAGS = @DAKOTAINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@ @AMPIINCL@
-#AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = subdir-objects
 
 EXEEXT=$(PYTHONWRAPPEREXT)