[issm-svn] r12332 - issm/trunk
morlighe at issm.ess.uci.edu
morlighe at issm.ess.uci.edu
Fri Jun 1 17:27:43 PDT 2012
Author: morlighe
Date: 2012-06-01 17:27:43 -0700 (Fri, 01 Jun 2012)
New Revision: 12332
Added:
issm/trunk/configs/config-arm-linux.sh
issm/trunk/configs/config-discover.sh
issm/trunk/configs/config-linux64-ad.sh
issm/trunk/configs/config-linux64-astrid-mpich1.0.sh
issm/trunk/configs/config-linux64-ubuntu64.sh
issm/trunk/configs/config-macosx64-ad.sh
issm/trunk/configs/config-macosx64-gsl.sh
issm/trunk/configs/config-macosx64-helene.sh
issm/trunk/configs/config-macosx64-larour-bothapis.sh
issm/trunk/externalpackages/android/
issm/trunk/externalpackages/android/android-emulators/
issm/trunk/externalpackages/android/android-ndk/
issm/trunk/externalpackages/android/android-ndk/install.sh
issm/trunk/externalpackages/android/android-sdk/
issm/trunk/externalpackages/android/android-sdk/install.sh
issm/trunk/externalpackages/blas/
issm/trunk/externalpackages/blas/configs/
issm/trunk/externalpackages/blas/configs/linux64/
issm/trunk/externalpackages/blas/configs/linux64/make.inc
issm/trunk/externalpackages/blas/install-linux64.sh
issm/trunk/externalpackages/dakota/install-discover.sh
issm/trunk/externalpackages/distribute/
issm/trunk/externalpackages/distribute/install.sh
issm/trunk/externalpackages/freetype/
issm/trunk/externalpackages/freetype/install.sh
issm/trunk/externalpackages/gdaltokmz/install.sh
issm/trunk/externalpackages/git/
issm/trunk/externalpackages/git/install.sh
issm/trunk/externalpackages/gsl/install-android-4.0.sh
issm/trunk/externalpackages/gsl/install-linux64.sh
issm/trunk/externalpackages/gsl/install-pleiades.sh
issm/trunk/externalpackages/gslib/
issm/trunk/externalpackages/gslib/install.sh
issm/trunk/externalpackages/ipython/
issm/trunk/externalpackages/ipython/install.sh
issm/trunk/externalpackages/kml/install.sh
issm/trunk/externalpackages/lapack/
issm/trunk/externalpackages/lapack/configs/
issm/trunk/externalpackages/lapack/configs/linux64/
issm/trunk/externalpackages/lapack/configs/linux64/make.inc
issm/trunk/externalpackages/lapack/install-linux64.sh
issm/trunk/externalpackages/libermate/
issm/trunk/externalpackages/libermate/install.sh
issm/trunk/externalpackages/libpng/
issm/trunk/externalpackages/libpng/install.sh
issm/trunk/externalpackages/matplotlib/
issm/trunk/externalpackages/matplotlib/install-osx.sh
issm/trunk/externalpackages/matplotlib/install.sh
issm/trunk/externalpackages/metis/configs/4.0/discover/
issm/trunk/externalpackages/metis/configs/4.0/discover/Makefile.in.patch
issm/trunk/externalpackages/metis/install-4.0-discover.sh
issm/trunk/externalpackages/octave/
issm/trunk/externalpackages/octave/install.sh
issm/trunk/externalpackages/petsc/install-3.1-ubuntu64.sh
issm/trunk/externalpackages/petsc/install-3.2-discover.sh
issm/trunk/externalpackages/pyclips/
issm/trunk/externalpackages/pyclips/install.sh
issm/trunk/externalpackages/python/install-linux64-astrid.sh
issm/trunk/externalpackages/python/install-macosx-lion.sh
issm/trunk/externalpackages/python/install-macosx-snowleopard.sh
issm/trunk/externalpackages/readline/
issm/trunk/externalpackages/readline/install.sh
issm/trunk/externalpackages/scipy/install-linux64.sh
issm/trunk/externalpackages/scipy/install-macosx-lion.sh
issm/trunk/externalpackages/scipy/install-macosx-snowleopard.sh
issm/trunk/externalpackages/windows/install.sh
issm/trunk/scripts/DownloadExternalPackage.py
issm/trunk/scripts/mail
issm/trunk/test/NightlyRun/test102.py
issm/trunk/test/NightlyRun/test137.m
issm/trunk/test/NightlyRun/test527.m
issm/trunk/test/Par/SquareShelfConstrained.py
Removed:
issm/trunk/configs/config-linux64-astrid-mpich1.4.sh
issm/trunk/externalpackages/adolc/ADOL-C-2.2.0.tar.gz
issm/trunk/externalpackages/android-dev-dir/
issm/trunk/externalpackages/android-ndk/
issm/trunk/externalpackages/android-sdk/
issm/trunk/externalpackages/android/android-emulators/
issm/trunk/externalpackages/android/android-ndk/
issm/trunk/externalpackages/android/android-ndk/install.sh
issm/trunk/externalpackages/android/android-sdk/
issm/trunk/externalpackages/android/android-sdk/install.sh
issm/trunk/externalpackages/autoconf/autoconf-2.68.tar.gz
issm/trunk/externalpackages/automake/automake-1.11.3.tar.gz
issm/trunk/externalpackages/bbftp/bbftp-client-3.2.0.tar.gz
issm/trunk/externalpackages/blas/configs/
issm/trunk/externalpackages/blas/configs/linux64/
issm/trunk/externalpackages/blas/configs/linux64/make.inc
issm/trunk/externalpackages/blas/install-linux64.sh
issm/trunk/externalpackages/boost/boost_1_49_0.tar.gz
issm/trunk/externalpackages/bsdtar/libarchive-3.0.3.tar.gz
issm/trunk/externalpackages/cccl/cccl-0.03.tar.gz
issm/trunk/externalpackages/chaco/Chaco-2.2.tar.gz
issm/trunk/externalpackages/cmake/cmake-2.8.5.tar.gz
issm/trunk/externalpackages/colpack/ColPack-1.0.3.tar.gz
issm/trunk/externalpackages/cppcheck/cppcheck-1.48.tar
issm/trunk/externalpackages/dace/dace.zip
issm/trunk/externalpackages/dakota/Dakota_4_3.src.tar.gz
issm/trunk/externalpackages/distribute/install.sh
issm/trunk/externalpackages/doxygen/doxygen-1.7.4.src.tar.gz
issm/trunk/externalpackages/dyson/codescan.zip
issm/trunk/externalpackages/findbugs/findbugs-1.3.9.tar.gz
issm/trunk/externalpackages/freetype/install.sh
issm/trunk/externalpackages/gdal/gdal-1.6.0.tar.gz
issm/trunk/externalpackages/gdaltokmz/gdaltokmz-1.0.tar.gz
issm/trunk/externalpackages/git/install.sh
issm/trunk/externalpackages/gmake/make-3.82.tar.gz
issm/trunk/externalpackages/graphviz/graphviz-2.24.0.tar.gz
issm/trunk/externalpackages/gsl/gsl-1.15.tar.gz
issm/trunk/externalpackages/gsl/install-linux64-murdo.sh
issm/trunk/externalpackages/gslib/install.sh
issm/trunk/externalpackages/ipython/install.sh
issm/trunk/externalpackages/kml/kml_shapefile.zip
issm/trunk/externalpackages/lapack/configs/
issm/trunk/externalpackages/lapack/configs/linux64/
issm/trunk/externalpackages/lapack/configs/linux64/make.inc
issm/trunk/externalpackages/lapack/install-linux64.sh
issm/trunk/externalpackages/latex2rtf/latex2rtf-2.0.0.tar.gz
issm/trunk/externalpackages/libermate/install.sh
issm/trunk/externalpackages/libpng/install.sh
issm/trunk/externalpackages/libtool/libtool-2.2.6b.tar.gz
issm/trunk/externalpackages/m2html/m2html.zip
issm/trunk/externalpackages/matplotlib/install-osx.sh
issm/trunk/externalpackages/matplotlib/install.sh
issm/trunk/externalpackages/mercurial/mercurial-1.7.3.tar.gz
issm/trunk/externalpackages/merge/
issm/trunk/externalpackages/metis/configs/4.0/discover/Makefile.in.patch
issm/trunk/externalpackages/metis/metis-4.0.tar.gz
issm/trunk/externalpackages/metis/metis-5.0.1.tar.gz
issm/trunk/externalpackages/modelE/modelE_AR5_branch.2012.03.13_10.12.21.tgz
issm/trunk/externalpackages/mpich2/mpich2-1.0.2p1.tar.gz
issm/trunk/externalpackages/mpich2/mpich2-1.4.tar.gz
issm/trunk/externalpackages/ncview/ncview-1.93g.tar.gz
issm/trunk/externalpackages/netcdf/netcdf-4.0.1.tar.gz
issm/trunk/externalpackages/octave/install.sh
issm/trunk/externalpackages/oofem/oofem-2.0.tar.gz
issm/trunk/externalpackages/pcre/pcre-8.21.tar.gz
issm/trunk/externalpackages/petsc/petsc-2.3.2-p3.tar.gz
issm/trunk/externalpackages/petsc/petsc-3.1-p7.tar.gz
issm/trunk/externalpackages/petsc/petsc-3.2-p3.tar.gz
issm/trunk/externalpackages/polygonclipper/PolygonClipper.zip
issm/trunk/externalpackages/pyclips/install.sh
issm/trunk/externalpackages/python/Python-2.7.2.tgz
issm/trunk/externalpackages/python/Python-3.2.2.tgz
issm/trunk/externalpackages/python/install.sh
issm/trunk/externalpackages/qhull/qhull-2003.1.tar.gz
issm/trunk/externalpackages/rats/rats-2.3.tar.gz
issm/trunk/externalpackages/readline/install.sh
issm/trunk/externalpackages/rose/rose-0.9.5a-13219.tar.gz
issm/trunk/externalpackages/satstress/SatStress-0.1.2.tar.gz
issm/trunk/externalpackages/scipy/install-macosx64.sh
issm/trunk/externalpackages/scotch/scotch_5.1.6.tar.gz
issm/trunk/externalpackages/scotch/scotch_5.1.6_esmumps.tar.gz
issm/trunk/externalpackages/shapelib/shape_eg_data.zip
issm/trunk/externalpackages/shapelib/shapelib-1.2.10.tar.gz
issm/trunk/externalpackages/slepc/slepc-2.3.2.tgz
issm/trunk/externalpackages/ssh/plink.exe
issm/trunk/externalpackages/ssh/pscp.exe
issm/trunk/externalpackages/swig/swig-2.0.4.tar.gz
issm/trunk/externalpackages/swig/swigwin-2.0.4.zip
issm/trunk/externalpackages/tao/tao-2.0-p3.tar.gz
issm/trunk/externalpackages/tex2im/tex2im-1.8.tar.gz
issm/trunk/externalpackages/triangle/triangle.zip
issm/trunk/externalpackages/valgrind/valgrind-3.7.0.tar.bz2
issm/trunk/externalpackages/vim/vim-7.2.tar.bz2
issm/trunk/externalpackages/windows/Sdk1.png
issm/trunk/externalpackages/windows/Sdk2.png
issm/trunk/externalpackages/windows/win7.sdk7.1.exe
issm/trunk/externalpackages/xerces/xerces-c-src_2_8_0.tar.gz
issm/trunk/externalpackages/yams/yams2-linux.gz
issm/trunk/externalpackages/yams/yams2-osx.gz
issm/trunk/externalpackages/yams/yams2-win.exe
issm/trunk/test/NightlyRun/test101.m
issm/trunk/test/NightlyRun/test101.py
issm/trunk/test/NightlyRun/test103.m
issm/trunk/test/NightlyRun/test105.m
issm/trunk/test/NightlyRun/test107.m
issm/trunk/test/NightlyRun/test109.m
issm/trunk/test/NightlyRun/test111.m
issm/trunk/test/NightlyRun/test113.m
issm/trunk/test/NightlyRun/test115.m
issm/trunk/test/NightlyRun/test117.m
issm/trunk/test/NightlyRun/test119.m
issm/trunk/test/NightlyRun/test121.m
issm/trunk/test/NightlyRun/test123.m
issm/trunk/test/NightlyRun/test125.m
issm/trunk/test/NightlyRun/test127.m
issm/trunk/test/NightlyRun/test129.m
issm/trunk/test/NightlyRun/test131.m
issm/trunk/test/NightlyRun/test133.m
issm/trunk/test/NightlyRun/test135.m
issm/trunk/test/NightlyRun/test137.m
issm/trunk/test/NightlyRun/test139.m
issm/trunk/test/NightlyRun/test141.m
issm/trunk/test/NightlyRun/test143.m
issm/trunk/test/NightlyRun/test201.m
issm/trunk/test/NightlyRun/test203.m
issm/trunk/test/NightlyRun/test205.m
issm/trunk/test/NightlyRun/test207.m
issm/trunk/test/NightlyRun/test209.m
issm/trunk/test/NightlyRun/test211.m
issm/trunk/test/NightlyRun/test213.m
issm/trunk/test/NightlyRun/test215.m
issm/trunk/test/NightlyRun/test217.m
issm/trunk/test/NightlyRun/test219.m
issm/trunk/test/NightlyRun/test221.m
issm/trunk/test/NightlyRun/test223.m
issm/trunk/test/NightlyRun/test225.m
issm/trunk/test/NightlyRun/test227.m
issm/trunk/test/NightlyRun/test229.m
issm/trunk/test/NightlyRun/test233.m
issm/trunk/test/NightlyRun/test235.m
issm/trunk/test/NightlyRun/test237.m
issm/trunk/test/NightlyRun/test239.m
issm/trunk/test/NightlyRun/test241.m
issm/trunk/test/NightlyRun/test243.m
issm/trunk/test/NightlyRun/test245.m
issm/trunk/test/NightlyRun/test247.m
issm/trunk/test/NightlyRun/test249.m
issm/trunk/test/NightlyRun/test251.m
issm/trunk/test/NightlyRun/test253.m
issm/trunk/test/NightlyRun/test255.m
issm/trunk/test/NightlyRun/test257.m
issm/trunk/test/NightlyRun/test259.m
issm/trunk/test/NightlyRun/test261.m
issm/trunk/test/NightlyRun/test263.m
issm/trunk/test/NightlyRun/test265.m
issm/trunk/test/NightlyRun/test267.m
issm/trunk/test/NightlyRun/test301.m
issm/trunk/test/NightlyRun/test303.m
issm/trunk/test/NightlyRun/test305.m
issm/trunk/test/NightlyRun/test307.m
issm/trunk/test/NightlyRun/test309.m
issm/trunk/test/NightlyRun/test311.m
issm/trunk/test/NightlyRun/test313.m
issm/trunk/test/NightlyRun/test315.m
issm/trunk/test/NightlyRun/test317.m
issm/trunk/test/NightlyRun/test319.m
issm/trunk/test/NightlyRun/test321.m
issm/trunk/test/NightlyRun/test323.m
issm/trunk/test/NightlyRun/test325.m
issm/trunk/test/NightlyRun/test327.m
issm/trunk/test/NightlyRun/test329.m
issm/trunk/test/NightlyRun/test331.m
issm/trunk/test/NightlyRun/test333.m
issm/trunk/test/NightlyRun/test335.m
issm/trunk/test/NightlyRun/test337.m
issm/trunk/test/NightlyRun/test339.m
issm/trunk/test/NightlyRun/test341.m
issm/trunk/test/NightlyRun/test343.m
issm/trunk/test/NightlyRun/test345.m
issm/trunk/test/NightlyRun/test347.m
issm/trunk/test/NightlyRun/test349.m
issm/trunk/test/NightlyRun/test351.m
issm/trunk/test/NightlyRun/test353.m
issm/trunk/test/NightlyRun/test401.m
issm/trunk/test/NightlyRun/test403.m
issm/trunk/test/NightlyRun/test405.m
issm/trunk/test/NightlyRun/test407.m
issm/trunk/test/NightlyRun/test409.m
issm/trunk/test/NightlyRun/test411.m
issm/trunk/test/NightlyRun/test413.m
issm/trunk/test/NightlyRun/test415.m
issm/trunk/test/NightlyRun/test417.m
issm/trunk/test/NightlyRun/test419.m
issm/trunk/test/NightlyRun/test421.m
issm/trunk/test/NightlyRun/test423.m
issm/trunk/test/NightlyRun/test425.m
issm/trunk/test/NightlyRun/test427.m
issm/trunk/test/NightlyRun/test429.m
issm/trunk/test/NightlyRun/test431.m
issm/trunk/test/NightlyRun/test435.m
issm/trunk/test/NightlyRun/test437.m
issm/trunk/test/NightlyRun/test439.m
issm/trunk/test/NightlyRun/test441.m
issm/trunk/test/NightlyRun/test443.m
issm/trunk/test/NightlyRun/test445.m
issm/trunk/test/NightlyRun/test447.m
issm/trunk/test/NightlyRun/test449.m
issm/trunk/test/NightlyRun/test451.m
issm/trunk/test/NightlyRun/test453.m
issm/trunk/test/NightlyRun/test455.m
issm/trunk/test/NightlyRun/test457.m
issm/trunk/test/NightlyRun/test459.m
issm/trunk/test/NightlyRun/test461.m
issm/trunk/test/NightlyRun/test463.m
issm/trunk/test/NightlyRun/test501.m
issm/trunk/test/NightlyRun/test503.m
issm/trunk/test/NightlyRun/test505.m
issm/trunk/test/NightlyRun/test507.m
issm/trunk/test/NightlyRun/test509.m
issm/trunk/test/NightlyRun/test511.m
issm/trunk/test/NightlyRun/test513.m
issm/trunk/test/NightlyRun/test515.m
issm/trunk/test/NightlyRun/test517.m
issm/trunk/test/NightlyRun/test519.m
issm/trunk/test/NightlyRun/test521.m
issm/trunk/test/NightlyRun/test523.m
issm/trunk/test/NightlyRun/test525.m
issm/trunk/test/NightlyRun/test527.m
issm/trunk/test/NightlyRun/test529.m
issm/trunk/test/NightlyRun/test531.m
issm/trunk/test/NightlyRun/test601.m
issm/trunk/test/NightlyRun/test603.m
issm/trunk/test/NightlyRun/test605.m
issm/trunk/test/NightlyRun/test607.m
issm/trunk/test/NightlyRun/test609.m
issm/trunk/test/NightlyRun/test611.m
issm/trunk/test/NightlyRun/test613.m
issm/trunk/test/NightlyRun/test615.m
issm/trunk/test/NightlyRun/test617.m
issm/trunk/test/NightlyRun/test619.m
issm/trunk/test/NightlyRun/test621.m
issm/trunk/test/NightlyRun/test623.m
issm/trunk/test/NightlyRun/test625.m
Modified:
issm/trunk/
issm/trunk/README
issm/trunk/README.rtf
issm/trunk/bin/
issm/trunk/configs/config-altix64-castor.sh
issm/trunk/configs/config-cosmos.sh
issm/trunk/configs/config-greenplanet.sh
issm/trunk/configs/config-linux64-astrid-ad.sh
issm/trunk/configs/config-linux64-astrid-petsc2.sh
issm/trunk/configs/config-linux64-astrid.sh
issm/trunk/configs/config-linux64-murdo-ad.sh
issm/trunk/configs/config-linux64-murdo-nopetsc.sh
issm/trunk/configs/config-linux64-murdo.sh
issm/trunk/configs/config-macosx32-mathieu.sh
issm/trunk/configs/config-macosx32-ogive.sh
issm/trunk/configs/config-macosx64-larour-ad.sh
issm/trunk/configs/config-macosx64-larour-nopetsc.sh
issm/trunk/configs/config-macosx64-larour-python.sh
issm/trunk/configs/config-macosx64-larour.sh
issm/trunk/configs/config-macosx64-mathieu.sh
issm/trunk/configs/config-macosx64-nicole.sh
issm/trunk/configs/config-macosx64-ogive.sh
issm/trunk/configs/config-macosx64-sophie.sh
issm/trunk/configs/config-pleiades-petsc2.sh
issm/trunk/configs/config-pleiades.sh
issm/trunk/configs/config-win32-eric.sh
issm/trunk/configs/config-win7-32.sh
issm/trunk/configs/config-win7-64.sh
issm/trunk/configure.ac
issm/trunk/cron/configs/linux64_daily
issm/trunk/cron/configs/linux64_nightly
issm/trunk/cron/configs/macosx64_daily
issm/trunk/cron/configs/macosx64_nightly
issm/trunk/cron/configs/win732
issm/trunk/cron/configs/win764
issm/trunk/cron/configs/winxp32
issm/trunk/cron/nightlyrun.sh
issm/trunk/etc/environment.csh
issm/trunk/etc/environment.sh
issm/trunk/etc/environment_variables.csh
issm/trunk/etc/environment_variables.sh
issm/trunk/externalpackages/adic/install.sh
issm/trunk/externalpackages/adolc/install.sh
issm/trunk/externalpackages/autoconf/install.sh
issm/trunk/externalpackages/automake/install.sh
issm/trunk/externalpackages/bbftp/install.sh
issm/trunk/externalpackages/boost/install.sh
issm/trunk/externalpackages/bsdtar/install-win7.sh
issm/trunk/externalpackages/cccl/install-win7.orig.sh
issm/trunk/externalpackages/cccl/issm/cccl
issm/trunk/externalpackages/chaco/install.sh
issm/trunk/externalpackages/cmake/install.sh
issm/trunk/externalpackages/colpack/install.sh
issm/trunk/externalpackages/cppcheck/install.sh
issm/trunk/externalpackages/dace/install.sh
issm/trunk/externalpackages/dakota/install-altix64-cosmos.sh
issm/trunk/externalpackages/dakota/install-linux64-astrid.sh
issm/trunk/externalpackages/dakota/install-linux64-murdo.sh
issm/trunk/externalpackages/dakota/install-macosx64.sh
issm/trunk/externalpackages/dakota/install-pleiades.sh
issm/trunk/externalpackages/doxygen/install.sh
issm/trunk/externalpackages/findbugs/install.sh
issm/trunk/externalpackages/gdal/install.sh
issm/trunk/externalpackages/gmake/install.sh
issm/trunk/externalpackages/graphviz/install.sh
issm/trunk/externalpackages/gsl/install-macosx64.sh
issm/trunk/externalpackages/latex2rtf/install.sh
issm/trunk/externalpackages/libtool/install.sh
issm/trunk/externalpackages/m2html/install.sh
issm/trunk/externalpackages/mercurial/install.sh
issm/trunk/externalpackages/metis/install-4.0-altix64.sh
issm/trunk/externalpackages/metis/install-4.0-cosmos.sh
issm/trunk/externalpackages/metis/install-4.0-greenplanet.sh
issm/trunk/externalpackages/metis/install-4.0-linux64.sh
issm/trunk/externalpackages/metis/install-4.0-macosx32.sh
issm/trunk/externalpackages/metis/install-4.0-macosx64.sh
issm/trunk/externalpackages/metis/install-4.0-pleiades.sh
issm/trunk/externalpackages/metis/install-4.0-win32.sh
issm/trunk/externalpackages/metis/install-4.0-win7.sh
issm/trunk/externalpackages/metis/install-5.0.1-linux64.sh
issm/trunk/externalpackages/modelE/install.sh
issm/trunk/externalpackages/mpich2/install-1.0.2-altix64.sh
issm/trunk/externalpackages/mpich2/install-1.0.2-linux64.sh
issm/trunk/externalpackages/mpich2/install-1.0.2-macosx32.sh
issm/trunk/externalpackages/mpich2/install-1.0.2-win32.sh
issm/trunk/externalpackages/mpich2/install-1.4-linux64.sh
issm/trunk/externalpackages/mpich2/install-1.4-macosx32.sh
issm/trunk/externalpackages/mpich2/install-1.4-macosx64.sh
issm/trunk/externalpackages/ncview/install.sh
issm/trunk/externalpackages/netcdf/install.sh
issm/trunk/externalpackages/nose/
issm/trunk/externalpackages/nose/install-macosx64sh
issm/trunk/externalpackages/oofem/install.sh
issm/trunk/externalpackages/pcre/install.sh
issm/trunk/externalpackages/petsc/install-2.3.2-altix64-castor.sh
issm/trunk/externalpackages/petsc/install-2.3.2-cosmos.sh
issm/trunk/externalpackages/petsc/install-2.3.2-linux64-astrid.sh
issm/trunk/externalpackages/petsc/install-2.3.2-macosx32-eric.sh
issm/trunk/externalpackages/petsc/install-2.3.2-macosx32-ogive.sh
issm/trunk/externalpackages/petsc/install-2.3.2-macosx64.sh
issm/trunk/externalpackages/petsc/install-2.3.2-pleiades.sh
issm/trunk/externalpackages/petsc/install-2.3.2-win32-eric.sh
issm/trunk/externalpackages/petsc/install-2.3.2-win7.sh
issm/trunk/externalpackages/petsc/install-3.1-altix64-castor.sh
issm/trunk/externalpackages/petsc/install-3.1-cosmos.sh
issm/trunk/externalpackages/petsc/install-3.1-linux64-astrid.sh
issm/trunk/externalpackages/petsc/install-3.1-macosx32-mathieu.sh
issm/trunk/externalpackages/petsc/install-3.1-macosx32-ogive.sh
issm/trunk/externalpackages/petsc/install-3.1-pleiades.sh
issm/trunk/externalpackages/petsc/install-3.1-win7.sh
issm/trunk/externalpackages/petsc/install-3.2-greenplanet.sh
issm/trunk/externalpackages/petsc/install-3.2-linux64.sh
issm/trunk/externalpackages/petsc/install-3.2-macosx64.sh
issm/trunk/externalpackages/petsc/install-3.2-pleiades.sh
issm/trunk/externalpackages/petsc/install-dev-linux64.sh
issm/trunk/externalpackages/polygonclipper/install.sh
issm/trunk/externalpackages/python/
issm/trunk/externalpackages/qhull/install.sh
issm/trunk/externalpackages/rats/install.sh
issm/trunk/externalpackages/rose/install.sh
issm/trunk/externalpackages/satstress/install.sh
issm/trunk/externalpackages/scipy/
issm/trunk/externalpackages/scipy/README
issm/trunk/externalpackages/scotch/install.sh
issm/trunk/externalpackages/shapelib/install.sh
issm/trunk/externalpackages/slepc/install.sh
issm/trunk/externalpackages/swig/install.sh
issm/trunk/externalpackages/tao/install.sh
issm/trunk/externalpackages/tex2im/install.sh
issm/trunk/externalpackages/triangle/
issm/trunk/externalpackages/triangle/configs/android/android-4.0/configure.make
issm/trunk/externalpackages/triangle/install-altix64.sh
issm/trunk/externalpackages/triangle/install-android-4.0.sh
issm/trunk/externalpackages/triangle/install-linux64.sh
issm/trunk/externalpackages/triangle/install-macosx32.sh
issm/trunk/externalpackages/triangle/install-macosx64.sh
issm/trunk/externalpackages/triangle/install-pleiades.sh
issm/trunk/externalpackages/triangle/install-win32.sh
issm/trunk/externalpackages/triangle/install-win7.sh
issm/trunk/externalpackages/triangle/triangle.c.patch.python
issm/trunk/externalpackages/valgrind/install-altix64.sh
issm/trunk/externalpackages/valgrind/install-linux64.sh
issm/trunk/externalpackages/valgrind/install-macosx32.sh
issm/trunk/externalpackages/valgrind/install-macosx64.sh
issm/trunk/externalpackages/valgrind/install-win32.sh
issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim
issm/trunk/externalpackages/vim/install.sh
issm/trunk/externalpackages/windows/InstallInstructions.txt
issm/trunk/externalpackages/windows/configs/sdk7.1.win7-32.sh
issm/trunk/externalpackages/windows/configs/sdk7.1.win7-64.sh
issm/trunk/externalpackages/windows/windows_environment.sh
issm/trunk/externalpackages/xerces/install.sh
issm/trunk/externalpackages/yams/install.sh
issm/trunk/m4/issm_options.m4
issm/trunk/scripts/GenerateReferences.sh
issm/trunk/scripts/archive.sh
issm/trunk/scripts/automakererun.sh
issm/trunk/scripts/cloc2html.py
issm/trunk/scripts/convertmatlabclasses.py
issm/trunk/scripts/dailyrun.sh
issm/trunk/scripts/getloc.sh
issm/trunk/scripts/issmconfiguration.sh
issm/trunk/scripts/report.sh
issm/trunk/scripts/run.sh
issm/trunk/scripts/windowsbuild.sh
issm/trunk/startup.m
issm/trunk/startup.py
issm/trunk/test/NightlyRun/runme.m
issm/trunk/test/NightlyRun/test448.m
issm/trunk/test/NightlyRun/test450.m
issm/trunk/test/NightlyRun/test452.m
Log:
merged trunk-jpl and trunk for revision 12326M
Property changes on: issm/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /issm/trunk-jpl:10936-11994
+ /issm/trunk-jpl:10936-11994,11996-12326
Modified: issm/trunk/README
===================================================================
--- issm/trunk/README 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/README 2012-06-02 00:27:43 UTC (rev 12332)
@@ -22,7 +22,7 @@
------------------------------------------------------------------------------
-Website: ttp://issm.jpl.nasa.gov/ for additional information.
+Website: http://issm.jpl.nasa.gov/ for additional information.
------------------------------------------------------------------------------
Modified: issm/trunk/README.rtf
===================================================================
--- issm/trunk/README.rtf 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/README.rtf 2012-06-02 00:27:43 UTC (rev 12332)
@@ -23,7 +23,7 @@
\par
------------------------------------------------------------------------------\par
\par
-Website: ttp://issm.jpl.nasa.gov/ for additional information.\par
+Website: http://issm.jpl.nasa.gov/ for additional information.\par
\par
------------------------------------------------------------------------------\par
\par
Property changes on: issm/trunk/bin
___________________________________________________________________
Modified: svn:ignore
- *.mexa64
*.mexw64
*.mexw32
Makefile
Makefile.in
issm.exe
*.m
*.h
@pairoptions
@modellist
*.bat
*.rtf
+ *.mexa64
*.mexw64
*.mexw32
Makefile
Makefile.in
issm.exe
*.m
*.h
@pairoptions
@modellist
*.bat
*.rtf
*.py
Modified: issm/trunk/configs/config-altix64-castor.sh
===================================================================
--- issm/trunk/configs/config-altix64-castor.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-altix64-castor.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,3 +1,3 @@
#!/bin/csh
-./configure --prefix=$ISSM_TIER --with-serial=no --with-metis-dir=$ISSM_TIER/externalpackages/metis/install --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install --with-mpi-include=/usr/include --with-mpi-lib="-L/usr/lib -lmpi" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install --with-mkl-dir=/opt/intel/mkl/9.1.023/lib/64 --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH/ --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH --with-graphics-lib=/usr/X11R6/lib/libX11.so
+./configure --prefix=$ISSM_DIR --with-serial=no --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-mpi-include=/usr/include --with-mpi-lib="-L/usr/lib -lmpi" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-mkl-dir=/opt/intel/mkl/9.1.023/lib/64 --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH/ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH --with-graphics-lib=/usr/X11R6/lib/libX11.so
Modified: issm/trunk/configs/config-cosmos.sh
===================================================================
--- issm/trunk/configs/config-cosmos.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-cosmos.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,3 +1,3 @@
#!/bin/csh
-./configure --prefix=$ISSM_TIER --with-serial=no --with-metis-dir=$ISSM_TIER/externalpackages/metis/install --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install --with-mpi-include=/opt/mpich/gm/intel10.1/include --with-mpi-lib="-L/opt/mpich/gm/intel10.1/lib -lmpich -L/usr/local/gm/lib/ -lgm -lpthread -lrt" --with-petsc-arch=$ISSM_ARCH --with-mkl-dir=/opt/intel/mkl/10.0.5.025/lib/32/ --with-plapack-dir="-L$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH/ --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH --with-vendor=intel-linux --with-graphics-lib=/usr/X11R6/lib/libX11.so
+./configure --prefix=$ISSM_DIR --with-serial=no --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-mpi-include=/opt/mpich/gm/intel10.1/include --with-mpi-lib="-L/opt/mpich/gm/intel10.1/lib -lmpich -L/usr/local/gm/lib/ -lgm -lpthread -lrt" --with-petsc-arch=$ISSM_ARCH --with-mkl-dir=/opt/intel/mkl/10.0.5.025/lib/32/ --with-plapack-dir="-L$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH/ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH --with-vendor=intel-linux --with-graphics-lib=/usr/X11R6/lib/libX11.so
Modified: issm/trunk/configs/config-greenplanet.sh
===================================================================
--- issm/trunk/configs/config-greenplanet.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-greenplanet.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,21 +4,21 @@
#MPI /sopt/mpi/openmpi-1.5.4_psm/intel
./configure \
- --prefix=$ISSM_TIER \
- --with-serial=no \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
+ --prefix=$ISSM_DIR \
+ --with-modules=no \
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
--with-mpi-include="/sopt/mpi/openmpi-1.5.4_psm/intel/include/" \
--with-mpi-lib="-L/sopt/mpi/openmpi-1.5.4_psm/intel/lib/ -lmpi -lmpi_f77" \
--with-petsc-arch=$ISSM_ARCH \
- --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
+ --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
--with-mkl-dir=/opt/intel/mkl/10.2.4.032/ \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
+ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
--with-graphics-lib=/usr/lib64/libX11.so \
--with-cxxoptflags="-O3 -xS" \
--with-vendor=intel-linux
Modified: issm/trunk/configs/config-linux64-astrid-ad.sh
===================================================================
--- issm/trunk/configs/config-linux64-astrid-ad.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-linux64-astrid-ad.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,24 +1,24 @@
#!/bin/sh
./configure \
- --prefix=$ISSM_TIER \
+ --prefix=$ISSM_DIR \
--with-serial=no\
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include \
- --with-mpi-lib="-L$ISSM_TIER/externalpackages/mpich2/install/lib/ -lmpich" \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
+ --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" \
--with-petsc-arch=$ISSM_ARCH \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
+ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
--with-graphics-lib=/usr/lib64/libX11.so \
--with-cxxoptflags="-march=opteron -O2" \
--with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" \
- --with-rose-dir=$ISSM_TIER/externalpackages/rose/install/ \
- --with-adic2-dir=$ISSM_TIER/externalpackages/adic/install/ \
+ --with-rose-dir=$ISSM_DIR/externalpackages/rose/install/ \
+ --with-adic2-dir=$ISSM_DIR/externalpackages/adic/install/ \
--with-numthreads=24 \
--without-thermal \
--without-control \
Modified: issm/trunk/configs/config-linux64-astrid-petsc2.sh
===================================================================
--- issm/trunk/configs/config-linux64-astrid-petsc2.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-linux64-astrid-petsc2.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,4 +4,4 @@
#petsc 2.6
#mpich 1.0.2
-./configure --prefix=$ISSM_TIER --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install --with-metis-dir=$ISSM_TIER/externalpackages/metis/install --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include --with-mpi-lib="-L$ISSM_TIER/externalpackages/mpich2/install/lib/ -lmpich" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" --with-graphics-lib=/usr/lib64/libX11.so --with-cxxoptflags="-march=opteron -O2" --with-numthreads=32 --with-scotch-dir=$ISSM_TIER/externalpackages/scotch/install --with-chaco-dir=$ISSM_TIER/externalpackages/chaco/install --enable-debugging --with-shapelib-dir=$ISSM_TIER/externalpackages/shapelib/install\
+./configure --prefix=$ISSM_DIR --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" --with-graphics-lib=/usr/lib64/libX11.so --with-cxxoptflags="-march=opteron -O2" --with-numthreads=32 --with-scotch-dir=$ISSM_DIR/externalpackages/scotch/install --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install --enable-debugging --with-shapelib-dir=$ISSM_DIR/externalpackages/shapelib/install\
Modified: issm/trunk/configs/config-linux64-astrid.sh
===================================================================
--- issm/trunk/configs/config-linux64-astrid.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-linux64-astrid.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -2,30 +2,32 @@
#External packages versions:
#petsc 3.1 or 3.2
-#mpich 1.0.2
+#mpich 1.4
./configure \
- --prefix=$ISSM_TIER \
+ --prefix=$ISSM_DIR \
--with-matlab-dir=$MATLAB_DIR \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-tao-dir=$ISSM_TIER/externalpackages/tao/install \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include \
- --with-mpi-lib="-L$ISSM_TIER/externalpackages/mpich2/install/lib/ -lmpich " \
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
+ --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
--with-petsc-arch=$ISSM_ARCH \
- --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scotch-dir="$ISSM_TIER/externalpackages/scotch/install" \
- --with-chaco-dir="$ISSM_TIER/externalpackages/chaco/install" \
- --with-shapelib-dir="$ISSM_TIER/externalpackages/shapelib/install" \
+ --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
+ --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
+ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scotch-dir="$ISSM_DIR/externalpackages/scotch/install" \
+ --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
+ --with-shapelib-dir="$ISSM_DIR/externalpackages/shapelib/install" \
--with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" \
--with-graphics-lib=/usr/lib64/libX11.so \
--with-cxxoptflags="-march=opteron -O2" \
--with-numthreads=32 \
--enable-debugging
+ #--with-serial=no \
Modified: issm/trunk/configs/config-linux64-murdo-ad.sh
===================================================================
--- issm/trunk/configs/config-linux64-murdo-ad.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-linux64-murdo-ad.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,25 +1,25 @@
#!/bin/sh
./configure \
- --prefix=$ISSM_TIER \
+ --prefix=$ISSM_DIR \
--with-serial=no\
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include \
- --with-mpi-lib="-L$ISSM_TIER/externalpackages/mpich2/install/lib/ -lmpich" \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
+ --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" \
--with-petsc-arch=$ISSM_ARCH \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-hypre-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-ml-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
+ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-hypre-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-ml-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
--with-graphics-lib=/usr/lib64/libX11.so \
--with-cxxoptflags="-mtune=barcelona -ffast-math -O3 -msse4.2 -Wno-write-strings "\
--with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/3.4.6/ -lg2c /usr/lib/gcc/x86_64-redhat-linux/4.1.1/libgfortran.a" \
- --with-adic2-dir=$ISSM_TIER/externalpackages/adic/install/ \
+ --with-adic2-dir=$ISSM_DIR/externalpackages/adic/install/ \
--with-numthreads=24 \
--without-thermal \
--without-control \
Modified: issm/trunk/configs/config-linux64-murdo-nopetsc.sh
===================================================================
--- issm/trunk/configs/config-linux64-murdo-nopetsc.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-linux64-murdo-nopetsc.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,27 +1,27 @@
#!/bin/sh
./configure \
- --prefix=$ISSM_TIER \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include \
- --with-mpi-lib="-L$ISSM_TIER/externalpackages/mpich2/install/lib/ -lmpich" \
+ --prefix=$ISSM_DIR \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
+ --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" \
--with-matlab-dir=$MATLAB_DIR \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/lib \
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib \
--with-graphics-lib=/usr/lib64/libX11.so \
- --with-scotch-dir="$ISSM_TIER/externalpackages/scotch/install" \
- --with-chaco-dir="$ISSM_TIER/externalpackages/chaco/install" \
+ --with-scotch-dir="$ISSM_DIR/externalpackages/scotch/install" \
+ --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
--with-cxxoptflags="-mtune=barcelona -ffast-math -O3 -msse4.2 -Wno-write-strings "\
--with-numthreads=18 \
--enable-debugging \
- --with-gsl-dir=$ISSM_TIER/externalpackages/gsl/install
+ --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install
-# --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
+# --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
# --with-petsc-arch=$ISSM_ARCH \
-# --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
-# --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
-# --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
-# --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
-# --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
-# --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
+# --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+# --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
+# --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+# --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+# --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+# --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Modified: issm/trunk/configs/config-linux64-murdo.sh
===================================================================
--- issm/trunk/configs/config-linux64-murdo.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-linux64-murdo.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,26 +1,26 @@
#!/bin/sh
./configure \
- --prefix=$ISSM_TIER \
+ --prefix=$ISSM_DIR \
--with-matlab-dir=$MATLAB_DIR \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include \
- --with-mpi-lib="-L$ISSM_TIER/externalpackages/mpich2/install/lib/ -lmpich" \
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
+ --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" \
--with-petsc-arch=$ISSM_ARCH \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scotch-dir="$ISSM_TIER/externalpackages/scotch/install" \
- --with-chaco-dir="$ISSM_TIER/externalpackages/chaco/install" \
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
+ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scotch-dir="$ISSM_DIR/externalpackages/scotch/install" \
+ --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
--with-graphics-lib=/usr/lib64/libX11.so \
--with-cxxoptflags="-mtune=barcelona -ffast-math -O3 -msse4.2 -Wno-write-strings "\
--with-numthreads=18 \
- --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
+ --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
--enable-debugging
Modified: issm/trunk/configs/config-macosx32-mathieu.sh
===================================================================
--- issm/trunk/configs/config-macosx32-mathieu.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-macosx32-mathieu.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -9,21 +9,21 @@
export CXXFLAGS=" -arch i386"
./configure \
- --prefix=$ISSM_TIER \
+ --prefix=$ISSM_DIR \
--with-matlab-dir=$MATLAB_DIR \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include \
- --with-mpi-lib=" $ISSM_TIER/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpl.a " \
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
+ --with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
--with-petsc-arch=$ISSM_ARCH \
- --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/include/ " \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
+ --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/include/ " \
+ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
--with-fortran-lib="/usr/local/lib/libgfortran.a" \
--with-math-lib="/usr/lib/libm.dylib" \
--with-graphics-lib="/usr/X11/lib/libX11.dylib" \
Modified: issm/trunk/configs/config-macosx32-ogive.sh
===================================================================
--- issm/trunk/configs/config-macosx32-ogive.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-macosx32-ogive.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,21 +4,21 @@
#mpich 1.4
./configure \
- --prefix=$ISSM_TIER \
+ --prefix=$ISSM_DIR \
--with-matlab-dir=$MATLAB_DIR \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include \
- --with-mpi-lib=" $ISSM_TIER/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpl.a " \
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
+ --with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
--with-petsc-arch=$ISSM_ARCH \
- --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/include/ " \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
+ --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/include/ " \
+ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
--with-math-lib="/usr/lib/libm.dylib" \
--with-graphics-lib="/usr/X11/lib/libX11.dylib" \
Modified: issm/trunk/configs/config-macosx64-larour-ad.sh
===================================================================
--- issm/trunk/configs/config-macosx64-larour-ad.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-macosx64-larour-ad.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,19 +5,19 @@
./configure \
--with-serial=no\
- --prefix=$ISSM_TIER \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include \
- --with-mpi-lib=" $ISSM_TIER/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpl.a " \
+ --prefix=$ISSM_DIR \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
+ --with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
--without-blas-lapack-dir \
- --with-chaco-dir=$ISSM_TIER/externalpackages/chaco/install \
+ --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
- --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
+ --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
--with-math-lib="/usr/lib/libm.dylib" \
--with-graphics-lib="/usr/X11/lib/libX11.dylib" \
--with-cxxoptflags=" -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w "\
- --with-adic2-dir=$ISSM_TIER/externalpackages/adic/install/ \
- --with-adolc-dir=$ISSM_TIER/externalpackages/adolc/install/ \
+ --with-adic2-dir=$ISSM_DIR/externalpackages/adic/install/ \
+ --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install/ \
--with-numthreads=8 \
--without-thermal \
--without-control \
@@ -33,11 +33,11 @@
--without-groundingline
#--without-prognostic \
-#--with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
+#--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
#--with-petsc-arch=$ISSM_ARCH \
-#--with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
-#--with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
-#--with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/include/ " \
-#--with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
-#--with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
-#--with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
+#--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+#--with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+#--with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/include/ " \
+#--with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+#--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+#--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
Modified: issm/trunk/configs/config-macosx64-larour-nopetsc.sh
===================================================================
--- issm/trunk/configs/config-macosx64-larour-nopetsc.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-macosx64-larour-nopetsc.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,28 +1,15 @@
#!/bin/sh
-#petsc 3.2
-#mpich 1.4
+pythonversion=3.2
./configure \
- --prefix=$ISSM_TIER \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include \
- --with-mpi-lib=" $ISSM_TIER/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpl.a " \
+ --prefix=$ISSM_DIR \
--with-matlab-dir=$MATLAB_DIR \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-chaco-dir=$ISSM_TIER/externalpackages/chaco/install \
- --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
+ --with-python-dir=$ISSM_DIR/externalpackages/python/install\
+ --with-python-version=$pythonversion \
+ --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/Python.framework/Versions/$pythonversion/lib/python$pythonversion/site-packages/numpy/core/include/numpy\
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
--with-math-lib="/usr/lib/libm.dylib" \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/lib \
--with-graphics-lib="/usr/X11/lib/libX11.dylib" \
--with-cxxoptflags=" -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w "\
- --with-numthreads=8 \
- --with-gsl-dir=$ISSM_TIER/externalpackages/gsl/install
-# --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
-# --with-petsc-arch=$ISSM_ARCH \
-# --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
-# --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/include/ " \
-# --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
-# --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
-# --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/
-# --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
+ --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install
Modified: issm/trunk/configs/config-macosx64-larour-python.sh
===================================================================
--- issm/trunk/configs/config-macosx64-larour-python.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-macosx64-larour-python.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,26 +4,26 @@
#mpich 1.4
./configure \
- --prefix=$ISSM_TIER \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-python-dir=$ISSM_TIER/externalpackages/python/install\
- --with-python-numpy-dir=$ISSM_TIER/externalpackages/python/install/Python.framework/Versions/3.2/lib/python3.2/site-packages/numpy/core/include/numpy\
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include \
- --with-mpi-lib=" $ISSM_TIER/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpl.a " \
- --with-chaco-dir=$ISSM_TIER/externalpackages/chaco/install \
+ --prefix=$ISSM_DIR \
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+ --with-python-dir=$ISSM_DIR/externalpackages/python/install\
+ --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/Python.framework/Versions/3.2/lib/python3.2/site-packages/numpy/core/include/numpy\
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
+ --with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+ --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
--with-math-lib="/usr/lib/libm.dylib" \
--with-graphics-lib="/usr/X11/lib/libX11.dylib" \
--with-cxxoptflags=" -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w "\
--with-numthreads=8 \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
--with-petsc-arch=$ISSM_ARCH \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/include/ " \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/
- #--with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
- #--with-boost-dir=$ISSM_TIER/externalpackages/boost/install/ \
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/include/ " \
+ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/
+ #--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
+ #--with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \
Modified: issm/trunk/configs/config-macosx64-larour.sh
===================================================================
--- issm/trunk/configs/config-macosx64-larour.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-macosx64-larour.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,24 +4,24 @@
#mpich 1.4
./configure \
- --prefix=$ISSM_TIER \
+ --prefix=$ISSM_DIR \
--with-matlab-dir=$MATLAB_DIR \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include \
- --with-mpi-lib=" $ISSM_TIER/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpl.a " \
- --with-chaco-dir=$ISSM_TIER/externalpackages/chaco/install \
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
+ --with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+ --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
--with-math-lib="/usr/lib/libm.dylib" \
--with-graphics-lib="/usr/X11/lib/libX11.dylib" \
--with-cxxoptflags=" -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w "\
--with-numthreads=8 \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
--with-petsc-arch=$ISSM_ARCH \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/include/ " \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/
- #--with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/include/ " \
+ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/
+ #--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Modified: issm/trunk/configs/config-macosx64-mathieu.sh
===================================================================
--- issm/trunk/configs/config-macosx64-mathieu.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-macosx64-mathieu.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,21 +4,21 @@
#mpich 1.4
./configure \
- --prefix=$ISSM_TIER \
+ --prefix=$ISSM_DIR \
--with-matlab-dir=$MATLAB_DIR \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include \
- --with-mpi-lib=" $ISSM_TIER/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpl.a " \
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
+ --with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
--with-petsc-arch=$ISSM_ARCH \
- --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/include/ " \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
+ --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/include/ " \
+ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
--with-fortran-lib="/usr/local/lib/libgfortran.a" \
--with-math-lib="/usr/lib/libm.dylib" \
--with-graphics-lib="/usr/X11/lib/libX11.dylib" \
Modified: issm/trunk/configs/config-macosx64-nicole.sh
===================================================================
--- issm/trunk/configs/config-macosx64-nicole.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-macosx64-nicole.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,23 +4,23 @@
#mpich 1.4
./configure \
- --prefix=$ISSM_TIER \
+ --prefix=$ISSM_DIR \
--with-matlab-dir=$MATLAB_DIR \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include \
- --with-mpi-lib=" $ISSM_TIER/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpl.a " \
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
+ --with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
--with-petsc-arch=$ISSM_ARCH \
- --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/include/ " \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-scotch-dir="$ISSM_TIER/externalpackages/scotch/install" \
- --with-chaco-dir="$ISSM_TIER/externalpackages/chaco/install" \
+ --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/include/ " \
+ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-scotch-dir="$ISSM_DIR/externalpackages/scotch/install" \
+ --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
--with-fortran-lib="/usr/local/gfortran/lib/gcc/x86_64-apple-darwin10/4.6.2/libgfortran.a" \
--with-math-lib="/usr/lib/libm.dylib" \
--with-graphics-lib="/usr/X11/lib/libX11.dylib" \
Modified: issm/trunk/configs/config-macosx64-ogive.sh
===================================================================
--- issm/trunk/configs/config-macosx64-ogive.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-macosx64-ogive.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -8,21 +8,21 @@
export CXXFLAGS=" -arch x86_64"
./configure \
- --prefix=$ISSM_TIER \
+ --prefix=$ISSM_DIR \
--with-matlab-dir=$MATLAB_DIR \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include \
- --with-mpi-lib=" $ISSM_TIER/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpl.a " \
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
+ --with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
--with-petsc-arch=$ISSM_ARCH \
- --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/include/ " \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
+ --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/include/ " \
+ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
--with-fortran-lib="/usr/local/gfortran/lib/x86_64/libgfortran.a" \
--with-math-lib="/usr/lib/libm.dylib" \
--with-graphics-lib="/usr/X11/lib/libX11.dylib" \
Modified: issm/trunk/configs/config-macosx64-sophie.sh
===================================================================
--- issm/trunk/configs/config-macosx64-sophie.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-macosx64-sophie.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -8,21 +8,21 @@
export CXXFLAGS=" -arch x86_64"
./configure \
- --prefix=$ISSM_TIER \
+ --prefix=$ISSM_DIR \
--with-matlab-dir=$MATLAB_DIR \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include \
- --with-mpi-lib=" $ISSM_TIER/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpl.a " \
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
+ --with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
--with-petsc-arch=$ISSM_ARCH \
- --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/include/ " \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
+ --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/include/ " \
+ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
--with-fortran-lib="/sw/usr/local/lib/x86_64/libgfortran.a" \
--with-math-lib="/usr/lib/libm.dylib" \
--with-graphics-lib="/usr/X11/lib/libX11.dylib" \
Modified: issm/trunk/configs/config-pleiades-petsc2.sh
===================================================================
--- issm/trunk/configs/config-pleiades-petsc2.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-pleiades-petsc2.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,21 +1,21 @@
#!/bin/csh
./configure \
- --prefix=$ISSM_TIER \
- --with-serial=no \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
+ --prefix=$ISSM_DIR \
+ --with-modules=no \
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
--with-mpi-include=/nasa/sgi/mpt/1.25/include \
--with-mpi-lib="-L/nasa/sgi/mpt/1.25/lib/ -lmpi -lpthread -lgfortran" \
--with-petsc-arch=$ISSM_ARCH \
- --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
+ --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
--with-mkl-dir=/nasa/intel/mkl/10.0.011/lib/64/ \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
+ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
--with-graphics-lib=/usr/lib64/libX11.so \
--with-cxxoptflags="-O3 -xS" \
--with-vendor=intel-pleiades
Modified: issm/trunk/configs/config-pleiades.sh
===================================================================
--- issm/trunk/configs/config-pleiades.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-pleiades.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,21 +1,22 @@
#!/bin/csh
./configure \
- --prefix=$ISSM_TIER \
- --with-serial=no \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
+ --prefix=$ISSM_DIR \
+ --with-modules=no \
+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+ --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+ --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
--with-mpi-include=/nasa/sgi/mpt/1.25/include \
--with-mpi-lib="-L/nasa/sgi/mpt/1.25/lib/ -lmpi -lpthread -lgfortran" \
--with-petsc-arch=$ISSM_ARCH \
- --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
+ --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
--with-mkl-dir=/nasa/intel/mkl/10.0.011/lib/64/ \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
+ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
--with-graphics-lib=/usr/lib64/libX11.so \
--with-cxxoptflags="-O3 -xS" \
--with-vendor=intel-pleiades
Modified: issm/trunk/configs/config-win32-eric.sh
===================================================================
--- issm/trunk/configs/config-win32-eric.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-win32-eric.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -3,4 +3,4 @@
#get configure.sh to pick up the intel compiler
-./configure --prefix=$ISSM_TIER --with-parallel=no --with-vendor=intel-win --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install --with-metis-dir=$ISSM_TIER/externalpackages/metis/install --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install --with-petsc-arch=$ISSM_ARCH --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/f2cblaslapack/$ISSM_ARCH
+./configure --prefix=$ISSM_DIR --with-parallel=no --with-vendor=intel-win --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-petsc-arch=$ISSM_ARCH --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/f2cblaslapack/$ISSM_ARCH
Modified: issm/trunk/configs/config-win7-32.sh
===================================================================
--- issm/trunk/configs/config-win7-32.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-win7-32.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,16 +1,16 @@
#!/bin/sh
#Dos style path needed for the windows sdk 7.1 cl compiler:
-ISSM_TIER_WIN=`cygpath -m "$ISSM_TIER"`
+ISSM_DIR_WIN=`cygpath -m "$ISSM_DIR"`
#get configure.sh to pick up the win7 Visual Studio compiler
-./configure --prefix=$ISSM_TIER \
+./configure --prefix=$ISSM_DIR \
--with-vendor=intel-win7-32 \
--with-matlab-dir=$MATLAB_DIR \
- --with-triangle-dir="$ISSM_TIER_WIN/externalpackages/triangle/install" \
- --with-metis-dir="$ISSM_TIER_WIN/externalpackages/metis/install" \
- --with-petsc-dir="$ISSM_TIER_WIN/externalpackages/petsc/install" \
+ --with-triangle-dir="$ISSM_DIR_WIN/externalpackages/triangle/install" \
+ --with-metis-dir="$ISSM_DIR_WIN/externalpackages/metis/install" \
+ --with-petsc-dir="$ISSM_DIR_WIN/externalpackages/petsc/install" \
--with-petsc-arch=$ISSM_ARCH \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/lib/ \
- --with-mpi-lib="$ISSM_TIER_WIN/externalpackages/petsc/install/lib/libpetsc.lib" \
- --with-mpi-include="$ISSM_TIER_WIN/externalpackages/petsc/install/include/mpiuni"
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib/ \
+ --with-mpi-lib="$ISSM_DIR_WIN/externalpackages/petsc/install/lib/libpetsc.lib" \
+ --with-mpi-include="$ISSM_DIR_WIN/externalpackages/petsc/install/include/mpiuni"
Modified: issm/trunk/configs/config-win7-64.sh
===================================================================
--- issm/trunk/configs/config-win7-64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configs/config-win7-64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,16 +1,16 @@
#!/bin/sh
#Dos style path needed for the windows sdk 7.1 cl compiler:
-ISSM_TIER_WIN=`cygpath -m "$ISSM_TIER"`
+ISSM_DIR_WIN=`cygpath -m "$ISSM_DIR"`
#get configure.sh to pick up the win7 Visual Studio compiler
-./configure --prefix=$ISSM_TIER \
+./configure --prefix=$ISSM_DIR \
--with-vendor=intel-win7-64 \
--with-matlab-dir=$MATLAB_DIR \
- --with-triangle-dir="$ISSM_TIER_WIN/externalpackages/triangle/install" \
- --with-metis-dir="$ISSM_TIER_WIN/externalpackages/metis/install" \
- --with-petsc-dir="$ISSM_TIER_WIN/externalpackages/petsc/install" \
+ --with-triangle-dir="$ISSM_DIR_WIN/externalpackages/triangle/install" \
+ --with-metis-dir="$ISSM_DIR_WIN/externalpackages/metis/install" \
+ --with-petsc-dir="$ISSM_DIR_WIN/externalpackages/petsc/install" \
--with-petsc-arch=$ISSM_ARCH \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/lib/ \
- --with-mpi-lib="$ISSM_TIER_WIN/externalpackages/petsc/install/lib/libpetsc.lib" \
- --with-mpi-include="$ISSM_TIER_WIN/externalpackages/petsc/install/include/mpiuni"
+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib/ \
+ --with-mpi-lib="$ISSM_DIR_WIN/externalpackages/petsc/install/lib/libpetsc.lib" \
+ --with-mpi-include="$ISSM_DIR_WIN/externalpackages/petsc/install/include/mpiuni"
Modified: issm/trunk/configure.ac
===================================================================
--- issm/trunk/configure.ac 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/configure.ac 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
#AUTOCONF
-AC_INIT([ISSM],[4.1],[issm at jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure
+AC_INIT([ISSM],[4.2],[issm at jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure
AC_CONFIG_AUX_DIR([./aux-config]) #Put config files in aux-config
AC_CONFIG_MACRO_DIR([m4]) #m4 macros are located in m4
AC_CANONICAL_TARGET #Determine the system type
@@ -35,8 +35,12 @@
#List all Makefiles
AC_CONFIG_FILES([Makefile
src/Makefile
- src/c/Makefile
- src/mex/Makefile
+ src/c/Makefile
+ src/py/Makefile
+ src/py/model/Makefile
+ src/modules/Makefile
+ src/modules/python/Makefile
+ src/modules/matlab/Makefile
src/m/Makefile
bin/Makefile])
Modified: issm/trunk/cron/configs/linux64_daily
===================================================================
--- issm/trunk/cron/configs/linux64_daily 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/cron/configs/linux64_daily 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,8 +5,7 @@
#-------------------------------#
#ISSM main directory (full paths)
-ISSM_DIR="/path/to/issm"
-ISSM_TIER="/path/to/issm/cron/trunk-jpl"
+ISSM_DIR="/path/to/issm/cron/trunk-jpl"
#ISSM Architecture
ISSM_ARCH="linux-gnu-amd64"
@@ -71,7 +70,7 @@
#----------------------#
#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
-#sent to the adresses present in $ISSM_TIER/cron/mailinglist.
+#sent to the adresses present in $ISSM_DIR/cron/mailinglist.
SKIPMAIL="no"
#Sender email address
Modified: issm/trunk/cron/configs/linux64_nightly
===================================================================
--- issm/trunk/cron/configs/linux64_nightly 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/cron/configs/linux64_nightly 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,8 +5,7 @@
#-------------------------------#
#ISSM main directory (full paths)
-ISSM_DIR="/path/to/issm"
-ISSM_TIER="/path/to/issm/cron/trunk-jpl"
+ISSM_DIR="/path/to/issm/cron/trunk-jpl"
#ISSM Architecture
ISSM_ARCH="linux-gnu-amd64"
@@ -71,7 +70,7 @@
#----------------------#
#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
-#sent to the adresses present in $ISSM_TIER/cron/mailinglist.
+#sent to the adresses present in $ISSM_DIR/cron/mailinglist.
SKIPMAIL="no"
#Sender email address
Modified: issm/trunk/cron/configs/macosx64_daily
===================================================================
--- issm/trunk/cron/configs/macosx64_daily 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/cron/configs/macosx64_daily 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,8 +5,7 @@
#-------------------------------#
#ISSM main directory (full path)
-ISSM_DIR="/path/to/issm/"
-ISSM_TIER="/path/to/issm/trunk-jpl/cron/trunk-jpl"
+ISSM_DIR="/path/to/issm/trunk-jpl/cron/trunk-jpl"
#ISSM Architecture
ISSM_ARCH="macosx-gnu"
@@ -71,7 +70,7 @@
#----------------------#
#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
-#sent to the adresses present in $ISSM_TIER/cron/mailinglist.
+#sent to the adresses present in $ISSM_DIR/cron/mailinglist.
SKIPMAIL="no"
#Sender email address
Modified: issm/trunk/cron/configs/macosx64_nightly
===================================================================
--- issm/trunk/cron/configs/macosx64_nightly 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/cron/configs/macosx64_nightly 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,8 +5,7 @@
#-------------------------------#
#ISSM main directory (full path)
-ISSM_DIR="/path/to/issm/"
-ISSM_TIER="/path/to/issm/trunk-jpl/cron/trunk-jpl"
+ISSM_DIR="/path/to/issm/trunk-jpl/cron/trunk-jpl"
#ISSM Architecture
ISSM_ARCH="macosx-gnu"
@@ -71,7 +70,7 @@
#----------------------#
#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
-#sent to the adresses present in $ISSM_TIER/cron/mailinglist.
+#sent to the adresses present in $ISSM_DIR/cron/mailinglist.
SKIPMAIL="no"
#Sender email address
Modified: issm/trunk/cron/configs/win732
===================================================================
--- issm/trunk/cron/configs/win732 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/cron/configs/win732 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,8 +5,7 @@
#-------------------------------#
#ISSM main directory (full path)
-ISSM_DIR="/cygdrive/c/issm"
-ISSM_TIER="/cygdrive/c/issm/trunk-jpl/cron/trunk-jpl"
+ISSM_DIR="/cygdrive/c/issm-uci/trunk-jpl/cron/trunk-jpl"
#ISSM Architecture
ISSM_ARCH="cygwin-intel"
@@ -15,7 +14,7 @@
MACHINE="win7"
#MATLAB path
-MATLAB_PATH="C:/MATLAB/R2011b32/"
+MATLAB_PATH="C:/MATLAB/R2012a/"
#COMPILATION CONFIGURATION FILE
COMPILE_CONFIG_FILE="config-win7-32.sh"
@@ -31,13 +30,13 @@
# ->skip to section 3
# - "none" leave ISSM as is in its directory
# ->skip to section 3
-ISSM_INSTALLATION="none"
+ISSM_INSTALLATION="checkout"
#SVN repository
REPOSITORY="http://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
#execution path used for parallel runs
-EXECUTION_PATH="/cygdrive/c/issm/ExecutionNightlyRun"
+EXECUTION_PATH="/cygdrive/c/issm-uci/ExecutionNightlyRun"
#-----------------------------------#
# 3: External packages installation #
@@ -48,8 +47,8 @@
# - "copy" copy existing directories (EXTERNALPACKAGESDIR)
# - "none" leave external packages as is
# ->skip to section 4
-ISSM_EXTERNALPACKAGES="none"
-EXTERNALPACKAGESDIR="/cygdrive/c/issm/trunk-jpl/externalpackages"
+ISSM_EXTERNALPACKAGES="link"
+EXTERNALPACKAGESDIR="/cygdrive/c/issm-uci/trunk-jpl/externalpackages"
#List of external pakages to be installed
EXTERNALPACKAGES=" autoconf automake petsc metis triangle cccl"
@@ -65,18 +64,18 @@
#ISSM_COMPILATION can have 2 values:
# - "yes" compile ISSM
# - "no" do not compile ISSM
-ISSM_COMPILATION="no"
+ISSM_COMPILATION="yes"
#----------------------#
# 5: Mail notification #
#----------------------#
#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
-#sent to the adresses present in $ISSM_TIER/cron/mailinglist.
-SKIPMAIL="no"
+#sent to the adresses present in $ISSM_DIR/cron/mailinglist.
+SKIPMAIL="yes"
#Sender email address
-EMAIL_ADRESS="eric.larour at jpl.nasa.gov"
+EMAIL_ADRESS="eric.larour at gmail.com"
#------------------------#
# 6: Nightly run options #
@@ -84,7 +83,7 @@
#number of cpus used in ISSM installation and compilation (one is usually
#safer as some packages are very sensitive to parallel compilation)
-NUMCPUS_INSTALL=8
+NUMCPUS_INSTALL=1
#number of cpus used in the nightly runs.
NUMCPUS_RUN=1
@@ -94,9 +93,9 @@
#by Matlab and nightlyrun.m
#ex: "'id',[101 102 103]"
-NROPTIONS="'benchmark','all'"
+NROPTIONS="'benchmark',102:2:120"
#------------------------#
# 7: Matlab#
#------------------------#
-MATLABBIN=/cygdrive/c/MATLAB/R2011b32/bin/matlab
+MATLABBIN=/cygdrive/c/MATLAB/R2012a/bin/matlab
Modified: issm/trunk/cron/configs/win764
===================================================================
--- issm/trunk/cron/configs/win764 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/cron/configs/win764 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,8 +5,7 @@
#-------------------------------#
#ISSM main directory (full path)
-ISSM_DIR="/cygdrive/c/issm"
-ISSM_TIER="/cygdrive/c/issm/trunk-jpl/cron/trunk-jpl"
+ISSM_DIR="/cygdrive/c/issm/trunk-jpl/cron/trunk-jpl"
#ISSM Architecture
ISSM_ARCH="cygwin-intel"
@@ -72,7 +71,7 @@
#----------------------#
#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
-#sent to the adresses present in $ISSM_TIER/cron/mailinglist.
+#sent to the adresses present in $ISSM_DIR/cron/mailinglist.
SKIPMAIL="no"
#Sender email address
Modified: issm/trunk/cron/configs/winxp32
===================================================================
--- issm/trunk/cron/configs/winxp32 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/cron/configs/winxp32 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,8 +5,7 @@
#-------------------------------#
#ISSM main directory (full path)
-ISSM_DIR="C:/home/issm/trunk-jpl"
-ISSM_TIER="C:/home/issm/trunk-jpl/cron/trunk-jpl"
+ISSM_DIR="C:/home/issm/trunk-jpl/cron/trunk-jpl"
#ISSM Architecture
ISSM_ARCH="cygwin-intel"
@@ -65,7 +64,7 @@
#----------------------#
#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
-#sent to the adresses present in $ISSM_TIER/cron/mailinglist.
+#sent to the adresses present in $ISSM_DIR/cron/mailinglist.
SKIPMAIL="no"
#Sender email address
Modified: issm/trunk/cron/nightlyrun.sh
===================================================================
--- issm/trunk/cron/nightlyrun.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/cron/nightlyrun.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -64,7 +64,6 @@
#}}}
#Export ISSM_* variables{{{1
export ISSM_DIR
-export ISSM_TIER
export ISSM_ARCH
#}}}
#Initialize variables {{{1
@@ -89,7 +88,7 @@
then
#only update ISSM
- cd $ISSM_TIER
+ cd $ISSM_DIR
svn update
elif [ "$ISSM_INSTALLATION" == "none" ]
@@ -108,20 +107,20 @@
#}}}
#Create cluster's settings{{{1
#create simpler cluster.rc file, with only the cluster we are interested in.
-cd $ISSM_TIER/test/NightlyRun/
+cd $ISSM_DIR/test/NightlyRun/
if [ "$MACHINE" = "win7" ]; then
cat << END > $HOST_NAME"_settings.m"
cluster.login='$USER';
-cluster.codepath='`cygpath -m $ISSM_TIER/bin`';
+cluster.codepath='`cygpath -m $ISSM_DIR/bin`';
cluster.executionpath='`cygpath -m $EXECUTION_PATH`';
END
else
cat << END > $HOST_NAME"_settings.m"
cluster.login='$USER';
-cluster.codepath='$ISSM_TIER/bin';
+cluster.codepath='$ISSM_DIR/bin';
cluster.executionpath='$EXECUTION_PATH';
END
- cat << END > $ISSM_TIER/externalpackages/matlab/install.sh
+ cat << END > $ISSM_DIR/externalpackages/matlab/install.sh
#!/bin/bash
rm -rf install
ln -s $MATLAB_PATH install
@@ -130,14 +129,14 @@
fi
#}}}
#Source environment variables with new matlab path {{{1
-cd $ISSM_TIER/etc
+cd $ISSM_DIR/etc
source environment.sh MATLAB_DIR=$MATLAB_PATH
#}}}
#install/copy/none external packages (ISSM_EXTERNALPACKAGES){{{1
if [ "$ISSM_EXTERNALPACKAGES" == "install" ]
then
- cd $ISSM_TIER/externalpackages
+ cd $ISSM_DIR/externalpackages
#number of packages:
numpackages=`echo $EXTERNALPACKAGES | wc -w`
@@ -155,7 +154,7 @@
then
#erase externapackages, and link with externalpackages_dir
- cd $ISSM_TIER
+ cd $ISSM_DIR
rm -rf externalpackages
cp -Rf $EXTERNALPACKAGESDIR ./
@@ -163,7 +162,7 @@
then
#erase externapackages, and link with externalpackages_dir
- cd $ISSM_TIER
+ cd $ISSM_DIR
rm -rf externalpackages
ln -s $EXTERNALPACKAGESDIR .
@@ -185,7 +184,7 @@
if [ "$ISSM_COMPILATION" == "yes" ]
then
- cd $ISSM_TIER
+ cd $ISSM_DIR
make clean
make distclean
./scripts/automakererun.sh
@@ -213,17 +212,17 @@
#Prepare run
#create softlink to startup {{{1
-cd $ISSM_TIER/test/NightlyRun/
+cd $ISSM_DIR/test/NightlyRun/
rm startup.m #in case it alreade exists
-cp $ISSM_TIER/startup.m .
+cp $ISSM_DIR/startup.m .
#}}}
#Create nightlylog directory and info.log {{{1
#put installation elapsed time in info.log
INSTALL_TIME=$(timer)
ELAPSED_INSTALL=$(timer $START_TIME)
-rm -rf $ISSM_TIER/nightlylog
-mkdir $ISSM_TIER/nightlylog
-cat << END > $ISSM_TIER/nightlylog/info.log
+rm -rf $ISSM_DIR/nightlylog
+mkdir $ISSM_DIR/nightlylog
+cat << END > $ISSM_DIR/nightlylog/info.log
today: $(echo $TODAY)
user: $(echo $USER)
host: $(echo $HOST_NAME)
@@ -244,16 +243,16 @@
#Run tests
#on Matlab and windows machines, we'll need a windows style path: {{{
if [ "$MACHINE" = "win7" ]; then
- MATLAB_TIER=`cygpath -m $ISSM_TIER`
+ MATLAB_TIER=`cygpath -m $ISSM_DIR`
else
- MATLAB_TIER=$ISSM_TIER
+ MATLAB_TIER=$ISSM_DIR
fi
#}}}
#Launch all tests on different cpus {{{1
for (( i=1;i<=$NUMCPUS_RUN;i++ ))
do
#Launch matlab and the nightly run script
- cat > $ISSM_TIER/nightlylog/matlab_run$i.m << EOF
+ cat > $ISSM_DIR/nightlylog/matlab_run$i.m << EOF
warning off %necessary to avoid a info.log of several Go for parallel runs
try,
cd $MATLAB_TIER/test/NightlyRun
@@ -262,7 +261,6 @@
then
echo "runme('output','nightly','rank',$i,'numprocs',$NUMCPUS_RUN);"
else
- #echo "runme('id',[101 102]);"
echo "runme($NROPTIONS,'output','nightly','rank',$i,'numprocs',$NUMCPUS_RUN);"
fi
)
@@ -270,7 +268,7 @@
%An error occured, get report and exit
message=getReport(me)
directory=strsplit(pwd,'/');
- fid=fopen([ISSM_TIER '/nightlylog/matlaberror.log'], 'at');
+ fid=fopen([issmdir '/nightlylog/matlaberror.log'], 'at');
fprintf(fid,'\nMatlab error occured in: %s\n\n',directory{end});
fprintf(fid,'%s',message);
fclose(fid);
@@ -280,7 +278,7 @@
EOF
#Start run from nightlylog directory
- cd $ISSM_TIER/nightlylog/
+ cd $ISSM_DIR/nightlylog/
MATLABBIN=$MATLAB_PATH/bin/matlab
#Start test
@@ -297,7 +295,7 @@
#}}}
#concatenate all reports {{{1
-cd $ISSM_TIER/nightlylog/
+cd $ISSM_DIR/nightlylog/
cp matlab_log1.log matlab_log.log
for (( i=2;i<=$NUMCPUS_RUN;i++ ))
do
@@ -314,7 +312,7 @@
fi
ELAPSED_RUN=$(timer $INSTALL_TIME)
ELAPSED_TOTAL=$(timer $START_TIME)
-cat << END >> $ISSM_TIER/nightlylog/info.log
+cat << END >> $ISSM_DIR/nightlylog/info.log
elapsed_run: $(echo $ELAPSED_RUN)
elapsed_total: $(echo $ELAPSED_TOTAL)
matlab_crash: $(echo $MATLABCRASH)
@@ -323,24 +321,24 @@
#Send Report
#Build html report {{{1
-cd $ISSM_TIER/nightlylog/
+cd $ISSM_DIR/nightlylog/
sh ../scripts/report.sh
-echo "html report located in $ISSM_TIER/nightlylog/report.html"
+echo "html report located in $ISSM_DIR/nightlylog/report.html"
#}}}
#send mail if requested (SKIPMAIL) {{{1
if [ "$SKIPMAIL" != "yes" ]
then
echo "sending report..."
- source $ISSM_TIER/cron/mailinglist
+ source $ISSM_DIR/cron/mailinglist
for i in `echo $MAILINGLIST`; do
if [ "$MACHINE" = "win7" ]
then
- email -html -s "Nightly runs on $HOST_NAME (version: $ISSM_RELEASE)" -n "ISSM Nightly run" -f echo $EMAIL_ADRESS $i < $ISSM_TIER/nightlylog/report.html
+ email -html -s "Nightly runs on $HOST_NAME (version: $ISSM_RELEASE)" -n "ISSM Nightly run" -f echo $EMAIL_ADRESS $i < $ISSM_DIR/nightlylog/report.html
else
if [ "$MACHINE" = "astrid" ]
then
-cat - $ISSM_TIER/nightlylog/report.html <<HERE | /usr/lib/sendmail -oi -t
+cat - $ISSM_DIR/nightlylog/report.html <<HERE | /usr/lib/sendmail -oi -t
From: "ISSM Nightly run" <$EMAIL_ADRESS>
To: $i
Subject: Nightly runs on $HOST_NAME (version: $ISSM_RELEASE)
@@ -348,7 +346,7 @@
Content-Type: text/html
HERE
else
-cat - $ISSM_TIER/nightlylog/report.html <<HERE | /usr/sbin/sendmail -oi -t
+cat - $ISSM_DIR/nightlylog/report.html <<HERE | /usr/sbin/sendmail -oi -t
From: "ISSM Nightly run" <$EMAIL_ADRESS>
To: $i
Subject: Nightly runs on $HOST_NAME (version: $ISSM_RELEASE)
Modified: issm/trunk/etc/environment.csh
===================================================================
--- issm/trunk/etc/environment.csh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/etc/environment.csh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,5 +1,5 @@
-#ISSM_TIER and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
-source $ISSM_TIER/etc/environment_variables.csh
+#ISSM_DIR and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
+source $ISSM_DIR/etc/environment_variables.csh
#Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them before exporting the variables
#to environment.
@@ -9,10 +9,10 @@
#end
#CRON utilities
-setenv PATH {$PATH}:{$ISSM_TIER}/cron
+setenv PATH {$PATH}:{$ISSM_DIR}/cron
#SCRIPTS utilities
-setenv PATH {$PATH}:{$ISSM_TIER}/scripts
+setenv PATH {$PATH}:{$ISSM_DIR}/scripts
#MATLAB
setenv MATLAB_DIR {$MATLAB_DIR}
@@ -109,11 +109,11 @@
#AUTOCONF
setenv AUTOCONF_DIR {$AUTOCONF_DIR}
-setenv PATH {$PATH}:{$AUTOCONF_DIR}/bin
+setenv PATH {$AUTOCONF_DIR}/bin:{$PATH}
#AUTOMAKE
setenv AUTOMAKE_DIR {$AUTOMAKE_DIR}
-setenv PATH {$PATH}:{$AUTOMAKE_DIR}/bin
+setenv PATH {$AUTOMAKE_DIR}/bin:{$PATH}
#BORLAND
setenv BORLAND_DIR {$BORLAND_DIR}
Modified: issm/trunk/etc/environment.sh
===================================================================
--- issm/trunk/etc/environment.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/etc/environment.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,11 +1,11 @@
-#ISSM_TIER and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
+#ISSM_DIR and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
#Windows compilers:
if [[ "$ISSM_ARCH" == "cygwin-intel" ]]; then
- source $ISSM_TIER/externalpackages/windows/windows_environment.sh
+ source $ISSM_DIR/externalpackages/windows/windows_environment.sh
fi
-source $ISSM_TIER/etc/environment_variables.sh
+source $ISSM_DIR/etc/environment_variables.sh
#Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them after exporting the variables
#to environment.
@@ -15,10 +15,10 @@
done
#CRON utilities
-PATH="$PATH:$ISSM_TIER/cron"
+PATH="$PATH:$ISSM_DIR/cron"
#scripts
-PATH="$PATH:$ISSM_TIER/scripts"
+PATH="$PATH:$ISSM_DIR/scripts"
##MATLAB
export MATLAB_DIR
@@ -136,7 +136,7 @@
#INTEL
#export INTEL_DIR
#PATH="$PATH:$INTEL_DIR"
-#source $ISSM_TIER/externalpackages/intel/intel.sh
+#source $ISSM_DIR/externalpackages/intel/intel.sh
#SDK
export SDK_DIR
@@ -214,7 +214,7 @@
#APPSCAN
export PATH="$PATH:$APPSCAN_DIR/install/bin"
-export PATH="$PATH:$APPSCAN_DIR/bin"]
+export PATH="$PATH:$APPSCAN_DIR/bin"
#CPPCHECK
export PATH="$PATH:$CPPCHECK_DIR/bin"
@@ -241,8 +241,8 @@
export ANDROID_NDK_DIR
export PATH="$PATH:$ANDROID_NDK_DIR/"
-#ANDROID_DEV_DIR
-export ANDROID_DEV_DIR
+#ANDROID_DIR
+export ANDROID_DIR
#ANDROID_SDK
export PATH="$PATH:$ANDROID_SDK_DIR/"
@@ -252,14 +252,20 @@
#GSL
export PATH="$PATH:$GSL_DIR/bin"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$GSL_DIR/lib"
+export LD_RUN_PATH="$LD_RUN_PATH:$GSL_DIR/lib"
#GMAKE
export PATH="$GMAKE_DIR/bin:$PATH"
#PYTHON
export PATH="$PYTHON_DIR/bin:$PATH"
-export PYTHONPATH="$PYTHONPATH:$ISSM_TIER/src/mex"
-export LD_LIBRARY_PATH=$ISSM_TIER/src/mex:$LD_LIBRARY_PATH
+export PYTHONPATH="$PYTHONPATH:$ISSM_DIR/src/modules/python"
+export LD_LIBRARY_PATH=$ISSM_DIR/src/modules/python:$LD_LIBRARY_PATH
+export PYTHONSTARTUP
#MODELE
export PATH="$MODELE_DIR/src/exec:$PATH"
+
+#GIT
+export PATH="$PATH:$GIT_DIR/install/bin"
Modified: issm/trunk/etc/environment_variables.csh
===================================================================
--- issm/trunk/etc/environment_variables.csh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/etc/environment_variables.csh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,84 +1,84 @@
#
#
-#This routine can only be run if the ISSM_TIER variable has been correctly set!
+#This routine can only be run if the ISSM_DIR variable has been correctly set!
#
#
#MATLAB
-set MATLAB_DIR={$ISSM_TIER}/externalpackages/matlab/install
+set MATLAB_DIR={$ISSM_DIR}/externalpackages/matlab/install
#MPI
-set MPI_DIR={$ISSM_TIER}/externalpackages/mpich2/install
+set MPI_DIR={$ISSM_DIR}/externalpackages/mpich2/install
#PETSC
-set PETSC_DIR={$ISSM_TIER}/externalpackages/petsc/install
+set PETSC_DIR={$ISSM_DIR}/externalpackages/petsc/install
#SLEPC
-set SLEPC_DIR={$ISSM_TIER}/externalpackages/slepc/install
+set SLEPC_DIR={$ISSM_DIR}/externalpackages/slepc/install
#Dakota
-set DAKOTA_DIR={$ISSM_TIER}/externalpackages/dakota/install
+set DAKOTA_DIR={$ISSM_DIR}/externalpackages/dakota/install
#Qhull
-set QHULL_DIR={$ISSM_TIER}/externalpackages/qhull/install
+set QHULL_DIR={$ISSM_DIR}/externalpackages/qhull/install
#Doxygen
-set DOXYGEN_DIR={$ISSM_TIER}/externalpackages/doxygen/install
+set DOXYGEN_DIR={$ISSM_DIR}/externalpackages/doxygen/install
#MTOC
-set MTOC_DIR={$ISSM_TIER}/externalpackages/mtoc/install
+set MTOC_DIR={$ISSM_DIR}/externalpackages/mtoc/install
#Triangle
-set TRIANGLE_DIR={$ISSM_TIER}/externalpackages/triangle/install
+set TRIANGLE_DIR={$ISSM_DIR}/externalpackages/triangle/install
#METIS
-set METIS_DIR={$ISSM_TIER}/externalpackages/metis/install
+set METIS_DIR={$ISSM_DIR}/externalpackages/metis/install
#BLAS
-set BLAS_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/fblaslapack
+set BLAS_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/fblaslapack
#LAPACK
-set LAPACK_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/fblaslapack/$ISSM_ARCH
+set LAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/fblaslapack/$ISSM_ARCH
#SCALAPACK
-set SCALAPACK_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/SCALAPACK/$ISSM_ARCH
+set SCALAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/SCALAPACK/$ISSM_ARCH
#PLAPACK
-set PLAPACK_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/PLAPACKR32
+set PLAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/PLAPACKR32
#BLACS
-set BLACS_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/blacs-dev/$ISSM_ARCH
+set BLACS_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/blacs-dev/$ISSM_ARCH
#sowing
-set SOWING_DIR={$ISSM_TIER}/externalpackages/sowing/install
+set SOWING_DIR={$ISSM_DIR}/externalpackages/sowing/install
#YAMS
-set YAMS_DIR={$ISSM_TIER}/externalpackages/yams/install
+set YAMS_DIR={$ISSM_DIR}/externalpackages/yams/install
#TEX2IM
-set TEX2IM_DIR={$ISSM_TIER}/externalpackages/tex2im/install
+set TEX2IM_DIR={$ISSM_DIR}/externalpackages/tex2im/install
#Chaco
-set CHACO_DIR={$ISSM_TIER}/externalpackages/chaco/install
+set CHACO_DIR={$ISSM_DIR}/externalpackages/chaco/install
#MeshPart
-set MESHPART_DIR={$ISSM_TIER}/externalpackages/meshpart/install
+set MESHPART_DIR={$ISSM_DIR}/externalpackages/meshpart/install
#SCOTCH
-set SCOTCH_DIR={$ISSM_TIER}/externalpackages/scotch/install
+set SCOTCH_DIR={$ISSM_DIR}/externalpackages/scotch/install
#Development packages
#automake
-set AUTOMAKE_DIR={$ISSM_TIER}/externalpackages/automake/install
+set AUTOMAKE_DIR={$ISSM_DIR}/externalpackages/automake/install
#autoconf
-set AUTOCONF_DIR={$ISSM_TIER}/externalpackages/autoconf/install
+set AUTOCONF_DIR={$ISSM_DIR}/externalpackages/autoconf/install
#borland
set BORLAND_DIR=/cygdrive/c/Borland
#ssh
-set SSH_DIR={$ISSM_TIER}/externalpackages/ssh
+set SSH_DIR={$ISSM_DIR}/externalpackages/ssh
#valgrind
-set VALGRIND_DIR={$ISSM_TIER}/externalpackages/valgrind/install/bin
+set VALGRIND_DIR={$ISSM_DIR}/externalpackages/valgrind/install/bin
Modified: issm/trunk/etc/environment_variables.sh
===================================================================
--- issm/trunk/etc/environment_variables.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/etc/environment_variables.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,84 +1,84 @@
#
#
-#This routine can only be run if the ISSM_TIER variable has been correctly set!
+#This routine can only be run if the ISSM_DIR variable has been correctly set!
#
#
#MATLAB
-MATLAB_DIR="$ISSM_TIER/externalpackages/matlab/install"
+MATLAB_DIR="$ISSM_DIR/externalpackages/matlab/install"
#MPI
-MPI_DIR="$ISSM_TIER/externalpackages/mpich2/install"
+MPI_DIR="$ISSM_DIR/externalpackages/mpich2/install"
#PETSC
-PETSC_DIR="$ISSM_TIER/externalpackages/petsc/install"
+PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install"
#SLEPC
-SLEPC_DIR="$ISSM_TIER/externalpackages/slepc/install"
+SLEPC_DIR="$ISSM_DIR/externalpackages/slepc/install"
#Dakota
-DAKOTA_DIR="$ISSM_TIER/externalpackages/dakota/install"
+DAKOTA_DIR="$ISSM_DIR/externalpackages/dakota/install"
#Qhull
-QHULL_DIR="$ISSM_TIER/externalpackages/qhull/install"
+QHULL_DIR="$ISSM_DIR/externalpackages/qhull/install"
#Doxygen
-DOXYGEN_DIR="$ISSM_TIER/externalpackages/doxygen/install"
+DOXYGEN_DIR="$ISSM_DIR/externalpackages/doxygen/install"
#MTOC
-MTOC_DIR="$ISSM_TIER/externalpackages/mtoc/install"
+MTOC_DIR="$ISSM_DIR/externalpackages/mtoc/install"
#Triangle
-TRIANGLE_DIR="$ISSM_TIER/externalpackages/triangle/install"
+TRIANGLE_DIR="$ISSM_DIR/externalpackages/triangle/install"
#METIS
-METIS_DIR="$ISSM_TIER/externalpackages/metis/install"
+METIS_DIR="$ISSM_DIR/externalpackages/metis/install"
#BLAS
-BLAS_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/fblaslapack"
+BLAS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack"
#LAPACK
-LAPACK_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH"
+LAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH"
#SCALAPACK
-SCALAPACK_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH"
+SCALAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH"
#PLAPACK
-PLAPACK_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32"
+PLAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32"
#BLACS
-BLACS_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
+BLACS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
#sowing
-SOWING_DIR="$ISSM_TIER/externalpackages/sowing/install"
+SOWING_DIR="$ISSM_DIR/externalpackages/sowing/install"
#BLACS
-BLACS_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
+BLACS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
#YAMS
-YAMS_DIR="$ISSM_TIER/externalpackages/yams/install"
+YAMS_DIR="$ISSM_DIR/externalpackages/yams/install"
#BAMG
-BAMG_DIR="$ISSM_TIER/externalpackages/bamg/install"
+BAMG_DIR="$ISSM_DIR/externalpackages/bamg/install"
#Chaco
-CHACO_DIR="$ISSM_TIER/externalpackages/chaco/install"
+CHACO_DIR="$ISSM_DIR/externalpackages/chaco/install"
#MeshPart
-MESHPART_DIR="$ISSM_TIER/externalpackages/meshpart/install"
+MESHPART_DIR="$ISSM_DIR/externalpackages/meshpart/install"
#SCOTCH
-SCOTCH_DIR="$ISSM_TIER/externalpackages/scotch/install"
+SCOTCH_DIR="$ISSM_DIR/externalpackages/scotch/install"
#Development packages
#automake
-AUTOMAKE_DIR="$ISSM_TIER/externalpackages/automake/install"
+AUTOMAKE_DIR="$ISSM_DIR/externalpackages/automake/install"
#libtool
-LIBTOOL_DIR="$ISSM_TIER/externalpackages/libtool/install"
+LIBTOOL_DIR="$ISSM_DIR/externalpackages/libtool/install"
#autoconf
-AUTOCONF_DIR="$ISSM_TIER/externalpackages/autoconf/install"
+AUTOCONF_DIR="$ISSM_DIR/externalpackages/autoconf/install"
#borland
#BORLAND_DIR="/cygdrive/c/Borland/"
@@ -87,111 +87,116 @@
#INTEL_DIR="C:/IntelInstall/Compiler/11.1/038/bin/ia32/"
#TEX2IM
-TEX2IM_DIR="$ISSM_TIER/externalpackages/tex2im/install"
+TEX2IM_DIR="$ISSM_DIR/externalpackages/tex2im/install"
#sdk
#SDK_DIR="C:/MicrosoftVisualStudio 9.0/Microsoft Visual C++ 2008 Express Edition with SP1 - ENU"
#ssh
-SSH_DIR="$ISSM_TIER/externalpackages/ssh"
+SSH_DIR="$ISSM_DIR/externalpackages/ssh"
#valgrind
-VALGRIND_DIR="$ISSM_TIER/externalpackages/valgrind/install/bin"
+VALGRIND_DIR="$ISSM_DIR/externalpackages/valgrind/install/bin"
#graphviz
-GRAPHVIZ_DIR="$ISSM_TIER/externalpackages/graphviz/install/bin"
+GRAPHVIZ_DIR="$ISSM_DIR/externalpackages/graphviz/install/bin"
#cppcheck
-CPPCHECK_DIR="$ISSM_TIER/externalpackages/cppcheck/install"
+CPPCHECK_DIR="$ISSM_DIR/externalpackages/cppcheck/install"
#gdal
-GDAL_DIR="$ISSM_TIER/externalpackages/gdal/install"
+GDAL_DIR="$ISSM_DIR/externalpackages/gdal/install"
#mercurial
-MERCURIAL_DIR="$ISSM_TIER/externalpackages/mercurial/install"
+MERCURIAL_DIR="$ISSM_DIR/externalpackages/mercurial/install"
#boost
-BOOST_DIR="$ISSM_TIER/externalpackages/boost/install"
-BOOSTROOT="$ISSM_TIER/externalpackages/boost/install"
+BOOST_DIR="$ISSM_DIR/externalpackages/boost/install"
+BOOSTROOT="$ISSM_DIR/externalpackages/boost/install"
#OpenAnalysis
-OPENANALYSISROOT="$ISSM_TIER/externalpackages/openanalysis/install"
+OPENANALYSISROOT="$ISSM_DIR/externalpackages/openanalysis/install"
#xerces
-XERCESROOT="$ISSM_TIER/externalpackages/xerces/install"
-XERCESCROOT="$ISSM_TIER/externalpackages/xerces/src"
+XERCESROOT="$ISSM_DIR/externalpackages/xerces/install"
+XERCESCROOT="$ISSM_DIR/externalpackages/xerces/src"
#xaifBooster
-XAIFBOOSTERROOT="$ISSM_TIER/externalpackages/xaifbooster/"
-XAIF_DIR="$ISSM_TIER/externalpackages/xaifbooster/xaifBooster"
-XAIFBOOSTER_HOME="$ISSM_TIER/externalpackages/xaifbooster/xaifBooster"
+XAIFBOOSTERROOT="$ISSM_DIR/externalpackages/xaifbooster/"
+XAIF_DIR="$ISSM_DIR/externalpackages/xaifbooster/xaifBooster"
+XAIFBOOSTER_HOME="$ISSM_DIR/externalpackages/xaifbooster/xaifBooster"
PLATFORM=x86-Linux
#angel
-ANGELROOT="$ISSM_TIER/externalpackages/angel/angel"
+ANGELROOT="$ISSM_DIR/externalpackages/angel/angel"
#java
JVM_DIR=/usr/local/gcc/4.3.2/lib64/gcj-4.3.2-9/
#bbftp
-BBFTP_DIR="$ISSM_TIER/externalpackages/bbftp/install"
+BBFTP_DIR="$ISSM_DIR/externalpackages/bbftp/install"
#adic2
-ADIC_DIR="$ISSM_TIER/externalpackages/adic/install"
+ADIC_DIR="$ISSM_DIR/externalpackages/adic/install"
#colpack
-COLPACK_DIR="$ISSM_TIER/externalpackages/colpack/install"
+COLPACK_DIR="$ISSM_DIR/externalpackages/colpack/install"
#eclipse
-ECLIPSE_DIR="$ISSM_TIER/externalpackages/eclipse/install"
+ECLIPSE_DIR="$ISSM_DIR/externalpackages/eclipse/install"
#flaim
-FLAIM_DIR="$ISSM_TIER/externalpackages/flaim/install"
+FLAIM_DIR="$ISSM_DIR/externalpackages/flaim/install"
#appscan
-APPSCAN_DIR="$ISSM_TIER/externalpackages/appscan"
+APPSCAN_DIR="$ISSM_DIR/externalpackages/appscan"
#cppcheck
-CPPCHECK_DIR="$ISSM_TIER/externalpackages/cppcheck/install"
+CPPCHECK_DIR="$ISSM_DIR/externalpackages/cppcheck/install"
#rats
-RATS_DIR="$ISSM_TIER/externalpackages/rats/install"
+RATS_DIR="$ISSM_DIR/externalpackages/rats/install"
#dyson
-DYSON_DIR="$ISSM_TIER/externalpackages/dyson/"
+DYSON_DIR="$ISSM_DIR/externalpackages/dyson/"
#cmake
-CMAKE_DIR="$ISSM_TIER/externalpackages/cmake/install"
+CMAKE_DIR="$ISSM_DIR/externalpackages/cmake/install"
#shapelib
-SHAPELIB_DIR="$ISSM_TIER/externalpackages/shapelib/install"
+SHAPELIB_DIR="$ISSM_DIR/externalpackages/shapelib/install"
#cccl
-CCCL_DIR="$ISSM_TIER/externalpackages/cccl/install"
+CCCL_DIR="$ISSM_DIR/externalpackages/cccl/install"
#packagemaker
-PACKAGEMAKER_DIR="$ISSM_TIER/externalpackages/packagemaker/install"
+PACKAGEMAKER_DIR="$ISSM_DIR/externalpackages/packagemaker/install"
+#android-dev-dir
+ANDROID_DIR="$ISSM_DIR/externalpackages/android"
+
#android-ndk
-ANDROID_NDK_DIR="$ISSM_TIER/externalpackages/android-ndk/install"
+ANDROID_NDK_DIR="$ANDROID_DIR/android-ndk/install"
-#android-dev-dir
-ANDROID_DEV_DIR="$ISSM_TIER/externalpackages/android-dev-dir"
-
#android-sdk
-ANDROID_SDK_DIR="$ISSM_TIER/externalpackages/android-sdk/install-sdk"
+ANDROID_SDK_DIR="$ANDROID_DIR/android-sdk/install-sdk"
#android-ant
-ANDROID_ANT_DIR="$ISSM_TIER/externalpackages/android-sdk/install-ant"
+ANDROID_ANT_DIR="$ANDROID_DIR/android-sdk/install-ant"
#gsl
-GSL_DIR="$ISSM_TIER/externalpackages/gsl/install"
+GSL_DIR="$ISSM_DIR/externalpackages/gsl/install"
#gnu make
-GMAKE_DIR="$ISSM_TIER/externalpackages/gmake/install"
+GMAKE_DIR="$ISSM_DIR/externalpackages/gmake/install"
#PYTHON
-PYTHON_DIR="$ISSM_TIER/externalpackages/python/install"
+PYTHON_DIR="$ISSM_DIR/externalpackages/python/install"
+PYTHONSTARTUP="$ISSM_DIR/startup.py"
#MODELE
-MODELE_DIR="$ISSM_TIER/externalpackages/modelE"
+MODELE_DIR="$ISSM_DIR/externalpackages/modelE"
+
+
+#GIT
+GIT_DIR="$ISSM_DIR/externalpackages/git"
Modified: issm/trunk/externalpackages/adic/install.sh
===================================================================
--- issm/trunk/externalpackages/adic/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/adic/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -18,13 +18,13 @@
mkdir build
cd build
../source/configure \
- --with-rose=$ISSM_TIER/externalpackages/rose/install \
- --with-openanalysis=$ISSM_TIER/externalpackages/openanalysis/openanalysis/x86_64-Linux \
- --with-boost=$ISSM_TIER/externalpackages/boost/install \
- --with-xerces=$ISSM_TIER/externalpackages/xerces/src \
- --with-xaifbooster=$ISSM_TIER/externalpackages/xaifbooster/xaifBooster \
- --with-colpack=$ISSM_TIER/externalpackages/colpack/install\
- --prefix=$ISSM_TIER/externalpackages/adic/install
+ --with-rose=$ISSM_DIR/externalpackages/rose/install \
+ --with-openanalysis=$ISSM_DIR/externalpackages/openanalysis/openanalysis/x86_64-Linux \
+ --with-boost=$ISSM_DIR/externalpackages/boost/install \
+ --with-xerces=$ISSM_DIR/externalpackages/xerces/src \
+ --with-xaifbooster=$ISSM_DIR/externalpackages/xaifbooster/xaifBooster \
+ --with-colpack=$ISSM_DIR/externalpackages/colpack/install\
+ --prefix=$ISSM_DIR/externalpackages/adic/install
if [ -z $1 ]; then
make
else
Modified: issm/trunk/externalpackages/adolc/install.sh
===================================================================
--- issm/trunk/externalpackages/adolc/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/adolc/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,6 +5,9 @@
#Some cleanup
rm -rf install ADOL-C-2.2.0 src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/ADOL-C-2.2.0.tar.gz' 'ADOL-C-2.2.0.tar.gz'
+
#Create install directories
mkdir install src
@@ -19,7 +22,7 @@
cd src
./configure \
- --prefix=$ISSM_TIER/externalpackages/adolc/install \
+ --prefix=$ISSM_DIR/externalpackages/adolc/install \
--enable-sparse \
--enable-docexa \
--enable-addexa \
Property changes on: issm/trunk/externalpackages/android/android-sdk
___________________________________________________________________
Added: svn:ignore
+ install-sdk
install-ant
Modified: issm/trunk/externalpackages/autoconf/install.sh
===================================================================
--- issm/trunk/externalpackages/autoconf/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/autoconf/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -3,17 +3,20 @@
#Some cleanup
rm -rf install autoconf-2.68 src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/autoconf-2.68.tar.gz' 'autoconf-2.68.tar.gz'
+
#Create install directories
mkdir install
#Untar
-tar -zxvf autoconf-2.68.tar.gz
+tar -zxvf autoconf-2.68.tar.gz
#Move autoconf into src directory
mv autoconf-2.68 src
#Compile autoconf
cd src
-./configure --prefix="$ISSM_TIER/externalpackages/autoconf/install"
+./configure --prefix="$ISSM_DIR/externalpackages/autoconf/install"
make
make install
Modified: issm/trunk/externalpackages/automake/install.sh
===================================================================
--- issm/trunk/externalpackages/automake/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/automake/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -3,6 +3,9 @@
#Some cleanup
rm -rf install automake-1.11.3 src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/automake-1.11.3.tar.gz' 'automake-1.11.3.tar.gz'
+
#Create install directories
mkdir install
@@ -12,6 +15,6 @@
#Compile automake
cd src
-./configure --prefix="$ISSM_TIER/externalpackages/automake/install"
+./configure --prefix="$ISSM_DIR/externalpackages/automake/install"
make
make install
Modified: issm/trunk/externalpackages/bbftp/install.sh
===================================================================
--- issm/trunk/externalpackages/bbftp/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/bbftp/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -3,6 +3,9 @@
#Some cleanup
rm -rf src install bbftp-client-3.2.0
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/bbftp-client-3.2.0.tar.gz' 'bbftp-client-3.2.0.tar.gz'
+
#Create install directories
mkdir install src
@@ -18,6 +21,6 @@
#Configure and compile
cd bbftpc
-./configure --prefix=$ISSM_TIER/externalpackages/bbftp/install
+./configure --prefix=$ISSM_DIR/externalpackages/bbftp/install
make
make install
Modified: issm/trunk/externalpackages/boost/install.sh
===================================================================
--- issm/trunk/externalpackages/boost/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/boost/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -6,12 +6,13 @@
#symlinks in externalpackages/python to what boost is expecting. Ther is NO WAY
#to get the boost library to include python support without doing that.
-
-
#Some cleanup
rm -rf install boost_1_49_0 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/boost_1_49_0.tar.gz' 'boost_1_49_0.tar.gz'
+
#Untar
tar -zxvf boost_1_49_0.tar.gz
@@ -21,9 +22,9 @@
#Configure and compile
cd src
./bootstrap.sh \
- --prefix="$ISSM_TIER/externalpackages/boost/install" \
+ --prefix="$ISSM_DIR/externalpackages/boost/install" \
--with-python=python3.2 \
- --with-python-root="$ISSM_TIER/externalpackages/python/install"
+ --with-python-root="$ISSM_DIR/externalpackages/python/install"
#Compile boost
./bjam install
Modified: issm/trunk/externalpackages/bsdtar/install-win7.sh
===================================================================
--- issm/trunk/externalpackages/bsdtar/install-win7.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/bsdtar/install-win7.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install src libarchive-3.0.3
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/libarchive-3.0.3.tar.gz' 'libarchive-3.0.3.tar.gz'
+
#Untar
tar -zxvf libarchive-3.0.3.tar.gz
@@ -12,6 +15,6 @@
rm -rf libarchive-3.0.3
cd src
-./configure --prefix="$ISSM_TIER/externalpackages/bsdtar/install"
+./configure --prefix="$ISSM_DIR/externalpackages/bsdtar/install"
make
make install
Modified: issm/trunk/externalpackages/cccl/install-win7.orig.sh
===================================================================
--- issm/trunk/externalpackages/cccl/install-win7.orig.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/cccl/install-win7.orig.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf src install cccl-0.03
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/cccl-0.03.tar.gz' 'cccl-0.03.tar.gz'
+
#Untar
tar -zxvf cccl-0.03.tar.gz
@@ -14,7 +17,7 @@
cd src
#Compile
-./configure --prefix="$ISSM_TIER/externalpackages/cccl/install"
+./configure --prefix="$ISSM_DIR/externalpackages/cccl/install"
make
make install
Modified: issm/trunk/externalpackages/cccl/issm/cccl
===================================================================
--- issm/trunk/externalpackages/cccl/issm/cccl 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/cccl/issm/cccl 2012-06-02 00:27:43 UTC (rev 12332)
@@ -73,6 +73,19 @@
;;
esac
;;
+ -fPIC)
+ #do nothing
+ ;;
+ -g)
+ #do nothing
+ ;;
+ -pthread)
+ #do nothing
+ ;;
+ -fno-omit-frame-pointer)
+ #do nothing
+ ;;
+
*)
#do nothing
opts="$opts $1"
@@ -82,6 +95,9 @@
esac
shift
done
+
+#Some default options:
+opts="$opts /nologo"
#echo "$prog $opts"
exec $prog $opts
Modified: issm/trunk/externalpackages/chaco/install.sh
===================================================================
--- issm/trunk/externalpackages/chaco/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/chaco/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -6,6 +6,9 @@
rm -rf install
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Chaco-2.2.tar.gz' 'Chaco-2.2.tar.gz'
+
# Untar
tar -xvzf Chaco-2.2.tar.gz
Modified: issm/trunk/externalpackages/cmake/install.sh
===================================================================
--- issm/trunk/externalpackages/cmake/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/cmake/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install cmake-2.8.5
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/cmake-2.8.5.tar.gz' 'cmake-2.8.5.tar.gz'
+
#Untar
tar -zxvf cmake-2.8.5.tar.gz
@@ -13,7 +16,7 @@
#Compile cmake
cd install
-./bootstrap --prefix=$ISSM_TIER/externalpackages/cmake/install
+./bootstrap --prefix=$ISSM_DIR/externalpackages/cmake/install
if [ -z $1 ]; then
make
else
Modified: issm/trunk/externalpackages/colpack/install.sh
===================================================================
--- issm/trunk/externalpackages/colpack/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/colpack/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -3,6 +3,9 @@
#Erase install
rm -rf install src ColPack
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/ColPack-1.0.3.tar.gz' 'ColPack-1.0.3.tar.gz'
+
#install directory
mkdir src
tar -zxvf ColPack-1.0.3.tar.gz
Modified: issm/trunk/externalpackages/cppcheck/install.sh
===================================================================
--- issm/trunk/externalpackages/cppcheck/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/cppcheck/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,8 @@
rm -rf install src cppcheck-1.48
mkdir src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/cppcheck-1.48.tar' 'cppcheck-1.48.tar'
tar -xvf cppcheck-1.48.tar
mv cppcheck-1.48/* src
@@ -16,5 +18,5 @@
else
make -j $1
fi
-make install PREFIX=$ISSM_TIER/externalpackages/cppcheck/install
+make install PREFIX=$ISSM_DIR/externalpackages/cppcheck/install
cd ..
Modified: issm/trunk/externalpackages/dace/install.sh
===================================================================
--- issm/trunk/externalpackages/dace/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/dace/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install dace
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/dace.zip' 'dace.zip'
+
#uncompress
unzip dace.zip
Modified: issm/trunk/externalpackages/dakota/install-altix64-cosmos.sh
===================================================================
--- issm/trunk/externalpackages/dakota/install-altix64-cosmos.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/dakota/install-altix64-cosmos.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -9,6 +9,9 @@
rm -rf install
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz'
+
#Untar
tar -zxvf Dakota_4_3.src.tar.gz
@@ -28,7 +31,7 @@
#Configure dakota
cd src
./configure \
- --prefix="$ISSM_TIER/externalpackages/dakota/install" \
+ --prefix="$ISSM_DIR/externalpackages/dakota/install" \
--without-graphics \
--with-pic \
--disable-mpi \
Modified: issm/trunk/externalpackages/dakota/install-linux64-astrid.sh
===================================================================
--- issm/trunk/externalpackages/dakota/install-linux64-astrid.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/dakota/install-linux64-astrid.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -9,6 +9,9 @@
rm -rf install
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz'
+
#Untar
tar -zxvf Dakota_4_3.src.tar.gz
@@ -28,7 +31,7 @@
#Configure dakota
cd src
./configure \
- --prefix="$ISSM_TIER/externalpackages/dakota/install" \
+ --prefix="$ISSM_DIR/externalpackages/dakota/install" \
--without-graphics \
--with-pic \
--disable-mpi \
Modified: issm/trunk/externalpackages/dakota/install-linux64-murdo.sh
===================================================================
--- issm/trunk/externalpackages/dakota/install-linux64-murdo.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/dakota/install-linux64-murdo.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -9,6 +9,9 @@
rm -rf install
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz'
+
#Untar
tar -zxvf Dakota_4_3.src.tar.gz
@@ -28,7 +31,7 @@
#Configure dakota
cd src
./configure \
- --prefix="$ISSM_TIER/externalpackages/dakota/install" \
+ --prefix="$ISSM_DIR/externalpackages/dakota/install" \
--without-graphics \
--with-pic \
--disable-mpi \
Modified: issm/trunk/externalpackages/dakota/install-macosx64.sh
===================================================================
--- issm/trunk/externalpackages/dakota/install-macosx64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/dakota/install-macosx64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -9,6 +9,9 @@
rm -rf install
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz'
+
#Untar
tar -zxvf Dakota_4_3.src.tar.gz
@@ -28,12 +31,12 @@
#Configure dakota
cd src
./configure \
- --prefix="$ISSM_TIER/externalpackages/dakota/install" \
+ --prefix="$ISSM_DIR/externalpackages/dakota/install" \
--without-graphics \
--with-pic \
--disable-mpi \
- --with-blas="-L$ISSM_TIER/externalpackages/petsc/install/lib -lfblas " \
- --with-lapack="-L$ISSM_TIER/externalpackages/petsc/install/lib -lflapack -lPLAPACK "
+ --with-blas="-L$ISSM_DIR/externalpackages/petsc/install/lib -lfblas " \
+ --with-lapack="-L$ISSM_DIR/externalpackages/petsc/install/lib -lflapack -lPLAPACK "
cd ..
#Before compiling, if running on 64 bits, we need to active fPIC compilation. Some packages
Modified: issm/trunk/externalpackages/dakota/install-pleiades.sh
===================================================================
--- issm/trunk/externalpackages/dakota/install-pleiades.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/dakota/install-pleiades.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -9,6 +9,9 @@
rm -rf install
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz'
+
#Untar
tar -zxvf Dakota_4_3.src.tar.gz
@@ -28,7 +31,7 @@
#Configure dakota
cd src
./configure \
- --prefix="$ISSM_TIER/externalpackages/dakota/install" \
+ --prefix="$ISSM_DIR/externalpackages/dakota/install" \
--without-graphics \
--with-pic \
--disable-mpi \
Property changes on: issm/trunk/externalpackages/distribute
___________________________________________________________________
Added: svn:ignore
+ distribute_setup.py
Modified: issm/trunk/externalpackages/doxygen/install.sh
===================================================================
--- issm/trunk/externalpackages/doxygen/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/doxygen/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -7,7 +7,7 @@
svn co https://doxygen.svn.sourceforge.net/svnroot/doxygen/trunk install
#Configure doxygen
-cd install && ./configure --prefix "$ISSM_TIER/externalpackages/doxygen/install"
+cd install && ./configure --prefix "$ISSM_DIR/externalpackages/doxygen/install"
if [ -z $1 ]; then
make
else
Modified: issm/trunk/externalpackages/findbugs/install.sh
===================================================================
--- issm/trunk/externalpackages/findbugs/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/findbugs/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,8 @@
rm -rf install findbugs-1.3.9
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/findbugs-1.3.9.tar.gz' 'findbugs-1.3.9.tar.gz'
tar -zxvf findbugs-1.3.9.tar.gz
mv findbugs-1.3.9/* install
Property changes on: issm/trunk/externalpackages/freetype
___________________________________________________________________
Added: svn:ignore
+ install
src
Modified: issm/trunk/externalpackages/gdal/install.sh
===================================================================
--- issm/trunk/externalpackages/gdal/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/gdal/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -6,6 +6,9 @@
rm -rf gdal-1.6.0
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/gdal-1.6.0.tar.gz' 'gdal-1.6.0.tar.gz'
+
#Untar
tar -zxvf gdal-1.6.0.tar.gz
@@ -16,7 +19,7 @@
#Configure gdal
cd src
./configure \
- --prefix="$ISSM_TIER/externalpackages/gdal/install" \
+ --prefix="$ISSM_DIR/externalpackages/gdal/install" \
--without-python \
--with-netcdf=no \
--with-jasper=no \
Modified: issm/trunk/externalpackages/gmake/install.sh
===================================================================
--- issm/trunk/externalpackages/gmake/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/gmake/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install src make-3.82
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/make-3.82.tar.gz' 'make-3.82.tar.gz'
+
#Untar
tar -zxvf make-3.82.tar.gz
@@ -15,7 +18,7 @@
cd src
#Configure and compile:
-./configure --prefix=$ISSM_TIER/externalpackages/gmake/install
+./configure --prefix=$ISSM_DIR/externalpackages/gmake/install
if [ -z $1 ]; then
make
Modified: issm/trunk/externalpackages/graphviz/install.sh
===================================================================
--- issm/trunk/externalpackages/graphviz/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/graphviz/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/graphviz-2.24.0.tar.gz' 'graphviz-2.24.0.tar.gz'
+
#Untar
tar -zxvf graphviz-2.24.0.tar.gz
@@ -13,7 +16,7 @@
#Configure dakota
cd src
-./configure --prefix="$ISSM_TIER/externalpackages/graphviz/install"
+./configure --prefix="$ISSM_DIR/externalpackages/graphviz/install"
cd ..
#Compile and install
Modified: issm/trunk/externalpackages/gsl/install-macosx64.sh
===================================================================
--- issm/trunk/externalpackages/gsl/install-macosx64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/gsl/install-macosx64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf src install gsl-1.15
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz'
+
#Untar
tar -zxvf gsl-1.15.tar.gz
@@ -17,7 +20,7 @@
export CFLAGS=" -arch x86_64"
./configure \
- --prefix="$ISSM_TIER/externalpackages/gsl/install"
+ --prefix="$ISSM_DIR/externalpackages/gsl/install"
#Compile gsl
if [ -z $1 ]; then
Property changes on: issm/trunk/externalpackages/ipython
___________________________________________________________________
Added: svn:ignore
+ src-*
install
Modified: issm/trunk/externalpackages/latex2rtf/install.sh
===================================================================
--- issm/trunk/externalpackages/latex2rtf/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/latex2rtf/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -3,11 +3,14 @@
#Some cleanup
rm -rf latex2rtf-2.0.0 cfg install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/latex2rtf-2.0.0.tar.gz' 'latex2rtf-2.0.0.tar.gz'
+
#untar
tar -zxvf latex2rtf-2.0.0.tar.gz
mv latex2rtf-2.0.0 install
#Compile
cd install
-export PREFIX="$ISSM_TIER/externalpackages/latex2rtf/install/"
+export PREFIX="$ISSM_DIR/externalpackages/latex2rtf/install/"
make
Property changes on: issm/trunk/externalpackages/libermate
___________________________________________________________________
Added: svn:ignore
+ install
Property changes on: issm/trunk/externalpackages/libpng
___________________________________________________________________
Added: svn:ignore
+ src
install
Modified: issm/trunk/externalpackages/libtool/install.sh
===================================================================
--- issm/trunk/externalpackages/libtool/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/libtool/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install libtool-2.2.6b src
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/libtool-2.2.6b.tar.gz' 'libtool-2.2.6b.tar.gz'
+
#Untar
tar -zxvf libtool-2.2.6b.tar.gz
@@ -12,6 +15,6 @@
#Compile libtool
cd src
-./configure --prefix="$ISSM_TIER/externalpackages/libtool/install"
+./configure --prefix="$ISSM_DIR/externalpackages/libtool/install"
make
make install
Modified: issm/trunk/externalpackages/m2html/install.sh
===================================================================
--- issm/trunk/externalpackages/m2html/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/m2html/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install m2html
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/m2html.zip' 'm2html.zip'
+
#uncompress
unzip m2html.zip
Property changes on: issm/trunk/externalpackages/matplotlib
___________________________________________________________________
Added: svn:ignore
+ src-*
src
install
matplotlib
deps
Modified: issm/trunk/externalpackages/mercurial/install.sh
===================================================================
--- issm/trunk/externalpackages/mercurial/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/mercurial/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install mercurial-1.7.3
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mercurial-1.7.3.tar.gz' 'mercurial-1.7.3.tar.gz'
+
#Untar
tar -zxvf mercurial-1.7.3.tar.gz
Modified: issm/trunk/externalpackages/metis/install-4.0-altix64.sh
===================================================================
--- issm/trunk/externalpackages/metis/install-4.0-altix64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/metis/install-4.0-altix64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
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
Modified: issm/trunk/externalpackages/metis/install-4.0-cosmos.sh
===================================================================
--- issm/trunk/externalpackages/metis/install-4.0-cosmos.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/metis/install-4.0-cosmos.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
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
Modified: issm/trunk/externalpackages/metis/install-4.0-greenplanet.sh
===================================================================
--- issm/trunk/externalpackages/metis/install-4.0-greenplanet.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/metis/install-4.0-greenplanet.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
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
Modified: issm/trunk/externalpackages/metis/install-4.0-linux64.sh
===================================================================
--- issm/trunk/externalpackages/metis/install-4.0-linux64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/metis/install-4.0-linux64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
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
Modified: issm/trunk/externalpackages/metis/install-4.0-macosx32.sh
===================================================================
--- issm/trunk/externalpackages/metis/install-4.0-macosx32.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/metis/install-4.0-macosx32.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
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
Modified: issm/trunk/externalpackages/metis/install-4.0-macosx64.sh
===================================================================
--- issm/trunk/externalpackages/metis/install-4.0-macosx64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/metis/install-4.0-macosx64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
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
Modified: issm/trunk/externalpackages/metis/install-4.0-pleiades.sh
===================================================================
--- issm/trunk/externalpackages/metis/install-4.0-pleiades.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/metis/install-4.0-pleiades.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
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
Modified: issm/trunk/externalpackages/metis/install-4.0-win32.sh
===================================================================
--- issm/trunk/externalpackages/metis/install-4.0-win32.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/metis/install-4.0-win32.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
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
Modified: issm/trunk/externalpackages/metis/install-4.0-win7.sh
===================================================================
--- issm/trunk/externalpackages/metis/install-4.0-win7.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/metis/install-4.0-win7.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
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
Modified: issm/trunk/externalpackages/metis/install-5.0.1-linux64.sh
===================================================================
--- issm/trunk/externalpackages/metis/install-5.0.1-linux64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/metis/install-5.0.1-linux64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,6 +5,9 @@
rm -rf install metis-5.0.1
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/metis-5.0.1.tar.gz' 'metis-5.0.1.tar.gz'
+
#Untar
tar -zxvf metis-5.0.1.tar.gz
@@ -16,5 +19,5 @@
cd install
#Compile metis
-make config prefix="$ISSM_TIER/externalpackages/metis/install"
+make config prefix="$ISSM_DIR/externalpackages/metis/install"
make install
Modified: issm/trunk/externalpackages/modelE/install.sh
===================================================================
--- issm/trunk/externalpackages/modelE/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/modelE/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -6,6 +6,9 @@
rm -rf src install modelE_AR5_branch
mkdir src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/modelE_AR5_branch.2012.03.13_10.12.21.tgz' 'modelE_AR5_branch.2012.03.13_10.12.21.tgz'
+
#Untar
tar -zxvf modelE_AR5_branch.2012.03.13_10.12.21.tgz
Modified: issm/trunk/externalpackages/mpich2/install-1.0.2-altix64.sh
===================================================================
--- issm/trunk/externalpackages/mpich2/install-1.0.2-altix64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/mpich2/install-1.0.2-altix64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf src install mpich2-1.0.2p1
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich2-1.0.2p1.tar.gz' 'mpich2-1.0.2p1.tar.gz'
+
#Untar
tar -zxvf mpich2-1.0.2p1.tar.gz
@@ -17,7 +20,7 @@
export CFLAGS="$CFLAGS -fPIC"
export FFLAGS="$FFLAGS -fPIC"
./configure \
- --prefix="$ISSM_TIER/externalpackages/mpich2/install" \
+ --prefix="$ISSM_DIR/externalpackages/mpich2/install" \
--enable-sharedlibs=gcc \
--enable-f91=gfortran
Modified: issm/trunk/externalpackages/mpich2/install-1.0.2-linux64.sh
===================================================================
--- issm/trunk/externalpackages/mpich2/install-1.0.2-linux64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/mpich2/install-1.0.2-linux64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf src install mpich2-1.0.2p1
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich2-1.0.2p1.tar.gz' 'mpich2-1.0.2p1.tar.gz'
+
#Untar
tar -zxvf mpich2-1.0.2p1.tar.gz
@@ -17,7 +20,7 @@
export CFLAGS="$CFLAGS -fPIC"
export FFLAGS="$FFLAGS -fPIC"
./configure \
- --prefix="$ISSM_TIER/externalpackages/mpich2/install" \
+ --prefix="$ISSM_DIR/externalpackages/mpich2/install" \
--enable-sharedlibs=gcc \
--enable-f91=gfortran
Modified: issm/trunk/externalpackages/mpich2/install-1.0.2-macosx32.sh
===================================================================
--- issm/trunk/externalpackages/mpich2/install-1.0.2-macosx32.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/mpich2/install-1.0.2-macosx32.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf src install mpich2-1.0.2p1
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich2-1.0.2p1.tar.gz' 'mpich2-1.0.2p1.tar.gz'
+
#Untar
tar -zxvf mpich2-1.0.2p1.tar.gz
@@ -16,7 +19,7 @@
make distclean
export CFLAGS=" -m32"
./configure \
- --prefix="$ISSM_TIER/externalpackages/mpich2/install" \
+ --prefix="$ISSM_DIR/externalpackages/mpich2/install" \
--enable-f91=gfortran \
--enable-sharedlibs=osx-gcc
Modified: issm/trunk/externalpackages/mpich2/install-1.0.2-win32.sh
===================================================================
--- issm/trunk/externalpackages/mpich2/install-1.0.2-win32.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/mpich2/install-1.0.2-win32.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf src install mpich2-1.0.2p1
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich2-1.0.2p1.tar.gz' 'mpich2-1.0.2p1.tar.gz'
+
#Untar
tar -zxvf mpich2-1.0.2p1.tar.gz
@@ -16,7 +19,7 @@
make distclean
export CFLAGS="$CFLAGS -fPIC"
export FFLAGS="$FFLAGS -fPIC"
-./configure --prefix="$ISSM_TIER/externalpackages/mpich2/install"
+./configure --prefix="$ISSM_DIR/externalpackages/mpich2/install"
#Apply Patch to examples
patch ./examples/Makefile ../configs/1.0.2/win32/Examples.Makefile.patch
Modified: issm/trunk/externalpackages/mpich2/install-1.4-linux64.sh
===================================================================
--- issm/trunk/externalpackages/mpich2/install-1.4-linux64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/mpich2/install-1.4-linux64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf src install mpich2-1.4
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich2-1.4.tar.gz' 'mpich2-1.4.tar.gz'
+
#Untar
tar -zxvf mpich2-1.4.tar.gz
@@ -16,7 +19,7 @@
export CFLAGS="$CFLAGS -fPIC"
export FFLAGS="$FFLAGS -fPIC"
./configure \
- --prefix="$ISSM_TIER/externalpackages/mpich2/install" \
+ --prefix="$ISSM_DIR/externalpackages/mpich2/install" \
--enable-shared \
--enable-sharedlibs=gcc \
--enable-f91=gfortran
Modified: issm/trunk/externalpackages/mpich2/install-1.4-macosx32.sh
===================================================================
--- issm/trunk/externalpackages/mpich2/install-1.4-macosx32.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/mpich2/install-1.4-macosx32.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf src install mpich2-1.4
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich2-1.4.tar.gz' 'mpich2-1.4.tar.gz'
+
#Untar
tar -zxvf mpich2-1.4.tar.gz
@@ -18,7 +21,7 @@
export CXXFLAGS=" -arch i386"
export CPPFLAGS=" -arch i386"
./configure \
- --prefix="$ISSM_TIER/externalpackages/mpich2/install" \
+ --prefix="$ISSM_DIR/externalpackages/mpich2/install" \
--enable-f91=gfortran \
--enable-sharedlibs=osx-gcc \
--enable-shared \
Modified: issm/trunk/externalpackages/mpich2/install-1.4-macosx64.sh
===================================================================
--- issm/trunk/externalpackages/mpich2/install-1.4-macosx64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/mpich2/install-1.4-macosx64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf src install mpich2-1.4
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich2-1.4.tar.gz' 'mpich2-1.4.tar.gz'
+
#Untar
tar -zxvf mpich2-1.4.tar.gz
@@ -18,7 +21,7 @@
export CFLAGS=" -arch x86_64"
export CXXFLAGS=" -arch x86_64"
./configure \
- --prefix="$ISSM_TIER/externalpackages/mpich2/install" \
+ --prefix="$ISSM_DIR/externalpackages/mpich2/install" \
--enable-f91 \
--enable-sharedlibs=osx-gcc \
--enable-shared \
Modified: issm/trunk/externalpackages/ncview/install.sh
===================================================================
--- issm/trunk/externalpackages/ncview/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/ncview/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/ncview-1.93g.tar.gz' 'ncview-1.93g.tar.gz'
+
#Untar
tar -zxvf ncview-1.93g.tar.gz
@@ -14,11 +17,11 @@
#Configure doxygen
cd install
./configure \
- --prefix "$ISSM_TIER/externalpackages/ncview/install" \
+ --prefix "$ISSM_DIR/externalpackages/ncview/install" \
--x-libraries=/usr/X11/lib/ \
--x-includes=/usr/X11/include/ \
- --with-netcdf_incdir="$ISSM_TIER/externalpackages/netcdf/install/include/" \
- --with-netcdf_libdir="$ISSM_TIER/externalpackages/netcdf/install/lib/"
+ --with-netcdf_incdir="$ISSM_DIR/externalpackages/netcdf/install/include/" \
+ --with-netcdf_libdir="$ISSM_DIR/externalpackages/netcdf/install/lib/"
make
make install
Modified: issm/trunk/externalpackages/netcdf/install.sh
===================================================================
--- issm/trunk/externalpackages/netcdf/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/netcdf/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install netcdf-4.0.1
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/netcdf-4.0.1.tar.gz' 'netcdf-4.0.1.tar.gz'
+
#Untar
tar -zxvf netcdf-4.0.1.tar.gz
@@ -14,7 +17,7 @@
#Configure and compile
cd install
-./configure --prefix="$ISSM_TIER/externalpackages/netcdf/install"
+./configure --prefix="$ISSM_DIR/externalpackages/netcdf/install"
if [ -z $1 ]; then
make
else
Property changes on: issm/trunk/externalpackages/nose
___________________________________________________________________
Modified: svn:ignore
- py3k
+ py3k
src-*
Modified: issm/trunk/externalpackages/nose/install-macosx64sh
===================================================================
--- issm/trunk/externalpackages/nose/install-macosx64sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/nose/install-macosx64sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,10 +1,29 @@
-#/bin/bash
-#Install Python3 nose module
+#!/bin/bash
+#Install Python nose module
-rm -rf py3k
+pythonversion=2
+
+rm -rf src
-svn checkout http://python-nose.googlecode.com/svn/branches/py3k
-cd py3k
+if [[ $pythonversion == "3" ]];then
-python3.2 ./setup.py build
-python3.2 ./setup.py install
+ svn checkout http://python-nose.googlecode.com/svn/branches/py3k
+ mv py3k src
+
+ cd src
+ python ./setup.py build
+ python ./setup.py install
+fi
+
+if [[ $pythonversion == "2" ]];then
+
+ #Download from ISSM server
+ $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/nose-1.1.2.tar.gz' 'nose-1.1.2.tar.gz'
+ tar -zxvf nose-1.1.2.tar.gz
+ mv nose-1.1.2 src
+ rm -rf nose-1.1.2
+
+ cd src
+ python ./setup.py build
+ python ./setup.py install
+fi
Modified: issm/trunk/externalpackages/oofem/install.sh
===================================================================
--- issm/trunk/externalpackages/oofem/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/oofem/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,6 +5,9 @@
rm -rf oofem-2.0
mkdir src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/oofem-2.0.tar.gz' 'oofem-2.0.tar.gz'
+
#Untar
tar -zxvf oofem-2.0.tar.gz
Modified: issm/trunk/externalpackages/pcre/install.sh
===================================================================
--- issm/trunk/externalpackages/pcre/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/pcre/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,6 +5,9 @@
rm -rf pcre-8.21
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/pcre-8.21.tar.gz' 'pcre-8.21.tar.gz'
+
#Untar and move python into install directory
tar -zxvf pcre-8.21.tar.gz
mv pcre-8.21/* install
@@ -12,6 +15,6 @@
#Configure doxygen
cd install
-./configure --prefix "$ISSM_TIER/externalpackages/python/install"
+./configure --prefix "$ISSM_DIR/externalpackages/python/install"
make
make install
Modified: issm/trunk/externalpackages/petsc/install-2.3.2-altix64-castor.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-2.3.2-altix64-castor.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-2.3.2-altix64-castor.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -8,6 +8,9 @@
rm -rf install petsc-2.3.2-p3 src
mkdir install src
+ #Download from ISSM server
+ $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-2.3.2-p3.tar.gz
mv petsc-2.3.2-p3/* install/
@@ -16,7 +19,7 @@
#configure
cd install
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
--with-batch=1 \
--ISSM_ARCH=$ISSM_ARCH \
--PETSC_DIR=$PETSC_DIR \
@@ -40,7 +43,7 @@
if [ $STEP -eq 2 ]; then
cd install
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
--with-batch=1 \
--ISSM_ARCH=$ISSM_ARCH \
--PETSC_DIR=$PETSC_DIR \
Modified: issm/trunk/externalpackages/petsc/install-2.3.2-cosmos.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-2.3.2-cosmos.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-2.3.2-cosmos.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install petsc-2.3.2-p3 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-2.3.2-p3.tar.gz
mv petsc-2.3.2-p3/* install/
@@ -11,7 +14,7 @@
#configure
cd install
-PETSC_DIR=$ISSM_TIER/externalpackages/petsc/install
+PETSC_DIR=$ISSM_DIR/externalpackages/petsc/install
./config/configure.py \
--prefix=$PETSC_DIR \
--with-batch=1 \
Modified: issm/trunk/externalpackages/petsc/install-2.3.2-linux64-astrid.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-2.3.2-linux64-astrid.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-2.3.2-linux64-astrid.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install petsc-2.3.2-p3 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-2.3.2-p3.tar.gz
mv petsc-2.3.2-p3/* install/
@@ -12,10 +15,10 @@
#configure
cd install
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
- --with-mpi-dir=$ISSM_TIER/externalpackages/mpich2/install \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+ --with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
--PETSC_ARCH=linux-gnu-amd64 \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/install" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install" \
--with-fc=gfortran \
--with-debugging=1 \
--with-shared=0 \
@@ -24,7 +27,7 @@
--download-blacs=yes \
--download-blas=yes \
--download-f-blas-lapack=yes \
- --FFLAGS=-I$ISSM_TIER/externalpackages/mpich2/install/include \
+ --FFLAGS=-I$ISSM_DIR/externalpackages/mpich2/install/include \
--download-plapack=yes \
--COPTFLAGS="-march=opteron -O2" \
--FOPTFLAGS="-march=opteron -O2" \
Modified: issm/trunk/externalpackages/petsc/install-2.3.2-macosx32-eric.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-2.3.2-macosx32-eric.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-2.3.2-macosx32-eric.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -8,6 +8,9 @@
rm -rf install petsc-2.3.2-p3 src
mkdir install src
+ #Download from ISSM server
+ $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-2.3.2-p3.tar.gz
mv petsc-2.3.2-p3/* install/
@@ -16,10 +19,10 @@
#configure
cd install
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
- --with-mpi-dir=$ISSM_TIER/externalpackages/mpich2/install \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+ --with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
--PETSC_ARCH=macosx-gnu \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/install" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install" \
--with-fc=/usr/local/bin/gfortran \
--with-debugging=0 \
--with-shared=0 \
@@ -28,7 +31,7 @@
--download-blacs=yes \
--download-blas=yes \
--download-f-blas-lapack=yes \
- --FFLAGS="-I$ISSM_TIER/externalpackages/mpich2/install/include -L$ISSM_TIER/externalpackages/mpich2/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran -fPIC -arch i386" \
+ --FFLAGS="-I$ISSM_DIR/externalpackages/mpich2/install/include -L$ISSM_DIR/externalpackages/mpich2/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran -fPIC -arch i386" \
--download-plapack=yes \
--CXXFLAGS=" -fPIC -arch i386" \
--CFLAGS=" -fPIC -arch i386" \
@@ -42,19 +45,19 @@
if [ $STEP -eq 2 ]; then
cd install
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
- --with-mpi-dir=$ISSM_TIER/externalpackages/mpich2/install \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+ --with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
--PETSC_ARCH=macosx-gnu \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/install" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install" \
--with-fc=/usr/local/bin/gfortran \
--with-debugging=0 \
--with-shared=0 \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3 \
+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3 \
--download-scalapack=yes \
--download-blacs=yes \
--download-blas=yes \
--download-f-blas-lapack=yes \
- --FFLAGS="-I$ISSM_TIER/externalpackages/mpich2/install/include -L$ISSM_TIER/externalpackages/mpich2/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran -fPIC -arch i386" \
+ --FFLAGS="-I$ISSM_DIR/externalpackages/mpich2/install/include -L$ISSM_DIR/externalpackages/mpich2/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran -fPIC -arch i386" \
--download-plapack=yes \
--CXXFLAGS=" -fPIC -arch i386" \
--CFLAGS=" -fPIC -arch i386" \
Modified: issm/trunk/externalpackages/petsc/install-2.3.2-macosx32-ogive.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-2.3.2-macosx32-ogive.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-2.3.2-macosx32-ogive.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install petsc-2.3.2-p3 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-2.3.2-p3.tar.gz
mv petsc-2.3.2-p3/* install/
@@ -11,10 +14,10 @@
#configure
cd install
-./config/configure.py --prefix="$ISSM_TIER/externalpackages/petsc/install" \
- --with-mpi-dir=$ISSM_TIER/externalpackages/mpich2/install \
+./config/configure.py --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+ --with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
--PETSC_ARCH=macosx-gnu \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/install" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install" \
--with-fc=/usr/local/bin/gfortran \
--with-debugging=0 \
--with-shared=0 \
@@ -23,7 +26,7 @@
--download-blacs=yes \
--download-blas=yes \
--download-f-blas-lapack=yes \
- --FFLAGS="-I$ISSM_TIER/externalpackages/mpich2/install/include -L$ISSM_TIER/externalpackages/mpich2/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran" \
+ --FFLAGS="-I$ISSM_DIR/externalpackages/mpich2/install/include -L$ISSM_DIR/externalpackages/mpich2/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran" \
--download-plapack=yes
#Compile petsc and install it
Modified: issm/trunk/externalpackages/petsc/install-2.3.2-macosx64.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-2.3.2-macosx64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-2.3.2-macosx64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install petsc-2.3.2-p3 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-2.3.2-p3.tar.gz
mv petsc-2.3.2-p3/* src/
@@ -12,10 +15,10 @@
#configure
cd src
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
--PETSC_ARCH=macosx-gnu \
- --with-mpi-dir="$ISSM_TIER/externalpackages/mpich2/install" \
+ --with-mpi-dir="$ISSM_DIR/externalpackages/mpich2/install" \
--with-debugging=0 \
--with-shared-libraries=0 \
--download-mumps=yes \
Modified: issm/trunk/externalpackages/petsc/install-2.3.2-pleiades.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-2.3.2-pleiades.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-2.3.2-pleiades.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -8,6 +8,9 @@
rm -rf install petsc-2.3.2-p3 src
mkdir install src
+ #Download from ISSM server
+ $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-2.3.2-p3.tar.gz
mv petsc-2.3.2-p3/* install/
@@ -16,7 +19,7 @@
#configure
cd install
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
--with-batch=1 \
--PETSC_ARCH=$ISSM_ARCH \
--PETSC_DIR=$PETSC_DIR \
@@ -43,7 +46,7 @@
if [ $STEP -eq 2 ]; then
cd install
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
--with-batch=1 \
--PETSC_ARCH=$ISSM_ARCH \
--PETSC_DIR=$PETSC_DIR \
Modified: issm/trunk/externalpackages/petsc/install-2.3.2-win32-eric.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-2.3.2-win32-eric.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-2.3.2-win32-eric.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install petsc-2.3.2-p3 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-2.3.2-p3.tar.gz
mv petsc-2.3.2-p3/* install/
@@ -13,9 +16,9 @@
cd install
./config/configure.py \
--with-parallel-no \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
--PETSC_ARCH=cygwin-intel \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/install" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install" \
--with-debugging=0 \
--with-mpi=0 \
--download-c-blas-lapack=1
Modified: issm/trunk/externalpackages/petsc/install-2.3.2-win7.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-2.3.2-win7.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-2.3.2-win7.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install petsc-2.3.2-p3 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-2.3.2-p3.tar.gz
mv petsc-2.3.2-p3/* install/
@@ -13,9 +16,9 @@
cd install
./config/configure.py \
--with-parallel-no \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
--PETSC_ARCH=cygwin-intel \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/install" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install" \
--with-debugging=0 \
--with-mpi=0 \
--download-c-blas-lapack=1
Modified: issm/trunk/externalpackages/petsc/install-3.1-altix64-castor.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-3.1-altix64-castor.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-3.1-altix64-castor.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -8,6 +8,9 @@
rm -rf install petsc-3.1-p7 src
mkdir install src
+ #Download from ISSM server
+ $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.1-p7.tar.gz' 'petsc-3.1-p7.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-3.1-p7.tar.gz
mv petsc-3.1-p7/* install/
@@ -16,8 +19,8 @@
#configure
cd src
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
--ISSM_ARCH=$ISSM_ARCH \
--with-debugging=no \
--with-shared=0 COPTFLAGS=-O3 FOPTFLAGS=-O3 \
@@ -40,8 +43,8 @@
if [ $STEP -eq 2 ]; then
cd src
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
--with-batch=1 \
--ISSM_ARCH=$ISSM_ARCH \
--with-debugging=no \
Modified: issm/trunk/externalpackages/petsc/install-3.1-cosmos.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-3.1-cosmos.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-3.1-cosmos.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install petsc-3.1-p7 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.1-p7.tar.gz' 'petsc-3.1-p7.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-3.1-p7.tar.gz
mv petsc-3.1-p7/* src/
@@ -12,8 +15,8 @@
#configure
cd src
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
--with-batch=1 \
--ISSM_ARCH=$ISSM_ARCH \
--with-debugging=no COPTFLAGS=-O3 FOPTFLAGS=-O3 \
Modified: issm/trunk/externalpackages/petsc/install-3.1-linux64-astrid.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-3.1-linux64-astrid.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-3.1-linux64-astrid.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install petsc-3.1-p7 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.1-p7.tar.gz' 'petsc-3.1-p7.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-3.1-p7.tar.gz
mv petsc-3.1-p7/* src/
@@ -12,10 +15,10 @@
#configure
cd src
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
- --with-mpi-dir=$ISSM_TIER/externalpackages/mpich2/install \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+ --with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
--PETSC_ARCH=linux-gnu-amd64 \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
--with-debugging=0 \
--with-shared=0 \
--download-mumps=yes \
@@ -24,7 +27,7 @@
--download-blas=yes \
--download-f-blas-lapack=yes \
--download-parmetis=yes \
- --FFLAGS=-I$ISSM_TIER/externalpackages/mpich2/install/include \
+ --FFLAGS=-I$ISSM_DIR/externalpackages/mpich2/install/include \
--download-plapack=yes \
--COPTFLAGS="-march=opteron -O2" \
--FOPTFLAGS="-march=opteron -O2" \
Modified: issm/trunk/externalpackages/petsc/install-3.1-macosx32-mathieu.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-3.1-macosx32-mathieu.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-3.1-macosx32-mathieu.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install petsc-3.1-p7 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.1-p7.tar.gz' 'petsc-3.1-p7.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-3.1-p7.tar.gz
mv petsc-3.1-p7/* src/
@@ -12,10 +15,10 @@
#configure
cd src
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
--PETSC_ARCH=macosx-gnu \
- --with-mpi-dir=$ISSM_TIER/externalpackages/mpich2/install \
+ --with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
--with-debugging=0 \
--with-shared=0 \
--download-mumps=yes \
@@ -24,7 +27,7 @@
--download-blas=yes \
--download-f-blas-lapack=yes \
--download-plapack=yes \
- --FFLAGS="-I$ISSM_TIER/externalpackages/mpich2/install/include -arch i386" \
+ --FFLAGS="-I$ISSM_DIR/externalpackages/mpich2/install/include -arch i386" \
--COPTFLAGS="-march=opteron -O2 -arch i386" \
--FOPTFLAGS="-march=opteron -O2 -arch i386" \
--CXXOPTFLAGS="-march=opteron -O2 -arch i386" \
Modified: issm/trunk/externalpackages/petsc/install-3.1-macosx32-ogive.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-3.1-macosx32-ogive.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-3.1-macosx32-ogive.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install petsc-3.1-p7 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.1-p7.tar.gz' 'petsc-3.1-p7.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-3.1-p7.tar.gz
mv petsc-3.1-p7/* src/
@@ -12,9 +15,9 @@
#configure
cd src
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
- --with-mpi-dir=$ISSM_TIER/externalpackages/mpich2/install \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
+ --with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
--PETSC_ARCH=macosx-gnu \
--with-fc=/usr/local/bin/gfortran \
--with-debugging=0 \
@@ -29,7 +32,7 @@
--COPTFLAGS="-march=opteron -O2 " \
--FOPTFLAGS="-march=opteron -O2 " \
--CXXOPTFLAGS="-march=opteron -O2 " \
- --FFLAGS="-I$ISSM_TIER/externalpackages/mpich2/install/include -L$ISSM_TIER/externalpackages/mpich2/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran "
+ --FFLAGS="-I$ISSM_DIR/externalpackages/mpich2/install/include -L$ISSM_DIR/externalpackages/mpich2/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran "
#Compile petsc and install it
make
Modified: issm/trunk/externalpackages/petsc/install-3.1-pleiades.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-3.1-pleiades.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-3.1-pleiades.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -8,6 +8,9 @@
rm -rf install petsc-3.1-p7 src
mkdir install src
+ #Download from ISSM server
+ $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.1-p7.tar.gz' 'petsc-3.1-p7.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-3.1-p7.tar.gz
mv petsc-3.1-p7/* install/
@@ -16,10 +19,10 @@
#configure
cd src
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
--with-batch=1 \
--PETSC_ARCH="$ISSM_ARCH" \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
--with-debugging=no \
--with-shared=0 \
--with-blas-lapack-dir=/nasa/intel/mkl/10.0.011/ \
@@ -43,10 +46,10 @@
if [ $STEP -eq 2 ]; then
cd src
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
--with-batch=1 \
--PETSC_ARCH="$ISSM_ARCH" \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
--with-debugging=no \
--with-shared=0 \
--with-blas-lapack-dir=/nasa/intel/mkl/10.0.011/ \
@@ -56,7 +59,7 @@
--download-mumps=yes \
--download-scalapack=yes \
--download-blacs=yes \
- --with-plapack-dir=$ISSM_TIER/externalpackages/petsc/src/$ISSM_ARCH \
+ --with-plapack-dir=$ISSM_DIR/externalpackages/petsc/src/$ISSM_ARCH \
--download-parmetis=yes \
--FFLAGS=-I/usr/include \
--with-cc=icc \
Modified: issm/trunk/externalpackages/petsc/install-3.1-win7.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-3.1-win7.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-3.1-win7.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install petsc-3.1-p7 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.1-p7.tar.gz' 'petsc-3.1-p7.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-3.1-p7.tar.gz
mv petsc-3.1-p7/* src/
@@ -13,9 +16,9 @@
cd src
./config/configure.py \
--with-parallel-no \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
--PETSC_ARCH=cygwin-intel \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
--with-debugging=0 \
--with-mpi=0 \
--download-c-blas-lapack=yes \
@@ -25,10 +28,10 @@
--with-clanguage=cxx
#./config/configure.py \
-# --prefix="$ISSM_TIER/externalpackages/petsc/install" \
-# --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+# --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+# --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
# --PETSC_ARCH=macosx-gnu \
-# --with-mpi-dir=$ISSM_TIER/externalpackages/mpich2/install \
+# --with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
# --with-debugging=0 \
# --with-shared=0 \
# --download-mumps=yes \
@@ -37,7 +40,7 @@
# --download-blas=yes \
# --download-f-blas-lapack=yes \
# --download-plapack=yes \
-# --FFLAGS="-I$ISSM_TIER/externalpackages/mpich2/install/include -arch i386" \
+# --FFLAGS="-I$ISSM_DIR/externalpackages/mpich2/install/include -arch i386" \
# --COPTFLAGS="-march=opteron -O2 -arch i386" \
# --FOPTFLAGS="-march=opteron -O2 -arch i386" \
# --CXXOPTFLAGS="-march=opteron -O2 -arch i386" \
Modified: issm/trunk/externalpackages/petsc/install-3.2-greenplanet.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-3.2-greenplanet.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-3.2-greenplanet.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install petsc-3.2-p3 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.2-p3.tar.gz' 'petsc-3.2-p3.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-3.2-p3.tar.gz
mv petsc-3.2-p3/* src/
@@ -12,8 +15,8 @@
#configure
cd src
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
--PETSC_ARCH="$ISSM_ARCH" \
--with-batch=1 \
--with-debugging=0 \
Modified: issm/trunk/externalpackages/petsc/install-3.2-linux64.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-3.2-linux64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-3.2-linux64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install petsc-3.2-p3 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.2-p3.tar.gz' 'petsc-3.2-p3.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-3.2-p3.tar.gz
mv petsc-3.2-p3/* src/
@@ -12,11 +15,11 @@
#configure
cd src
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
- --with-mpi-dir=$ISSM_TIER/externalpackages/mpich2/install \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+ --with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
--with-clanguage=C++ \
--PETSC_ARCH=linux-gnu-amd64 \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
--with-debugging=0 \
--with-shared-libraries=0 \
--download-mumps=yes \
Modified: issm/trunk/externalpackages/petsc/install-3.2-macosx64.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-3.2-macosx64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-3.2-macosx64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install petsc-3.2-p3 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.2-p3.tar.gz' 'petsc-3.2-p3.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-3.2-p3.tar.gz
mv petsc-3.2-p3/* src/
@@ -12,10 +15,10 @@
#configure
cd src
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
--PETSC_ARCH=macosx-gnu \
- --with-mpi-dir="$ISSM_TIER/externalpackages/mpich2/install" \
+ --with-mpi-dir="$ISSM_DIR/externalpackages/mpich2/install" \
--with-debugging=0 \
--with-shared-libraries=0 \
--download-mumps=yes \
Modified: issm/trunk/externalpackages/petsc/install-3.2-pleiades.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-3.2-pleiades.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-3.2-pleiades.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,13 +1,16 @@
#!/bin/bash
#Step 1: unzip and install
#Step 2: After Plapack implodes
-STEP=2
+STEP=1
if [ $STEP -eq 1 ]; then
#Some cleanup
rm -rf install petsc-3.2-p3 src
mkdir install src
+ #Download from ISSM server
+ $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.2-p3.tar.gz' 'petsc-3.2-p3.tar.gz'
+
#Untar and move petsc to install directory
tar -zxvf petsc-3.2-p3.tar.gz
mv petsc-3.2-p3/* src/
@@ -16,10 +19,10 @@
#configure
cd src
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
--with-batch=1 \
--PETSC_ARCH="$ISSM_ARCH" \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
--with-debugging=0 \
--with-shared-libraries=0 \
--with-blas-lapack-dir=/nasa/intel/mkl/10.0.011/ \
@@ -37,16 +40,16 @@
--FOPTFLAGS=" -O3 -xS" \
--CXXOPTFLAGS=" -O3 -xS" \
--with-pic=1
- echo "== Fix Plapack compilation manually (http://issm.jpl.nasa.gov/installation/compilationtroubleshooting/petsc31/) =="
+ echo "== Fix Plapack compilation manually (http://issm.jpl.nasa.gov/documentation/faq/petsc32/) =="
echo "== Then run STEP=2 =="
fi
if [ $STEP -eq 2 ]; then
cd src
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
--with-batch=1 \
--PETSC_ARCH="$ISSM_ARCH" \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
--with-debugging=0 \
--with-shared-libraries=0 \
--with-blas-lapack-dir=/nasa/intel/mkl/10.0.011/ \
@@ -56,7 +59,7 @@
--download-mumps=yes \
--download-scalapack=yes \
--download-blacs=yes \
- --with-plapack-dir=$ISSM_TIER/externalpackages/petsc/src/$ISSM_ARCH \
+ --with-plapack-dir=$ISSM_DIR/externalpackages/petsc/src/$ISSM_ARCH \
--download-parmetis=yes \
--FFLAGS=-I/usr/include \
--with-cc=icc \
@@ -65,5 +68,20 @@
--FOPTFLAGS=" -O3 -xS" \
--CXXOPTFLAGS=" -O3 -xS" \
--with-pic=1
+ cat > src/script.queue << EOF
+#PBS -S /bin/bash
+#PBS -q debug
+#PBS -l select=1:ncpus=1:model=har
+#PBS -l walltime=200
+#PBS -W group_list=s1010
+#PBS -m e
+. /usr/share/modules/init/bash
+module load comp-intel/11.1.046
+module load mpi/mpt.1.25
+module load math/intel_mkl_64_10.0.011
+export PATH="$PATH:."
+export MPI_GROUP_MAX=64
+mpiexec -np 1 ./conftest-linux-gnu-ia64-intel.py
+EOF
echo "== Follow PETSc's instructions"
fi
Modified: issm/trunk/externalpackages/petsc/install-dev-linux64.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-dev-linux64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/petsc/install-dev-linux64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,6 +5,7 @@
if [ $STEP -eq 1 ]; then
# Adapted from petsc 3.2.
# Used Mercurial to get code
+ rm -rf src
hg clone http://petsc.cs.iit.edu/petsc/petsc-dev src
cd src
hg clone http://petsc.cs.iit.edu/petsc/BuildSystem config/BuildSystem
@@ -24,13 +25,14 @@
if [ $STEP -eq 2 ]; then
+ rm -rf install
cd src
./config/configure.py \
- --prefix="$ISSM_TIER/externalpackages/petsc/install" \
- --with-mpi-dir="$ISSM_TIER/externalpackages/mpich2/install" \
+ --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+ --with-mpi-dir="$ISSM_DIR/externalpackages/mpich2/install" \
--with-clanguage=C++ \
--PETSC_ARCH=linux-gnu-amd64 \
- --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
--with-debugging=0 \
--with-shared-libraries=0 \
--download-metis=yes \
@@ -41,6 +43,7 @@
--download-f-blas-lapack=yes \
--download-plapack=yes \
--download-parmetis=yes \
+ --download-spai=yes \
--with-pic=1
#Compile petsc and install it
Modified: issm/trunk/externalpackages/polygonclipper/install.sh
===================================================================
--- issm/trunk/externalpackages/polygonclipper/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/polygonclipper/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -3,6 +3,9 @@
#Some cleanup
rm -rf install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/PolygonClipper.zip' 'PolygonClipper.zip'
+
#install
mkdir install
cd install
Property changes on: issm/trunk/externalpackages/pyclips
___________________________________________________________________
Added: svn:ignore
+ install
Property changes on: issm/trunk/externalpackages/python
___________________________________________________________________
Modified: svn:ignore
- install-*
install
src
+ install
src
*.tgz
Modified: issm/trunk/externalpackages/qhull/install.sh
===================================================================
--- issm/trunk/externalpackages/qhull/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/qhull/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf src install qhull-2003.1
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/qhull-2003.1.tar.gz' 'qhull-2003.1.tar.gz'
+
#Untar
tar -zxvf qhull-2003.1.tar.gz
@@ -14,6 +17,6 @@
#Configure qhull
cd src
-./configure --prefix="$ISSM_TIER/externalpackages/qhull/install"
+./configure --prefix="$ISSM_DIR/externalpackages/qhull/install"
make
make install
Modified: issm/trunk/externalpackages/rats/install.sh
===================================================================
--- issm/trunk/externalpackages/rats/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/rats/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -3,6 +3,9 @@
#Erase install
rm -rf install src rats-2.3
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/rats-2.3.tar.gz' 'rats-2.3.tar.gz'
+
#install directory
mkdir src
tar -zxvf rats-2.3.tar.gz
@@ -11,7 +14,7 @@
#compile
cd src
-./configure --prefix=$ISSM_TIER/externalpackages/rats/install
+./configure --prefix=$ISSM_DIR/externalpackages/rats/install
make
make install
cd ..
Property changes on: issm/trunk/externalpackages/readline
___________________________________________________________________
Added: svn:ignore
+ src
src-*
Modified: issm/trunk/externalpackages/rose/install.sh
===================================================================
--- issm/trunk/externalpackages/rose/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/rose/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf source build install
mkdir install source build
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/rose-0.9.5a-13219.tar.gz' 'rose-0.9.5a-13219.tar.gz'
+
#Untar
tar -zxvf rose-0.9.5a-13219.tar.gz
@@ -14,9 +17,9 @@
#Configure
cd build
../source/configure \
- --prefix=$ISSM_TIER/externalpackages/rose/install \
- --with-boost=$ISSM_TIER/externalpackages/boost/install\
- --srcdir=$ISSM_TIER/externalpackages/rose/source
+ --prefix=$ISSM_DIR/externalpackages/rose/install \
+ --with-boost=$ISSM_DIR/externalpackages/boost/install\
+ --srcdir=$ISSM_DIR/externalpackages/rose/source
if [ -z $1 ]; then
make
Modified: issm/trunk/externalpackages/satstress/install.sh
===================================================================
--- issm/trunk/externalpackages/satstress/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/satstress/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install SatStress-0.1.2
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/SatStress-0.1.2.tar.gz' 'SatStress-0.1.2.tar.gz'
+
#Untar
tar -zxvf SatStress-0.1.2.tar.gz
Property changes on: issm/trunk/externalpackages/scipy
___________________________________________________________________
Modified: svn:ignore
- scipy
numpy
+ scipy
scipy-*
numpy
numpy-*
Modified: issm/trunk/externalpackages/scipy/README
===================================================================
--- issm/trunk/externalpackages/scipy/README 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/scipy/README 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,2 +1,2 @@
You will find instructions on scipy at:
-http://www.scipy.org/Installing_SciPy/Mac_OS_X#head-ba1926aec910a9a1deaf9eff99e38ee23103a3b3
+http://www.scipy.org/Installing_SciPy/Mac_OS_X
Modified: issm/trunk/externalpackages/scotch/install.sh
===================================================================
--- issm/trunk/externalpackages/scotch/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/scotch/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -8,6 +8,9 @@
# Create src and install directories
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/scotch_5.1.6.tar.gz' 'scotch_5.1.6.tar.gz'
+
# Untar
tar -xvzf scotch_5.1.6.tar.gz
Modified: issm/trunk/externalpackages/shapelib/install.sh
===================================================================
--- issm/trunk/externalpackages/shapelib/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/shapelib/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -6,6 +6,10 @@
rm -rf install
mkdir src install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/shapelib-1.2.10.tar.gz' 'shapelib-1.2.10.tar.gz'
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/shape_eg_data.zip' 'shape_eg_data.zip'
+
# Untar
tar -xvzf shapelib-1.2.10.tar.gz
unzip shape_eg_data.zip -d shapelib-1.2.10/eg_data
Modified: issm/trunk/externalpackages/slepc/install.sh
===================================================================
--- issm/trunk/externalpackages/slepc/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/slepc/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install slepc-2.3.2
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/slepc-2.3.2.tgz' 'slepc-2.3.2.tgz'
+
#Untar
tar -zxvf slepc-2.3.2.tgz
Modified: issm/trunk/externalpackages/swig/install.sh
===================================================================
--- issm/trunk/externalpackages/swig/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/swig/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,6 +5,9 @@
rm -rf swig-2.0.4
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/swig-2.0.4.tar.gz' 'swig-2.0.4.tar.gz'
+
#Untar and move python into install directory
tar -zxvf swig-2.0.4.tar.gz
mv swig-2.0.4/* install
@@ -12,15 +15,15 @@
#Copy pcre prototype in include directory
cd install
-#cp $ISSM_TIER/externalpackages/pcre/install/pcre.h ./Source/Include/
-#cp $ISSM_TIER/externalpackages/pcre/install/.libs/* ./Source/Include/
-export CFLAGS="$CFLAGS -I$ISSM_TIER/externalpackages/pcre/install"
-export LDFLAGS="-L$ISSM_TIER/externalpackages/pcre/install/.libs/"
+#cp $ISSM_DIR/externalpackages/pcre/install/pcre.h ./Source/Include/
+#cp $ISSM_DIR/externalpackages/pcre/install/.libs/* ./Source/Include/
+export CFLAGS="$CFLAGS -I$ISSM_DIR/externalpackages/pcre/install"
+export LDFLAGS="-L$ISSM_DIR/externalpackages/pcre/install/.libs/"
export LIBS="-lpcre"
#Configure doxygen
./configure \
- --prefix="$ISSM_TIER/externalpackages/python/install" \
- --with-pcre-prefix="$ISSM_TIER/externalpackages/pcre/install" \
- --with-pcre-exec-prefix="$ISSM_TIER/externalpackages/pcre/install"
+ --prefix="$ISSM_DIR/externalpackages/python/install" \
+ --with-pcre-prefix="$ISSM_DIR/externalpackages/pcre/install" \
+ --with-pcre-exec-prefix="$ISSM_DIR/externalpackages/pcre/install"
make
make install
Modified: issm/trunk/externalpackages/tao/install.sh
===================================================================
--- issm/trunk/externalpackages/tao/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/tao/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -6,6 +6,9 @@
rm -rf install tao-2.0-p3
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/tao-2.0-p3.tar.gz' 'tao-2.0-p3.tar.gz'
+
#Untar
tar -zxvf tao-2.0-p3.tar.gz
@@ -13,7 +16,7 @@
mv tao-2.0-p3/* install/
rm -rf tao-2.0-p3
cd install
-export TAO_DIR="$ISSM_TIER/externalpackages/tao/install/"
+export TAO_DIR="$ISSM_DIR/externalpackages/tao/install/"
#petsc needs to be compiled with --with-clanguage=C++
make
Modified: issm/trunk/externalpackages/tex2im/install.sh
===================================================================
--- issm/trunk/externalpackages/tex2im/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/tex2im/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/tex2im-1.8.tar.gz' 'tex2im-1.8.tar.gz'
+
#Untar
tar -zxvf tex2im-1.8.tar.gz
Property changes on: issm/trunk/externalpackages/triangle
___________________________________________________________________
Modified: svn:ignore
- install
+ install
install-matlab
install-python
Modified: issm/trunk/externalpackages/triangle/configs/android/android-4.0/configure.make
===================================================================
--- issm/trunk/externalpackages/triangle/configs/android/android-4.0/configure.make 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/triangle/configs/android/android-4.0/configure.make 2012-06-02 00:27:43 UTC (rev 12332)
@@ -10,10 +10,10 @@
# http://www.codesourcery.com/gnu_toolchains/arm/arm_gnu_linux_abi.pdf
ANDROID_BIN=$(ISSM_TIER)/src/android/tmp/android-14-toolchain/bin
-CC=$(ANDROID_DEV_DIR)/tmp/android-linux-4.0/bin/arm-linux-androideabi-gcc
-AR=$(ANDROID_DEV_DIR)/tmp/android-linux-4.0/bin/arm-linux-androideabi-ar
-RANLIB=$(ANDROID_DEV_DIR)/tmp/android-linux-4.0/bin/arm-linux-androideabi-ranlib
-CSWITCHES = $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -I$(MATLAB_DIR)/extern/include -fPIC -I$(MATLAB_DIR)/include
+CC=$(ANDROID_DIR)/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc
+AR=$(ANDROID_DIR)/arm-linux-android-4.0/bin/arm-linux-androideabi-ar
+RANLIB=$(ANDROID_DIR)/arm-linux-android-4.0/bin/arm-linux-androideabi-ranlib
+CSWITCHES = $(CFLAGS)
TRILIBDEFS = -DTRILIBRARY
OBJ_EXT=o
LIB_EXT=a
Modified: issm/trunk/externalpackages/triangle/install-altix64.sh
===================================================================
--- issm/trunk/externalpackages/triangle/install-altix64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/triangle/install-altix64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
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 ./
Modified: issm/trunk/externalpackages/triangle/install-android-4.0.sh
===================================================================
--- issm/trunk/externalpackages/triangle/install-android-4.0.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/triangle/install-android-4.0.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -3,11 +3,13 @@
#use matlab?
matlab=0
-
#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 ./
Modified: issm/trunk/externalpackages/triangle/install-linux64.sh
===================================================================
--- issm/trunk/externalpackages/triangle/install-linux64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/triangle/install-linux64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
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 ./
Modified: issm/trunk/externalpackages/triangle/install-macosx32.sh
===================================================================
--- issm/trunk/externalpackages/triangle/install-macosx32.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/triangle/install-macosx32.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
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 ./
Modified: issm/trunk/externalpackages/triangle/install-macosx64.sh
===================================================================
--- issm/trunk/externalpackages/triangle/install-macosx64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/triangle/install-macosx64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -8,6 +8,9 @@
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 ./
Modified: issm/trunk/externalpackages/triangle/install-pleiades.sh
===================================================================
--- issm/trunk/externalpackages/triangle/install-pleiades.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/triangle/install-pleiades.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
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 ./
Modified: issm/trunk/externalpackages/triangle/install-win32.sh
===================================================================
--- issm/trunk/externalpackages/triangle/install-win32.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/triangle/install-win32.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
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 ./
Modified: issm/trunk/externalpackages/triangle/install-win7.sh
===================================================================
--- issm/trunk/externalpackages/triangle/install-win7.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/triangle/install-win7.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
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 ./
Modified: issm/trunk/externalpackages/triangle/triangle.c.patch.python
===================================================================
--- issm/trunk/externalpackages/triangle/triangle.c.patch.python 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/triangle/triangle.c.patch.python 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,8 +4,8 @@
> * matlab, we had to change the allocation routine trimalloc, as well as the
> * double precision activation in exactinit(); The rest is not changed.
> * We also created the ice_makefile to compile Triangle into a library. */
-> #include <mat.h>
-> #include <matrix.h>
+> /* #include <mat.h>
+> #include <matrix.h> */
> #define ANSI_DECLARATORS
> #define NO_TIMER
>
Modified: issm/trunk/externalpackages/valgrind/install-altix64.sh
===================================================================
--- issm/trunk/externalpackages/valgrind/install-altix64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/valgrind/install-altix64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install valgrind-3.7.0
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/valgrind-3.7.0.tar.bz2' 'valgrind-3.7.0.tar.bz2'
+
#Untar
tar -jxvf valgrind-3.7.0.tar.bz2
@@ -13,7 +16,7 @@
#configure
cd install
-./configure --prefix="$ISSM_TIER/externalpackages/valgrind/install"
+./configure --prefix="$ISSM_DIR/externalpackages/valgrind/install"
#Compile valgrind
make -j 4
Modified: issm/trunk/externalpackages/valgrind/install-linux64.sh
===================================================================
--- issm/trunk/externalpackages/valgrind/install-linux64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/valgrind/install-linux64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install valgrind-3.7.0
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/valgrind-3.7.0.tar.bz2' 'valgrind-3.7.0.tar.bz2'
+
#Untar
tar -jxvf valgrind-3.7.0.tar.bz2
@@ -13,7 +16,7 @@
#configure
cd install
-./configure --prefix="$ISSM_TIER/externalpackages/valgrind/install"
+./configure --prefix="$ISSM_DIR/externalpackages/valgrind/install"
#Compile valgrind
make -j 4
Modified: issm/trunk/externalpackages/valgrind/install-macosx32.sh
===================================================================
--- issm/trunk/externalpackages/valgrind/install-macosx32.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/valgrind/install-macosx32.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install valgrind-3.7.0
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/valgrind-3.7.0.tar.bz2' 'valgrind-3.7.0.tar.bz2'
+
#Untar
tar -jxvf valgrind-3.7.0.tar.bz2
@@ -13,7 +16,7 @@
#configure
cd install
-./configure --prefix="$ISSM_TIER/externalpackages/valgrind/install" --enable-only32bit
+./configure --prefix="$ISSM_DIR/externalpackages/valgrind/install" --enable-only32bit
#Compile valgrind
make -j 4
Modified: issm/trunk/externalpackages/valgrind/install-macosx64.sh
===================================================================
--- issm/trunk/externalpackages/valgrind/install-macosx64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/valgrind/install-macosx64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install valgrind-3.7.0
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/valgrind-3.7.0.tar.bz2' 'valgrind-3.7.0.tar.bz2'
+
#Untar
tar -jxvf valgrind-3.7.0.tar.bz2
@@ -13,7 +16,7 @@
#configure
cd install
-./configure --prefix="$ISSM_TIER/externalpackages/valgrind/install" --enable-only64bit
+./configure --prefix="$ISSM_DIR/externalpackages/valgrind/install" --enable-only64bit
#Compile valgrind
make -j 4
Modified: issm/trunk/externalpackages/valgrind/install-win32.sh
===================================================================
--- issm/trunk/externalpackages/valgrind/install-win32.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/valgrind/install-win32.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install valgrind-3.7.0
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/valgrind-3.7.0.tar.bz2' 'valgrind-3.7.0.tar.bz2'
+
#Untar
tar -jxvf valgrind-3.7.0.tar.bz2
@@ -13,7 +16,7 @@
#configure
cd install
-./configure --prefix="$ISSM_TIER/externalpackages/valgrind/install"
+./configure --prefix="$ISSM_DIR/externalpackages/valgrind/install"
#Compile valgrind
make -j 4
Modified: issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim
===================================================================
--- issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim 2012-06-02 00:27:43 UTC (rev 12332)
@@ -546,6 +546,12 @@
syn keyword cType Geometry
syn keyword cType QuadTree
syn keyword cType SetOfE4
+syn keyword cType Variogram
+syn keyword cType GaussianVariogram
+syn keyword cType ExponentialVariogram
+syn keyword cType SphericalVariogram
+syn keyword cType Quadtree
+syn keyword cType Observation
"ISSM's objects end
"ISSM's Enums begin
@@ -685,6 +691,10 @@
syn keyword cConstant SettingsOutputFrequencyEnum
syn keyword cConstant SettingsResultsAsPatchesEnum
syn keyword cConstant SettingsWaitonlockEnum
+syn keyword cConstant DebugPetscProfilingEnum
+syn keyword cConstant PetscProfilingCurrentMemEnum
+syn keyword cConstant PetscProfilingCurrentFlopsEnum
+syn keyword cConstant PetscProfilingSolutionTimeEnum
syn keyword cConstant SteadystateMaxiterEnum
syn keyword cConstant SteadystateNumRequestedOutputsEnum
syn keyword cConstant SteadystateReltolEnum
@@ -700,8 +710,9 @@
syn keyword cConstant ThermalStabilizationEnum
syn keyword cConstant ThermalIsenthalpyEnum
syn keyword cConstant ThicknessEnum
+syn keyword cConstant TimesteppingStartTimeEnum
+syn keyword cConstant TimesteppingFinalTimeEnum
syn keyword cConstant TimesteppingCflCoefficientEnum
-syn keyword cConstant TimesteppingFinalTimeEnum
syn keyword cConstant TimesteppingTimeAdaptEnum
syn keyword cConstant TimesteppingTimeStepEnum
syn keyword cConstant TransientIsdiagnosticEnum
@@ -763,6 +774,7 @@
syn keyword cConstant ResultsEnum
syn keyword cConstant BoolInputEnum
syn keyword cConstant BoolParamEnum
+syn keyword cConstant ContourEnum
syn keyword cConstant ControlInputEnum
syn keyword cConstant DatasetInputEnum
syn keyword cConstant DofIndexingEnum
@@ -903,6 +915,7 @@
syn keyword cConstant P0Enum
syn keyword cConstant P1Enum
syn keyword cConstant P1DGEnum
+syn keyword cConstant SaveResultsEnum
syn keyword cConstant BoolElementResultEnum
syn keyword cConstant BoolExternalResultEnum
syn keyword cConstant DoubleElementResultEnum
@@ -917,6 +930,7 @@
syn keyword cConstant PentaP1ElementResultEnum
syn keyword cConstant PetscVecExternalResultEnum
syn keyword cConstant StringExternalResultEnum
+syn keyword cConstant StepEnum
syn keyword cConstant TimeEnum
syn keyword cConstant TriaP1ElementResultEnum
syn keyword cConstant WaterColumnOldEnum
Modified: issm/trunk/externalpackages/vim/install.sh
===================================================================
--- issm/trunk/externalpackages/vim/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/vim/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,6 +5,9 @@
rm -rf vim72
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/vim-7.2.tar.bz2' 'vim-7.2.tar.bz2'
+
#Untar
bzip2 -d -k vim-7.2.tar.bz2
tar -xvf vim-7.2.tar
@@ -18,7 +21,7 @@
export CC=gcc
cd src/src
./configure \
- --prefix "$ISSM_TIER/externalpackages/vim/install" \
+ --prefix "$ISSM_DIR/externalpackages/vim/install" \
--with-gcc "/usr/bin/gcc"
#Compile vim
Modified: issm/trunk/externalpackages/windows/InstallInstructions.txt
===================================================================
--- issm/trunk/externalpackages/windows/InstallInstructions.txt 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/windows/InstallInstructions.txt 2012-06-02 00:27:43 UTC (rev 12332)
@@ -41,6 +41,7 @@
autoconf
python: Python language interpreter
unzip
+cygrunsrv
@@ -143,10 +144,16 @@
How to setup a Cron job?
-Download exim and cron from cygwin setup. Run exim-config (don't forget to launch your cygwin terminal as
-Administrator). If asked for a daemon name, type ntsec. Also, if cron complains about sendmail,
-symlink /usr/lib/sendmail to /usr/sbin/sendmail. Then link /usr/sbin/sendmail
-to /usr/bin/exim. Alternatively, if you have an smtp server, you can download and configure
-ssmtp. Run ssmtp-config
-as Administrator and link /usr/sbin/sendmail to /usr/bin/ssmtp. After the email has been configured,
-run cron-config as Administrator.
+First, make sure you downloaded cygrunsrv, otherwise the cron setup will only work on a per-session
+basis! Also, make sure that you have an email correctly setup. In particular, cron relies on the
+/usr/sbin/sendmail script. If it does not exist, cron will not send emails. Most email management
+systems will create this script, but you need to check on it.
+Run cron-config and fill up the questions. For daemon name, type ntsec.
+Be careful, make sure that you are running your terminal as Administrator,
+otherwise your settings will be only user-based.
+How to setup email?
+
+Preferred way is through ssmtp. Download it on cygwin, and type ssmtp-config. If the ssmtp
+daemon does not create /usr/sbin/sendmail, be sure to create a symlink from the email client
+to the latter file. Be careful, make sure that you are running your terminal as Administrator,
+otherwise your settings will be only user-based.
Modified: issm/trunk/externalpackages/windows/configs/sdk7.1.win7-32.sh
===================================================================
--- issm/trunk/externalpackages/windows/configs/sdk7.1.win7-32.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/windows/configs/sdk7.1.win7-32.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,38 +1,38 @@
declare -x ALLUSERSPROFILE="C:\\ProgramData"
-declare -x CL="/AI C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319"
-declare -x COMMONPROGRAMFILES="C:\\Program Files (x86)\\Common Files"
+declare -x CL="/AI C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319"
+declare -x COMMONPROGRAMFILES="C:\\Program Files\\Common Files"
declare -x COMSPEC="C:\\Windows\\system32\\cmd.exe"
-declare -x CommandPromptType="Cross"
-declare -x CommonProgramW6432="C:\\Program Files\\Common Files"
+declare -x CommandPromptType="Native"
declare -x Configuration="Debug"
declare -x FP_NO_HOST_CHECK="NO"
declare -x FrameworkVersion="v4.0.30319"
declare -x HOMEDRIVE="C:"
-declare -x INCLUDE="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\INCLUDE;C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\INCLUDE;C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\INCLUDE\\gl;C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\ATLMFC\\INCLUDE;"
+declare -x INCLUDE="C:\\Program Files\\Microsoft Visual Studio 10.0\\VC\\INCLUDE;C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\INCLUDE;C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\INCLUDE\\gl;"
declare -x INFOPATH="/usr/local/info:/usr/share/info:/usr/info:"
declare -x LANG="en_US.UTF-8"
-declare -x LIB="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\Lib;C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib;C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319;C:\\Windows\\Microsoft.NET\\Framework\\v3.5;;C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\ATLMFC\\LIB;"
-declare -x LIBPATH="C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319;C:\\Windows\\Microsoft.NET\\Framework\\v3.5;;C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\Lib;"
+declare -x LIB="C:\\Program Files\\Microsoft Visual Studio 10.0\\VC\\Lib;C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib;C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319;C:\\Windows\\Microsoft.NET\\Framework\\v3.5;;"
+declare -x LIBPATH="C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319;C:\\Windows\\Microsoft.NET\\Framework\\v3.5;;C:\\Program Files\\Microsoft Visual Studio 10.0\\VC\\Lib;"
declare -x MANPATH="/usr/local/man:/usr/share/man:/usr/man:"
-declare -x PATH="/usr/local/bin:/usr/bin:/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319:/cygdrive/c/Windows/Microsoft.NET/Framework/v3.5:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/Common7/IDE:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/Common7/Tools:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/VC/Bin:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/VC/Bin/VCPackages:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin/NETFX 4.0 Tools:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0:/cygdrive/c/Program Files/Microsoft Windows Performance Toolkit:/cygdrive/c/MATLAB/R2011b32/runtime/win32:/cygdrive/c/MATLAB/R2011b32/bin:/cygdrive/c/MATLAB/R2011b/runtime/win64:/cygdrive/c/MATLAB/R2011b/bin:/cygdrive/c/Program Files (x86)/Microsoft SQL Server/100/Tools/Binn:/cygdrive/c/Program Files/Microsoft SQL Server/100/Tools/Binn:/cygdrive/c/Program Files/Microsoft SQL Server/100/DTS/Binn:/cygdrive/c/Program Files/Microsoft Network Monitor 3"
+declare -x PATH="/usr/local/bin:/usr/bin:/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319:/cygdrive/c/Windows/Microsoft.NET/Framework/v3.5:/cygdrive/c/Program Files/Microsoft Visual Studio 10.0/Common7/IDE:/cygdrive/c/Program Files/Microsoft Visual Studio 10.0/Common7/Tools:/cygdrive/c/Program Files/Microsoft Visual Studio 10.0/VC/Bin:/cygdrive/c/Program Files/Microsoft Visual Studio 10.0/VC/Bin/VCPackages:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin/NETFX 4.0 Tools:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0:/cygdrive/c/MATLAB/R2012a/runtime/win32:/cygdrive/c/MATLAB/R2012a/bin:/cygdrive/c/Program Files/Microsoft Windows Performance Toolkit"
declare -x PATHEXT=".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC"
+declare -x PRINTER="137.78.140.129#:1"
declare -x PROCESSOR_ARCHITECTURE="x86"
-declare -x PROCESSOR_ARCHITEW6432="AMD64"
-declare -x PROCESSOR_IDENTIFIER="Intel64 Family 6 Model 42 Stepping 7, GenuineIntel"
+declare -x PROCESSOR_IDENTIFIER="x86 Family 6 Model 42 Stepping 7, GenuineIntel"
declare -x PROCESSOR_LEVEL="6"
declare -x PROCESSOR_REVISION="2a07"
-declare -x PROGRAMFILES="C:\\Program Files (x86)"
+declare -x PROGRAMFILES="C:\\Program Files"
declare -x PSModulePath="C:\\Windows\\system32\\WindowsPowerShell\\v1.0\\Modules\\"
declare -x PUBLIC="C:\\Users\\Public"
declare -x PlatformToolset="Windows7.1SDK"
declare -x ProgramData="C:\\ProgramData"
-declare -x ProgramW6432="C:\\Program Files"
declare -x SHELL="/bin/bash"
declare -x SYSTEMDRIVE="C:"
declare -x SYSTEMROOT="C:\\Windows"
+declare -x TARGET_CPU="x86"
declare -x TARGET_PLATFORM="WIN7"
declare -x TERM="cygwin"
-declare -x VS100COMNTOOLS="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\Common7\\Tools\\"
+declare -x ToolsVersion="4.0"
+declare -x VS100COMNTOOLS="C:\\Program Files\\Microsoft Visual Studio 10.0\\Common7\\Tools\\"
declare -x WINDIR="C:\\Windows"
declare -x WindowsSDKDir="C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\"
declare -x WindowsSDKVersionOverride="v7.1"
Modified: issm/trunk/externalpackages/windows/configs/sdk7.1.win7-64.sh
===================================================================
--- issm/trunk/externalpackages/windows/configs/sdk7.1.win7-64.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/windows/configs/sdk7.1.win7-64.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -12,9 +12,8 @@
declare -x LANG="C.UTF-8"
declare -x LIB="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\Lib\\amd64;C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib\\X64;"
declare -x LIBPATH="C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319;C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319;C:\\Windows\\Microsoft.NET\\Framework64\\v3.5;C:\\Windows\\Microsoft.NET\\Framework\\v3.5;;C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\Lib\\amd64;"
-declare -x LOCALAPPDATA="C:\\Users\\schlegel\\AppData\\Local"
declare -x MANPATH="/usr/local/man:/usr/share/man:/usr/man:"
-declare -x PATH="/usr/local/bin:/usr/bin:/usr/include:/cygdrive/c/cygwin/usr/bin:/cygdrive/c/cygwin/usr/include:/cygdrive/c/Windows/Microsoft.NET/Framework64/v4.0.30319:/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319:/cygdrive/c/Windows/Microsoft.NET/Framework64/v3.5:/cygdrive/c/Windows/Microsoft.NET/Framework/v3.5:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/Common7/IDE:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/Common7/Tools:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/VC/Bin/amd64:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/VC/Bin/VCPackages:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin/NETFX 4.0 Tools/x64:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin/x64:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0:/cygdrive/c/Program Files/Microsoft Windows Performance Toolkit:/cygdrive/c/MATLAB/R2011b/runtime/win64:/cygdrive/b/MATLAB/R2011b/bin:/cygdrive/c/MATLAB/R2011b/extern/include:/cygdrive/c/MATLAB/R2011a/runtime/win64:/cygdrive/c/MATLAB/R2011a/bin:/cygdrive/c/MATLAB/R2011a/extern/include"
+declare -x PATH="/usr/local/bin:/usr/bin:/usr/include:/cygdrive/c/cygwin/usr/bin:/cygdrive/c/cygwin/usr/include:/cygdrive/c/Windows/Microsoft.NET/Framework64/v4.0.30319:/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319:/cygdrive/c/Windows/Microsoft.NET/Framework64/v3.5:/cygdrive/c/Windows/Microsoft.NET/Framework/v3.5:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/Common7/IDE:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/Common7/Tools:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/VC/Bin/amd64:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/VC/Bin/VCPackages:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin/NETFX 4.0 Tools/x64:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin/x64:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0:/cygdrive/c/Program Files/Microsoft Windows Performance Toolkit:/cygdrive/c/MATLAB/R2012a/runtime/win64:/cygdrive/c/MATLAB/R2012a/bin:/cygdrive/c/MATLAB/R2012a/extern/include:/cygdrive/c/MATLAB/R2011a/runtime/win64:/cygdrive/c/MATLAB/R2011a/bin:/cygdrive/c/MATLAB/R2011a/extern/include"
declare -x PATHEXT=".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC"
declare -x PROCESSOR_ARCHITECTURE="x86"
declare -x PROCESSOR_ARCHITEW6432="AMD64"
@@ -40,8 +39,6 @@
declare -x TERM="cygwin"
declare -x TMP="/tmp"
declare -x ToolsVersion="4.0"
-declare -x USER="schlegel"
-declare -x USERNAME="schlegel"
declare -x VS100COMNTOOLS="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\Common7\\Tools\\"
declare -x WINDIR="C:\\Windows"
declare -x WindowsSDKDir="C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\"
Modified: issm/trunk/externalpackages/windows/windows_environment.sh
===================================================================
--- issm/trunk/externalpackages/windows/windows_environment.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/windows/windows_environment.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,7 +1,7 @@
#This file sources all relevant scripts to setup the paths to windows compilers.
#Where are the configuration files for each compiler:
-config_dir="$ISSM_TIER/externalpackages/windows/configs"
+config_dir="$ISSM_DIR/externalpackages/windows/configs"
#your choise of compiler:
# 1: sdk 7.1 32 bits on Win7
@@ -9,8 +9,18 @@
# 3: intel compiler on Win7
# 4: intel compiler on WinXP
-compiler=2;
+#Determine OS version using uname:
+version=`uname -s | grep 64`
+if [[ $version == "" ]];then
+ compiler=1
+else
+ compiler=2
+fi
+#If you want to override and use intel compilers:
+#compiler=3;
+
+
#source corresponding environment variables:
if [[ "$compiler" == "1" ]]; then
@@ -23,6 +33,6 @@
source $config_dir/intel-winXP.sh
fi
-#finally, out of ISSM_TIER, we need to create an ISSM_TIER_WIN variable for Matlab to pick up on.
-ISSM_TIER_WIN=`cygpath -m $ISSM_TIER`
-export ISSM_TIER_WIN
+#finally, out of ISSM_DIR, we need to create an ISSM_DIR_WIN variable for Matlab to pick up on.
+ISSM_DIR_WIN=`cygpath -m $ISSM_DIR`
+export ISSM_DIR_WIN
Modified: issm/trunk/externalpackages/xerces/install.sh
===================================================================
--- issm/trunk/externalpackages/xerces/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/xerces/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,9 @@
rm -rf install xerces-c-src_2_8_0 src
mkdir install src
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/xerces-c-src_2_8_0.tar.gz' 'xerces-c-src_2_8_0.tar.gz'
+
#Untar
tar -zxvf xerces-c-src_2_8_0.tar.gz
Modified: issm/trunk/externalpackages/yams/install.sh
===================================================================
--- issm/trunk/externalpackages/yams/install.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/externalpackages/yams/install.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,6 +4,11 @@
rm -rf install
mkdir install
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/yams2-linux.gz' 'yams2-linux.gz'
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/yams2-osx.gz' 'yams2-osx.gz'
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/yams2-win.exe' 'yams2-win.exe'
+
#loop over the binaries
for i in yams*
do
Modified: issm/trunk/m4/issm_options.m4
===================================================================
--- issm/trunk/m4/issm_options.m4 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/m4/issm_options.m4 2012-06-02 00:27:43 UTC (rev 12332)
@@ -12,34 +12,18 @@
AC_DEFINE([_ISSM_DEBUG_],[1],[Macro to enable debugging in ISSM])
fi
dnl }}}
- dnl Serial build {{{
- AC_ARG_WITH([serial],
- AS_HELP_STRING([--with-serial = value],[serial compilation. ]),
- [SERIAL_VALUE=$withval],[SERIAL_VALUE="yes"])
- AC_MSG_CHECKING(for serial compilation)
- AM_CONDITIONAL([NOSERIAL], [test $SERIAL_VALUE = no])
- AM_CONDITIONAL([SERIAL], [test $SERIAL_VALUE = yes])
- AC_MSG_RESULT($SERIAL_VALUE)
+ dnl Modules build {{{
+ AC_ARG_WITH([modules],
+ AS_HELP_STRING([--with-modules = value],[modules compilation. ]),
+ [MODULES_VALUE=$withval],[MODULES_VALUE="yes"])
+ AC_MSG_CHECKING(for modules compilation)
+ AM_CONDITIONAL([MODULES], [test $MODULES_VALUE = yes])
+ AC_MSG_RESULT($MODULES_VALUE)
dnl }}}
- dnl Parallel build {{{
- AC_ARG_WITH([parallel],
- AS_HELP_STRING([--with-parallel = value], [parallel compilation. ]),
- [PARALLEL_VALUE=$withval],[PARALLEL_VALUE="yes"])
- AC_MSG_CHECKING(for parallel compilation)
- AM_CONDITIONAL([NOPARALLEL], [test $PARALLEL_VALUE = no])
- AM_CONDITIONAL([PARALLEL], [test $PARALLEL_VALUE = yes])
- AC_MSG_RESULT($PARALLEL_VALUE)
+ dnl Extensions{{{
ISSMEXT=".exe"
AC_SUBST([ISSMEXT])
dnl }}}
- dnl Serial or Parallel check {{{
- dnl Check that at least serial or parallel builds have been requested!
- if test "$SERIAL_VALUE" != "yes" ; then
- if test "$PARALLEL_VALUE" != "yes"; then
- AC_MSG_ERROR([cannot request --with-serial=no and --with-parallel=no at the same time!])
- fi
- fi
- dnl }}}
dnl ISSM's externalpackages
dnl vendor{{{
@@ -80,7 +64,13 @@
export CXX=icpc
export CXXFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
export CFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
- else
+ elif test $VENDOR = arm-linux; then
+ export CC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc
+ export GCC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc
+ export CXX=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-g++
+ export AR=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-ar
+ export RANLIB=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-ranlib
+ else
AC_MSG_ERROR([unknow compiler vendor!])
fi
fi
@@ -91,10 +81,10 @@
dnl 1. See if matlab has been provided
AC_ARG_WITH([matlab-dir],
- AS_HELP_STRING([--with-matlab-dir = DIR], [matlab root directory. necessary for serial build.]),
+ AS_HELP_STRING([--with-matlab-dir=DIR], [matlab root directory. necessary for serial build.]),
[MATLAB_ROOT=$withval],[MATLAB_ROOT=""])
- AC_MSG_CHECKING([wether Matlab is enabled])
+ AC_MSG_CHECKING([whether matlab is enabled])
if test -d "$MATLAB_ROOT"; then
HAVE_MATLAB=yes
else
@@ -108,7 +98,7 @@
dnl 2. if matlab is provided, get version number
if test x$HAVE_MATLAB = xyes; then
- AC_MSG_CHECKING([for Matlab version])
+ AC_MSG_CHECKING([for matlab version])
MATLAB_VERSION=""
dnl For Matlab R2008a and more, the version number is stored in .VERSION
@@ -171,7 +161,7 @@
AC_MSG_RESULT($MATLAB_VERSION ($MATLAB_MAJOR.$MATLAB_MINOR))
dnl 3. Get Matlab libraries
- AC_MSG_CHECKING(for Matlab headers and libraries in $MATLAB_ROOT)
+ AC_MSG_CHECKING(for matlab headers and libraries in $MATLAB_ROOT)
MATLABINCL=-I"$MATLAB_ROOT/extern/include";
dnl OS-dependent variables and checks
@@ -216,17 +206,17 @@
AC_SUBST([MATLABINCL])
AC_SUBST([MEX])
- WRAPPEREXT=$MEXEXT
- AC_SUBST([WRAPPEREXT])
+ MATLABWRAPPEREXT=$MEXEXT
+ AC_SUBST([MATLABWRAPPEREXT])
AC_SUBST([MEXLIB])
AC_SUBST([MEXLINK])
fi
dnl }}}
dnl triangle {{{
AC_ARG_WITH([triangle-dir],
- AS_HELP_STRING([--with-triangle-dir = DIR], [triangle root directory. necessary for serial build]),
+ AS_HELP_STRING([--with-triangle-dir=DIR], [triangle root directory. necessary for serial build]),
[TRIANGLE_ROOT=$withval],[TRIANGLE_ROOT=""])
- AC_MSG_CHECKING(for Triangle headers and libraries)
+ AC_MSG_CHECKING(for triangle headers and libraries)
if test -d "$TRIANGLE_ROOT"; then
@@ -265,9 +255,9 @@
dnl }}}
dnl dakota{{{
AC_ARG_WITH([dakota-dir],
- AS_HELP_STRING([--with-dakota-dir = DIR], [dakota root directory. necessary for serial build]),
+ AS_HELP_STRING([--with-dakota-dir=DIR], [dakota root directory. necessary for serial build]),
[DAKOTA_ROOT=$withval],[DAKOTA_ROOT=""])
- AC_MSG_CHECKING(for Dakota)
+ AC_MSG_CHECKING(for dakota)
if test -d "$DAKOTA_ROOT"; then
@@ -298,9 +288,9 @@
dnl }}}
dnl boost{{{
AC_ARG_WITH([boost-dir],
- AS_HELP_STRING([--with-boost-dir = DIR], [boost root directory.]),
+ AS_HELP_STRING([--with-boost-dir=DIR], [boost root directory.]),
[BOOST_ROOT=$withval],[BOOST_ROOT=""])
- AC_MSG_CHECKING(for Boost)
+ AC_MSG_CHECKING(for boost)
if test -d "$BOOST_ROOT"; then
dnl defaults
@@ -319,35 +309,55 @@
dnl }}}
dnl python{{{
AC_ARG_WITH([python-dir],
- AS_HELP_STRING([--with-python-dir = DIR], [python root directory.]),
+ AS_HELP_STRING([--with-python-dir=DIR], [python root directory.]),
[PYTHON_ROOT=$withval],[PYTHON_ROOT=""])
- AC_MSG_CHECKING(for Python)
+ AC_MSG_CHECKING(for python)
if test -d "$PYTHON_ROOT"; then
dnl defaults
HAVE_PYTHON=yes
PYTHONINCL=-I$PYTHON_ROOT/include
- PYTHONLIB="-L$PYTHON_ROOT/lib -lpython3.2"
+ PYTHONLIB="-L$PYTHON_ROOT/lib -lpython$PYTHONVERSION"
PYTHONEXT=.so
PYTHONLINK="-dynamiclib"
AC_DEFINE([_HAVE_PYTHON_],[1],[with Python in ISSM src])
AC_SUBST([PYTHONINCL])
AC_SUBST([PYTHONLIB])
- WRAPPEREXT=$PYTHONEXT
- AC_SUBST([WRAPPEREXT])
+ PYTHONWRAPPEREXT=$PYTHONEXT
+ AC_SUBST([PYTHONWRAPPEREXT])
AC_SUBST([PYTHONLINK])
else
HAVE_PYTHON=no
fi
AM_CONDITIONAL([PYTHON], [test x$HAVE_PYTHON = xyes])
AC_MSG_RESULT($HAVE_PYTHON)
+
+ dnl python-version
+ HAVE_PYTHON3="no"
+ if test x$HAVE_PYTHON = xyes; then
+ AC_ARG_WITH([python-version],
+ AS_HELP_STRING([--with-python-version = PYTHONVERSION],[python version.]),
+ [PYTHONVERSION=$withval],[PYTHONVERSION=""])
+ AC_MSG_CHECKING(for python version)
+
+ dnl recover major:
+ PYTHON_MAJOR=${PYTHONVERSION%.*}
+
+ if test x$PYTHON_MAJOR = x3; then
+ dnl are we running python 3?
+ HAVE_PYTHON3="yes"
+ fi
+ AC_DEFINE_UNQUOTED([_PYTHON_MAJOR_],$PYTHON_MAJOR,[python version major])
+ AC_MSG_RESULT($PYTHON_MAJOR)
+ fi
+ AM_CONDITIONAL([PYTHON3], [test x$HAVE_PYTHON3 = xyes])
dnl }}}
dnl python-numpy{{{
AC_ARG_WITH([python-numpy-dir],
- AS_HELP_STRING([--with-python-numpy-dir = DIR], [python-numpy root directory.]),
+ AS_HELP_STRING([--with-python-numpy-dir=DIR], [python-numpy root directory.]),
[PYTHON_NUMPY_ROOT=$withval],[PYTHON_NUMPY_ROOT=""])
- AC_MSG_CHECKING(for Python-Numpy)
+ AC_MSG_CHECKING(for python-numpy)
if test -d "$PYTHON_NUMPY_ROOT"; then
dnl defaults
@@ -363,9 +373,9 @@
dnl }}}
dnl chaco{{{
AC_ARG_WITH([chaco-dir],
- AS_HELP_STRING([--with-chaco-dir = DIR], [chaco root directory.]),
+ AS_HELP_STRING([--with-chaco-dir=DIR], [chaco root directory.]),
[CHACO_ROOT=$withval],[CHACO_ROOT=""])
- AC_MSG_CHECKING(for Chaco)
+ AC_MSG_CHECKING(for chaco)
if test -d "$CHACO_ROOT"; then
@@ -385,9 +395,9 @@
dnl }}}
dnl scotch{{{
AC_ARG_WITH([scotch-dir],
- AS_HELP_STRING([--with-scotch-dir = DIR], [scotch root directory.]),
+ AS_HELP_STRING([--with-scotch-dir=DIR], [scotch root directory.]),
[SCOTCH_ROOT=$withval],[SCOTCH_ROOT=""])
- AC_MSG_CHECKING(for Scotch)
+ AC_MSG_CHECKING(for scotch)
if test -d "$SCOTCH_ROOT"; then
@@ -407,9 +417,9 @@
dnl }}}
dnl adolc{{{
AC_ARG_WITH([adolc-dir],
- AS_HELP_STRING([--with-adolc-dir = DIR], [adolc root directory.]),
+ AS_HELP_STRING([--with-adolc-dir=DIR], [adolc root directory.]),
[ADOLC_ROOT=$withval],[ADOLC_ROOT="no"])
- AC_MSG_CHECKING(for ADOLC)
+ AC_MSG_CHECKING(for adolc)
if test "x$ADOLC_ROOT" = "xno"; then
HAVE_ADOLC=no
@@ -435,9 +445,9 @@
dnl }}}
dnl adic2{{{
AC_ARG_WITH([adic2-dir],
- AS_HELP_STRING([--with-adic2-dir = DIR], [adic2 root directory.]),
+ AS_HELP_STRING([--with-adic2-dir=DIR], [adic2 root directory.]),
[ADIC2_ROOT=$withval],[ADIC2_ROOT="no"])
- AC_MSG_CHECKING(for ADIC2)
+ AC_MSG_CHECKING(for adic2)
if test "x$ADIC2_ROOT" = "xno"; then
HAVE_ADIC2=no
@@ -463,9 +473,9 @@
dnl }}}
dnl gsl{{{
AC_ARG_WITH([gsl-dir],
- AS_HELP_STRING([--with-gsl-dir = DIR], [gsl root directory.]),
+ AS_HELP_STRING([--with-gsl-dir=DIR], [gsl root directory.]),
[GSL_ROOT=$withval],[GSL_ROOT=""])
- AC_MSG_CHECKING(for Gsl)
+ AC_MSG_CHECKING(for gsl)
if test -d "$GSL_ROOT"; then
@@ -486,9 +496,9 @@
dnl }}}
dnl rose{{{
AC_ARG_WITH([rose-dir],
- AS_HELP_STRING([--with-rose-dir = DIR], [rose root directory.]),
+ AS_HELP_STRING([--with-rose-dir=DIR], [rose root directory.]),
[ROSE_ROOT=$withval],[ROSE_ROOT=""])
- AC_MSG_CHECKING(for Rose)
+ AC_MSG_CHECKING(for rose)
if test -d "$ROSE_ROOT"; then
@@ -509,12 +519,12 @@
dnl }}}
dnl metis{{{
AC_ARG_WITH([metis-dir],
- AS_HELP_STRING([--with-metis-dir = DIR],[metis root directory. necessary for serial build]),
+ AS_HELP_STRING([--with-metis-dir=DIR],[metis root directory. necessary for serial build]),
[METIS_ROOT=$withval],[METIS_ROOT=""])
if test -d "$METIS_ROOT"; then
- AC_MSG_CHECKING(for Metis headers and libraries in $METIS_ROOT)
+ AC_MSG_CHECKING(for metis headers and libraries in $METIS_ROOT)
dnl first figure out version of metis: does the VERSION file exist?
if test -e "$METIS_ROOT/VERSION"; then
@@ -567,12 +577,7 @@
else
HAVE_METIS=no
fi
-
- if test $HAVE_METIS = no; then
- AC_MSG_ERROR([--with-metis-dir missing. Metis is needed to run ISSM]);
- else
- AC_MSG_RESULT($HAVE_METIS)
- fi
+ AM_CONDITIONAL([METIS], [test x$HAVE_METIS = xyes])
dnl }}}
dnl mpi{{{
AC_MSG_CHECKING(for mpi)
@@ -581,7 +586,7 @@
[MPILIB=$withval],[MPILIB=""])
AC_ARG_WITH([mpi-include],
- AS_HELP_STRING([--with-mpi-include = DIR],[mpi include directory, necessary for parallel build]),
+ AS_HELP_STRING([--with-mpi-include=DIR],[mpi include directory, necessary for parallel build]),
[MPI_INCLUDE=$withval],[MPI_INCLUDE=""])
if test -z "$MPILIB" ; then
@@ -590,6 +595,7 @@
if test -z "$MPI_INCLUDE" ; then
HAVE_MPI=no
else
+ HAVE_MPI=yes
MPIINCL=-I"$MPI_INCLUDE/"
AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src])
AC_DEFINE([HAVE_MPI],[1],[Mpi Flag for Dakota (DO NOT REMOVE)])
@@ -597,15 +603,16 @@
AC_SUBST([MPILIB])
fi
fi
- AC_MSG_RESULT(done)
+ AM_CONDITIONAL([MPI], [test x$HAVE_MPI = xyes])
+ AC_MSG_RESULT($HAVE_MPI)
dnl }}}
dnl petsc{{{
AC_ARG_WITH([petsc-dir],
- AS_HELP_STRING([--with-petsc-dir = DIR],[PETSc root directory, necessary for parallel build]),
+ AS_HELP_STRING([--with-petsc-dir=DIR],[PETSc root directory, necessary for parallel build]),
[PETSC_ROOT=$withval],[PETSC_ROOT=""])
if test -d "$PETSC_ROOT"; then
- AC_MSG_CHECKING(for PETSc version)
+ AC_MSG_CHECKING(for petsc version)
PETSC_MAJOR=`cat $PETSC_ROOT/include/petscversion.h | grep "#define PETSC_VERSION_MAJOR" | sed 's/#define PETSC_VERSION_MAJOR//' | sed 's/ //g'`
PETSC_MINOR=`cat $PETSC_ROOT/include/petscversion.h | grep "#define PETSC_VERSION_MINOR" | sed 's/#define PETSC_VERSION_MINOR//' | sed 's/ //g'`
AC_DEFINE_UNQUOTED([_PETSC_MAJOR_],$PETSC_MAJOR,[PETSc version major])
@@ -613,7 +620,7 @@
AC_MSG_RESULT($PETSC_MAJOR.$PETSC_MINOR)
PETSC_VERSION_DATE_HG=`cat $PETSC_ROOT/include/petscversion.h | grep "#define PETSC_VERSION_DATE_HG" | sed 's/#define PETSC_VERSION_DATE_HG//' | sed 's/ //g' | sed -e 's/\"//g' `
- AC_MSG_CHECKING(wether PETSc is the development version)
+ AC_MSG_CHECKING(whether petsc is the development version)
if test x$PETSC_VERSION_DATE_HG = xunknown; then
AC_DEFINE([_HAVE_PETSCDEV_],[1],[with PETSc-dev])
AC_MSG_RESULT(yes)
@@ -623,10 +630,10 @@
fi
AC_ARG_WITH([petsc-arch],
- AS_HELP_STRING([--with-petsc-arch = DIR],[PETSc arch , necessary for parallel build]),
+ AS_HELP_STRING([--with-petsc-arch=DIR],[PETSc arch , necessary for parallel build]),
[PETSC_ARCH=$withval],[PETSC_ARCH=""])
- AC_MSG_CHECKING(for PETSc headers and libraries in $PETSC_ROOT for architecture $PETSC_ARCH)
+ AC_MSG_CHECKING(for petsc headers and libraries in $PETSC_ROOT for architecture $PETSC_ARCH)
if test -d "$PETSC_ROOT"; then
@@ -670,9 +677,9 @@
dnl }}}
dnl tao{{{
AC_ARG_WITH([tao-dir],
- AS_HELP_STRING([--with-tao-dir = DIR], [tao root directory.]),
+ AS_HELP_STRING([--with-tao-dir=DIR], [tao root directory.]),
[TAO_ROOT=$withval],[TAO_ROOT=""])
- AC_MSG_CHECKING(for Tao)
+ AC_MSG_CHECKING(for tao)
if test -d "$TAO_ROOT"; then
@@ -688,35 +695,12 @@
fi
AC_MSG_RESULT($HAVE_TAO)
dnl }}}
- dnl mpiuni{{{
- dnl when running in serial mode, MPI must be ignored, and set to internal petsc mpiuni:
- if test "$PARALLEL_VALUE" = "no" ; then
- HAVE_MPI=yes
- MPIINCL=-I"$PETSC_ROOT/include/mpiuni"
-
- case "${host_os}" in
- *cygwin*)
- dnl MPILIB="-link -LIBPATH:\"$PETSC_ROOT/$PETSC_ARCH/lib\" -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libmpiuni.lib"
- ;;
- *linux*)
- MPILIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lmpiuni"
- ;;
- *darwin*)
- MPILIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lmpiuni"
- ;;
- esac
-
- AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src])
- AC_SUBST([MPIINCL])
- AC_SUBST([MPILIB])
- fi
- dnl }}}
dnl slepc{{{
AC_ARG_WITH([slepc-dir],
- AS_HELP_STRING([--with-slepc-dir = DIR],[slepc root directory]),
+ AS_HELP_STRING([--with-slepc-dir=DIR],[slepc root directory]),
[SLEPC_ROOT=$withval],[SLEPC_ROOT=""])
- AC_MSG_CHECKING(for Slepc headers and libraries in $SLEPC_ROOT)
+ AC_MSG_CHECKING(for slepc headers and libraries in $SLEPC_ROOT)
if test -d "$SLEPC_ROOT"; then
HAVE_SLEPC=yes
SLEPCINCL=-I"$SLEPC_ROOT/include"
@@ -732,10 +716,10 @@
dnl }}}
dnl shapelib{{{
AC_ARG_WITH([shapelib-dir],
- AS_HELP_STRING([--with-shapelib-dir = DIR], [shapelib root directory]),
+ AS_HELP_STRING([--with-shapelib-dir=DIR], [shapelib root directory]),
[SHAPELIB_ROOT=$withval],[SHAPELIB_ROOT=""])
- AC_MSG_CHECKING(for Shapelib headers and libraries in $SHAPELIB_ROOT)
+ AC_MSG_CHECKING(for shapelib headers and libraries in $SHAPELIB_ROOT)
if test -d "$SHAPELIB_ROOT"; then
dnl defaults
@@ -753,10 +737,10 @@
dnl }}}
dnl scalapack{{{
AC_ARG_WITH([scalapack-dir],
- AS_HELP_STRING([--with-scalapack-dir = DIR],[scalapack root directory]),
+ AS_HELP_STRING([--with-scalapack-dir=DIR],[scalapack root directory]),
[SCALAPACK_ROOT=$withval],[SCALAPACK_ROOT=""])
- AC_MSG_CHECKING(for Scalapack headers and libraries in $SCALAPACK_ROOT)
+ AC_MSG_CHECKING(for scalapack headers and libraries in $SCALAPACK_ROOT)
if test -d "$SCALAPACK_ROOT"; then
dnl defaults
@@ -772,10 +756,10 @@
dnl }}}
dnl blas{{{
AC_ARG_WITH([blas-lapack-dir],
- AS_HELP_STRING([--with-blas-lapack-dir = DIR],[blas-lapack root directory]),
+ AS_HELP_STRING([--with-blas-lapack-dir=DIR],[blas-lapack root directory]),
[BLASLAPACK_ROOT=$withval],[BLASLAPACK_ROOT=""])
- AC_MSG_CHECKING(for Blas and Lapack headers and libraries in $BLASLAPACK_ROOT)
+ AC_MSG_CHECKING(for blas and lapack headers and libraries in $BLASLAPACK_ROOT)
if test -d "$BLASLAPACK_ROOT"; then
dnl defaults
@@ -805,7 +789,7 @@
dnl }}}
dnl mkl{{{
AC_ARG_WITH([mkl-dir],
- AS_HELP_STRING([--with-mkl-dir = DIR],[mkl root directory]),
+ AS_HELP_STRING([--with-mkl-dir=DIR],[mkl root directory]),
[MKL_ROOT=$withval],[MKL_ROOT=""])
AC_MSG_CHECKING(for mkl headers and libraries in $MKL_ROOT)
@@ -824,16 +808,16 @@
AC_MSG_RESULT($HAVE_MKL)
dnl }}}
dnl plapack{{{
+ AC_MSG_CHECKING(for plapack)
+
AC_ARG_WITH([plapack-lib],
AS_HELP_STRING([--with-plapack-lib = lib],[plapack library]),
[PLAPACK_LIB=$withval],[PLAPACK_LIB=""])
- AC_MSG_CHECKING(for Plapack libraries)
AC_ARG_WITH([plapack-include],
AS_HELP_STRING([--with-plapack-include = include],
[plapack include ]),
[PLAPACK_INCLUDE=$withval],[PLAPACK_INCLUDE=""])
- AC_MSG_CHECKING(for Plapack headers)
if test -n "$PLAPACK_LIB"; then
if test -n "$PLAPACK_INCLUDE"; then
@@ -856,10 +840,10 @@
dnl }}}
dnl mumps{{{
AC_ARG_WITH([mumps-dir],
- AS_HELP_STRING([--with-mumps-dir = DIR],[mumps root directory]),
+ AS_HELP_STRING([--with-mumps-dir=DIR],[mumps root directory]),
[MUMPS_ROOT=$withval],[MUMPS_ROOT=""])
- AC_MSG_CHECKING(for Mumps headers and libraries in $MUMPS_ROOT)
+ AC_MSG_CHECKING(for mumps headers and libraries in $MUMPS_ROOT)
if test -d "$MUMPS_ROOT"; then
dnl defaults
@@ -881,10 +865,10 @@
dnl }}}
dnl blacs{{{
AC_ARG_WITH([blacs-dir],
- AS_HELP_STRING([--with-blacs-dir = DIR],[blacs root directory]),
+ AS_HELP_STRING([--with-blacs-dir=DIR],[blacs root directory]),
[BLACS_ROOT=$withval],[BLACS_ROOT=""])
- AC_MSG_CHECKING(for Blacs headers and libraries in $BLACS_ROOT)
+ AC_MSG_CHECKING(for blacs headers and libraries in $BLACS_ROOT)
if test -d "$BLACS_ROOT"; then
dnl defaults
@@ -902,10 +886,10 @@
dnl }}}
dnl hypre{{{
AC_ARG_WITH([hypre-dir],
- AS_HELP_STRING([--with-hypre-dir = DIR],[hypre root directory]),
+ AS_HELP_STRING([--with-hypre-dir=DIR],[hypre root directory]),
[HYPRE_ROOT=$withval],[HYPRE_ROOT=""])
- AC_MSG_CHECKING(for Hypre headers and libraries in $HYPRE_ROOT)
+ AC_MSG_CHECKING(for hypre headers and libraries in $HYPRE_ROOT)
if test -d "$HYPRE_ROOT"; then
dnl defaults
@@ -923,10 +907,10 @@
dnl }}}
dnl ml{{{
AC_ARG_WITH([ml-dir],
- AS_HELP_STRING([--with-ml-dir = DIR],[ml root directory]),
+ AS_HELP_STRING([--with-ml-dir=DIR],[ml root directory]),
[ML_ROOT=$withval],[ML_ROOT=""])
- AC_MSG_CHECKING(for Ml headers and libraries in $ML_ROOT)
+ AC_MSG_CHECKING(for ml headers and libraries in $ML_ROOT)
if test -d "$ML_ROOT"; then
dnl defaults
@@ -959,21 +943,36 @@
AC_MSG_RESULT(done)
dnl }}}
dnl fortran{{{
- dnl fortran library option
- AC_MSG_CHECKING(for fortran library)
- AC_ARG_WITH([fortran-lib],
- AS_HELP_STRING([--with-fortran-lib = options],[fortran options, for ex: "/usr/lib/gfortran.a]),
- [FORTRAN_LIB=$withval],[FORTRAN_LIB=""])
-
- dnl check that --with-fortran-lib may have been provided
- if test -n "$FORTRAN_LIB" ; then
+ AC_ARG_WITH([fortran],
+ AS_HELP_STRING([--with-fortran = YES], [do we compile fortran code (default is yes)]),
+ [FORTRAN=$withval],[FORTRAN=yes])
+ AC_MSG_CHECKING(for fortran compilation)
+ if test "x$FORTRAN" = "xyes"; then
+ dnl defaults
HAVE_FORTRAN=yes
- FORTRANLIB="$FORTRAN_LIB"
- AC_DEFINE([_HAVE_FORTRAN_],[1],[with FORTRAN in ISSM src])
- AC_SUBST([FORTRANLIB])
+ AC_DEFINE([_HAVE_FORTRAN_],[1],[with fortran capability])
+ else
+ HAVE_FORTRAN=no
fi
- AC_MSG_RESULT(done)
+ AM_CONDITIONAL([FORTRAN], [test x$FORTRAN = xyes])
+ AC_MSG_RESULT($FORTRAN)
+
+ if test "x$FORTRAN" = "xyes"; then
+ dnl fortran library option
+ AC_MSG_CHECKING(for fortran library)
+ AC_ARG_WITH([fortran-lib],
+ AS_HELP_STRING([--with-fortran-lib = options],[fortran options, for ex: "/usr/lib/gfortran.a]),
+ [FORTRAN_LIB=$withval],[FORTRAN_LIB=""])
+
+ dnl check that --with-fortran-lib may have been provided
+ if test -n "$FORTRAN_LIB" ; then
+ FORTRANLIB="$FORTRAN_LIB"
+ AC_DEFINE([_HAVE_FORTRAN_],[1],[with FORTRAN in ISSM src])
+ AC_SUBST([FORTRANLIB])
+ fi
+ AC_MSG_RESULT(done)
+ fi
dnl }}}
dnl graphics{{{
AC_MSG_CHECKING(for graphics library)
@@ -1228,25 +1227,32 @@
dnl checks{{{
AC_MSG_CHECKING(consistency between all libraries)
- dnl check that if petsc is requested in parallel, mpi should be specified
+ dnl check that if petsc is requested , mpi should be specified
if test "$HAVE_PETSC" = "yes" ; then
if test "$HAVE_MPI" = "NO"; then
AC_MSG_ERROR([petsc requires mpi!]);
fi
fi
- dnl check that we have either python or matlab support if we only compile serially
- if test "$PARALLEL_VALUE" = "no" && test "$HAVE_MATLAB" = "no" && test "$HAVE_PYTHON" = "no"; then
- AC_MSG_ERROR([need at least python or matlab support to compile only in serial mode!]);
+ dnl check that we have either python or matlab support if we compile the modules
+ if test "$MODULES_VALUE" = "yes" && test "$HAVE_MATLAB" = "no" && test "$HAVE_PYTHON" = "no"; then
+ AC_MSG_ERROR([need at least python or matlab support to compile modules (or use --with-modules=no)]);
fi
- dnl check that we don't have with-matlab and with-python at the same time
- if test "$HAVE_PYTHON" = "yes" ; then
- if test "$HAVE_MATLAB" = "yes"; then
- AC_MSG_ERROR([cannot create matlab and python wrappers simultaneously! Please choose one or the other.]);
- fi
+ dnl check that we have python version if python compile is specified
+ if test "$HAVE_PYTHON" = "yes" && test "$PYTHONVERSION" = "" ; then
+ AC_MSG_ERROR([need python-version if python compile is required!]);
fi
+ dnl check that if we have MPI, we have metis
+ if test "$HAVE_METIS" = "yes" && test "$HAVE_MPI" = "no" ; then
+ AC_MSG_ERROR([need mpi if using the metis partitioner!]);
+ fi
+
+
+
+
+
AC_MSG_RESULT(done)
dnl }}}
@@ -1256,7 +1262,7 @@
AC_ARG_WITH([cxxoptflags],
AS_HELP_STRING([--with-cxxoptflags = CXXOPTFLAGS], [optimization using CXX flags, ex: --with-cxxoptflags=-march=opteron -O3]),
[CXXOPTFLAGS=$withval],[CXXOPTFLAGS="-g -O2"])
- AC_MSG_CHECKING(for C++ optimization flags)
+ AC_MSG_CHECKING(for c++ optimization flags)
AC_SUBST([CXXOPTFLAGS])
AC_MSG_RESULT(done)
Modified: issm/trunk/scripts/GenerateReferences.sh
===================================================================
--- issm/trunk/scripts/GenerateReferences.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/scripts/GenerateReferences.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -15,7 +15,7 @@
\bibliographystyle{agu}
\begin{document}
\nocite{$CITE}
-\bibliography{$ISSM_DIR/publications/bibtex/references}
+\bibliography{$JPL_SVN/publications/bibtex/references}
\end{document}
END
#Generate pdf
@@ -28,7 +28,7 @@
cat references.bak1 | sed -e "/ibitem/,/]/d" > references.bak2 #delete labels that are on multiple lines
mv references.bak2 references.bbl
echo "Converting to rtf"
-$ISSM_TIER/externalpackages/latex2rtf/install/latex2rtf -P $ISSM_TIER/externalpackages/latex2rtf/install/cfg/ references
+$ISSM_DIR/externalpackages/latex2rtf/install/latex2rtf -P $ISSM_DIR/externalpackages/latex2rtf/install/cfg/ references
#Remove all but rtf file
rm -rf references.[!rtf]*
Modified: issm/trunk/scripts/archive.sh
===================================================================
--- issm/trunk/scripts/archive.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/scripts/archive.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -9,7 +9,7 @@
}
#Cleanup code
-cd $ISSM_TIER
+cd $ISSM_DIR
make clean
make distclean
@@ -17,6 +17,6 @@
rm -rf externalpackages
#Create tar file, with today's date in the title;
-cd $ISSM_TIER/..
+cd $ISSM_DIR/..
today=`today_date`
-tar zcvf issm-3.0-$today.tar.gz `basename $ISSM_TIER`
+tar zcvf issm-3.0-$today.tar.gz `basename $ISSM_DIR`
Modified: issm/trunk/scripts/automakererun.sh
===================================================================
--- issm/trunk/scripts/automakererun.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/scripts/automakererun.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -3,10 +3,10 @@
# archive.
- ACLOCAL="$ISSM_TIER/externalpackages/automake/install/bin/aclocal"
-AUTOCONF="$ISSM_TIER/externalpackages/autoconf/install/bin/autoconf"
-AUTOHEAD="$ISSM_TIER/externalpackages/autoconf/install/bin/autoheader"
-AUTOMAKE="$ISSM_TIER/externalpackages/automake/install/bin/automake"
+ ACLOCAL="$ISSM_DIR/externalpackages/automake/install/bin/aclocal"
+AUTOCONF="$ISSM_DIR/externalpackages/autoconf/install/bin/autoconf"
+AUTOHEAD="$ISSM_DIR/externalpackages/autoconf/install/bin/autoheader"
+AUTOMAKE="$ISSM_DIR/externalpackages/automake/install/bin/automake"
echo "removing config.cach"
rm -rf config.cach
Modified: issm/trunk/scripts/cloc2html.py
===================================================================
--- issm/trunk/scripts/cloc2html.py 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/scripts/cloc2html.py 2012-06-02 00:27:43 UTC (rev 12332)
@@ -3,8 +3,8 @@
#inspired from http://qwiki.stanford.edu/images/d/df/Latex2qwiki.txt
import sys, re, os
-ISSM_TIER=os.getenv('ISSM_TIER');
-if(not ISSM_TIER): raise NameError('ISSM_TIER undefined')
+ISSM_DIR=os.getenv('ISSM_DIR');
+if(not ISSM_DIR): raise NameError('ISSM_DIR undefined')
infile = open('temp','r')
outfile = open('temp.html','w')
Modified: issm/trunk/scripts/convertmatlabclasses.py
===================================================================
--- issm/trunk/scripts/convertmatlabclasses.py 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/scripts/convertmatlabclasses.py 2012-06-02 00:27:43 UTC (rev 12332)
@@ -3,10 +3,10 @@
import sys, re, os, shutil
#get names of all directories to process
-ISSM_TIER=os.getenv('ISSM_TIER');
-if(not ISSM_TIER): raise NameError('ISSM_TIER undefined')
-newclassesdir = ISSM_TIER + '/src/m/classes/'
-oldclassesdir = ISSM_TIER + '/src/m/oldclasses/'
+ISSM_DIR=os.getenv('ISSM_DIR');
+if(not ISSM_DIR): raise NameError('ISSM_DIR undefined')
+newclassesdir = ISSM_DIR + '/src/m/classes/'
+oldclassesdir = ISSM_DIR + '/src/m/oldclasses/'
#make new directory
if(os.path.exists(oldclassesdir)):shutil.rmtree(oldclassesdir)
Modified: issm/trunk/scripts/dailyrun.sh
===================================================================
--- issm/trunk/scripts/dailyrun.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/scripts/dailyrun.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -53,25 +53,25 @@
#Prepare run
#Windows hack for startup.m {{{1
-#windows environments: ISSM_TIER_WIN variable not correctly picked up when using
-#the cron job. just get startup to take the ISSM_TIER variable as the pwd:
+#windows environments: ISSM_DIR_WIN variable not correctly picked up when using
+#the cron job. just get startup to take the ISSM_DIR variable as the pwd:
if [ "$OS" = "winxp32" ]
then
- cat startup.m | sed 's/clear status/clear status; ISSM_TIER=pwd;/g' > startup.m.bak
+ cat startup.m | sed 's/clear status/clear status; ISSM_DIR=pwd;/g' > startup.m.bak
mv startup.m.bak startup.m
fi
#}}}
#create softlink to startup {{{1
-cd $ISSM_TIER/test/NightlyRun/
-ln -s $ISSM_TIER/startup.m .
+cd $ISSM_DIR/test/NightlyRun/
+ln -s $ISSM_DIR/startup.m .
#}}}
#Create dailylog directory and info.log {{{1
#put installation elapsed time in info.log
INSTALL_TIME=$(timer)
ELAPSED_INSTALL=$(timer $START_TIME)
-rm -rf $ISSM_TIER/dailylog
-mkdir $ISSM_TIER/dailylog
-cat << END > $ISSM_TIER/dailylog/info.log
+rm -rf $ISSM_DIR/dailylog
+mkdir $ISSM_DIR/dailylog
+cat << END > $ISSM_DIR/dailylog/info.log
today: $(echo $TODAY)
user: $(echo $USER)
host: $(echo $HOST_NAME)
@@ -94,10 +94,10 @@
for (( i=1;i<=$NUMCPUS_RUN;i++ ))
do
#Launch matlab and the daily run script
- cat > $ISSM_TIER/dailylog/matlab_run$i.m << EOF
+ cat > $ISSM_DIR/dailylog/matlab_run$i.m << EOF
warning off %necessary to avoid a info.log of several Go for parallel runs
try,
- cd $ISSM_TIER/test/NightlyRun
+ cd $ISSM_DIR/test/NightlyRun
startup;
$(if [ "$NROPTIONS" = "" ]
then
@@ -110,7 +110,7 @@
%An error occured, get report and exit
directory=strsplit(pwd,'/');
message=getReport(me)
- fid=fopen([ISSM_TIER '/dailylog/matlaberror.log'], 'at');
+ fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at');
fprintf(fid,'\nMatlab error occured in: %s\n\n',directory{end});
fprintf(fid,'%s',message);
fclose(fid);
@@ -120,7 +120,7 @@
EOF
#Start run from dailylog directory
- cd $ISSM_TIER/dailylog/
+ cd $ISSM_DIR/dailylog/
#Start test
MATLAB_VERSION="7.6" #7.2,7.4,7.6 and 7.8
@@ -131,7 +131,7 @@
wait
#}}}
#concatenate all reports {{{1
-cd $ISSM_TIER/dailylog/
+cd $ISSM_DIR/dailylog/
mv matlab_log1.log matlab_log.log
for (( i=2;i<=$NUMCPUS_RUN;i++ ))
do
@@ -148,7 +148,7 @@
fi
ELAPSED_RUN=$(timer $INSTALL_TIME)
ELAPSED_TOTAL=$(timer $START_TIME)
-cat << END >> $ISSM_TIER/dailylog/info.log
+cat << END >> $ISSM_DIR/dailylog/info.log
elapsed_run: $(echo $ELAPSED_RUN)
elapsed_total: $(echo $ELAPSED_TOTAL)
matlab_crash: $(echo $MATLABCRASH)
@@ -157,8 +157,8 @@
#Send Report
#Build html report {{{1
-cd $ISSM_TIER/dailylog/
+cd $ISSM_DIR/dailylog/
sh ../scripts/report.sh
-ln -s $ISSM_TIER/dailylog/report.html $INIT_PATH
-echo "html report located in $ISSM_TIER/dailylog/report.html and $INIT_PATH/report.html"
+ln -s $ISSM_DIR/dailylog/report.html $INIT_PATH
+echo "html report located in $ISSM_DIR/dailylog/report.html and $INIT_PATH/report.html"
#}}}
Modified: issm/trunk/scripts/getloc.sh
===================================================================
--- issm/trunk/scripts/getloc.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/scripts/getloc.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,13 +1,13 @@
#!/bin/bash
#get number of lines of code
-cloc-1.55.pl $ISSM_TIER/src $ISSM_TIER/m4 --exclude-dir=.svn --exclude-ext=exp --exclude-lang=make --out=temp
+cloc-1.55.pl $ISSM_DIR/src $ISSM_DIR/m4 --exclude-dir=.svn --exclude-ext=exp --exclude-lang=make --out=temp
cat temp
./cloc2html.py
rm temp
-cat $ISSM_TIER/src/dox/issm.dox | sed '/<table/,//d' > input1
-cat $ISSM_TIER/src/dox/issm.dox | sed '1,/<\/table>/d' > input2
-cat input1 temp.html input2 > $ISSM_TIER/src/dox/issm.dox
+cat $ISSM_DIR/src/dox/issm.dox | sed '/<table/,//d' > input1
+cat $ISSM_DIR/src/dox/issm.dox | sed '1,/<\/table>/d' > input2
+cat input1 temp.html input2 > $ISSM_DIR/src/dox/issm.dox
rm input1 input2 temp.html
exit 1
@@ -18,12 +18,12 @@
#OLDER MANUAL VESION
#get Matlab number of lines
-cd $ISSM_TIER/src/m
+cd $ISSM_DIR/src/m
M_LOC=$(find . -name "*.m" -exec wc -l '{}' \; | awk '{ sum += $1 } END { print sum}');
echo "Matlab code: $M_LOC"
#get C/CPP number of lines
-cd $ISSM_TIER/src
+cd $ISSM_DIR/src
CPP_LOC=$(find . -name "*.cpp" -exec wc -l '{}' \; | awk '{ sum += $1 } END { print sum}');
echo "C++ code: $CPP_LOC"
C_LOC=$(find . -name "*.c" -exec wc -l '{}' \; | awk '{ sum += $1 } END { print sum}');
Modified: issm/trunk/scripts/issmconfiguration.sh
===================================================================
--- issm/trunk/scripts/issmconfiguration.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/scripts/issmconfiguration.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -6,8 +6,8 @@
#keep track of present directory:
presendir=`pwd`
-if test -d "$ISSM_TIER/configs" ; then
- cd $ISSM_TIER/configs
+if test -d "$ISSM_DIR/configs" ; then
+ cd $ISSM_DIR/configs
LIST=`ls`
if [[ $# == "0" ]]; then
@@ -39,7 +39,7 @@
echo "Configuring ISSM with following configs: $configurename"
echo ""
- cd $ISSM_TIER
+ cd $ISSM_DIR
source ./scripts/automakererun.sh
source configs/$configurename
@@ -55,4 +55,4 @@
-#alias aut='a=`pwd` && cd $ISSM_TIER && ./scripts/automakererun.sh && ./configs/config-macosx64-larour-nopetsc.sh'
+#alias aut='a=`pwd` && cd $ISSM_DIR && ./scripts/automakererun.sh && ./configs/config-macosx64-larour-nopetsc.sh'
Modified: issm/trunk/scripts/report.sh
===================================================================
--- issm/trunk/scripts/report.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/scripts/report.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -48,7 +48,7 @@
BODY_FONTL=`echo $BODY_FONT | sed -e "s/style=\"/style=\"text-align:left; /g"`
#create some variables
-if [ $(ls -1 $ISSM_TIER/bin | wc -l) -le 20 ];
+if [ $(ls -1 $ISSM_DIR/bin | wc -l) -le 20 ];
then
IS_INSTALL=0
else
Modified: issm/trunk/scripts/run.sh
===================================================================
--- issm/trunk/scripts/run.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/scripts/run.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -5,18 +5,18 @@
NROPTIONS="";
MATLAB_VERSION="7.6" #7.2,7.4,7.6 and 7.8
#create softlink to startup {{{1
-cd $ISSM_TIER/test/NightlyRun/
-ln -s $ISSM_TIER/startup.m .
+cd $ISSM_DIR/test/NightlyRun/
+ln -s $ISSM_DIR/startup.m .
#}}}
#Launch all tests on different cpus
for (( i=1;i<=$NUMCPUS_RUN;i++ ))
do
#Launch matlab and the daily run script
- cat > $ISSM_TIER/dailylog/matlab_run$i.m << EOF
+ cat > $ISSM_DIR/dailylog/matlab_run$i.m << EOF
warning off %necessary to avoid a daily.log of several Go for parallel runs
try,
- cd $ISSM_TIER/test/NightlyRun
+ cd $ISSM_DIR/test/NightlyRun
startup;
$(if [ "$NROPTIONS" = "" ]
then
@@ -29,7 +29,7 @@
%An error occured, get report and exit
directory=strsplit(pwd,'/');
message=getReport(me)
- fid=fopen([ISSM_TIER '/dailylog/matlaberror.log'], 'at');
+ fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at');
fprintf(fid,'\nMatlab error occured in: %s\n\n',directory{end});
fprintf(fid,'%s',message);
fclose(fid);
@@ -38,7 +38,7 @@
EOF
#Start run from dailylog directory
- cd $ISSM_TIER/dailylog/
+ cd $ISSM_DIR/dailylog/
#Start test
/usr/local/pkgs/matlab-$MATLAB_VERSION/bin/matlab -nojvm -nosplash -r matlab_run$i -logfile matlab_log$i.log &
Modified: issm/trunk/scripts/windowsbuild.sh
===================================================================
--- issm/trunk/scripts/windowsbuild.sh 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/scripts/windowsbuild.sh 2012-06-02 00:27:43 UTC (rev 12332)
@@ -10,7 +10,7 @@
#Create tar file, with today's date in the title;
today=`today_date`
-cd $ISSM_TIER/bin
+cd $ISSM_DIR/bin
#Filter out .svn files
rm -rf list
Modified: issm/trunk/startup.m
===================================================================
--- issm/trunk/startup.m 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/startup.m 2012-06-02 00:27:43 UTC (rev 12332)
@@ -10,37 +10,37 @@
% clear the last warning to focus on the warnings of the ISSM path
lastwarn('');
-%Recover ISSM_TIER , or if on a Windows machine, ISSM_TIER_WIN
+%Recover ISSM_DIR , or if on a Windows machine, ISSM_DIR_WIN
if ~ispc,
- ISSM_TIER=getenv('ISSM_TIER');
+ ISSM_DIR=getenv('ISSM_DIR');
else
- ISSM_TIER=getenv('ISSM_TIER_WIN');
- %ISSM_TIER='';
+ ISSM_DIR=getenv('ISSM_DIR_WIN');
+ %ISSM_DIR='';
end
-if (isempty(ISSM_TIER)),
- error('''ISSM_TIER'' environment variable is empty! You should define ISSM_TIER in your .cshrc or .bashrc!');
+if (isempty(ISSM_DIR)),
+ error('''ISSM_DIR'' environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!');
end
%Now add all issm code paths necessary to run issm smoothly.
%We capture the error output, so that we can warn the user to update
-%the variable ISSM_TIER in this file, in case it is not correctly setup.
+%the variable ISSM_DIR in this file, in case it is not correctly setup.
%ISSM path
-addpath([ISSM_TIER '/src/m/utils/']); %loads recursivepath
-addpath([ISSM_TIER '/bin']);
-addpath(recursivepath([ISSM_TIER '/src/m']));
-addpath(recursivepath([ISSM_TIER '/externalpackages/scotch']));
-addpath(recursivepath([ISSM_TIER '/externalpackages/canos']));
-addpath(recursivepath([ISSM_TIER '/externalpackages/kml']));
-addpath(recursivepath([ISSM_TIER '/externalpackages/export_fig']));
-addpath(recursivepath([ISSM_TIER '/externalpackages/googleearthtoolbox']));
-addpath(recursivepath([ISSM_TIER '/externalpackages/cm_and_cb_utilities']));
+addpath([ISSM_DIR '/src/m/utils/']); %loads recursivepath
+addpath([ISSM_DIR '/bin']);
+addpath(recursivepath([ISSM_DIR '/src/m']));
+addpath(recursivepath([ISSM_DIR '/externalpackages/scotch']));
+addpath(recursivepath([ISSM_DIR '/externalpackages/canos']));
+addpath(recursivepath([ISSM_DIR '/externalpackages/kml']));
+addpath(recursivepath([ISSM_DIR '/externalpackages/export_fig']));
+addpath(recursivepath([ISSM_DIR '/externalpackages/googleearthtoolbox']));
+addpath(recursivepath([ISSM_DIR '/externalpackages/cm_and_cb_utilities']));
-clear ISSM_TIER;
+clear ISSM_DIR;
%Check on any warning messages that might indicate that the paths were not correct.
if ~isempty(lastwarn),
- fprintf('\n Error trying to setup ''ISSM'' code paths. Try and update the ISSM_TIER variable in your .cshrc or .bashrc!\n');
+ fprintf('\n Error trying to setup ''ISSM'' code paths. Try and update the ISSM_DIR variable in your .cshrc or .bashrc!\n');
fprintf(' ''ISSM'' will not work at all until this is resolved\n\n');
else
fprintf('\n To get started with ISSM, type issmdoc at the command prompt.\n\n');
Modified: issm/trunk/startup.py
===================================================================
--- issm/trunk/startup.py 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/startup.py 2012-06-02 00:27:43 UTC (rev 12332)
@@ -4,29 +4,23 @@
# startup.py is a script run by python at the beginning of a session, just
# before handing over the prompt to the user if the environment variable
# PYTHONSTARTUP is defined:
-# export PYTHONSTARTUP=$ISSM_TIER/startup.py
+# export PYTHONSTARTUP=$ISSM_DIR/startup.py
# This startup script should be run by users before trying to use ISSM.
import os,sys
-
-#First check we are running python 3 at least
-if sys.version_info[0] < 3:
- print("ISSM can only work in Python 3. Exiting python")
- sys.exit(1)
-
-#Recover ISSM_TIER, ISSM_DIR and USERNAME
-ISSM_TIER=os.getenv('ISSM_TIER')
+#Recover ISSM_DIR and USERNAME
+ISSM_DIR=os.getenv('ISSM_DIR')
USERNAME =os.getenv('USER')
-if(ISSM_TIER==None):
- raise NameError('"ISSM_TIER" environment variable is empty! You should define ISSM_TIER in your .cshrc or .bashrc!')
+if(ISSM_DIR==None):
+ raise NameError('"ISSM_DIR" environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!')
#Now add all issm code paths necessary to run issm smoothly.
#We capture the error output, so that we can warn the user to update
-#the variable ISSM_TIER in this file, in case it is not correctly setup.
+#the variable ISSM_DIR in this file, in case it is not correctly setup.
#ISSM path. Go through src/py and load everything we find that looks like a python file
-for root,dirs,files in os.walk(ISSM_TIER+ '/src/py'):
+for root,dirs,files in os.walk(ISSM_DIR+ '/src/py'):
for file in files:
if file.find(".py") != -1:
if file.find(".pyc") == -1:
@@ -34,8 +28,17 @@
sys.path.append(root)
file=os.path.splitext(file)[0]
#__import__(file)
+
+for root,dirs,files in os.walk(ISSM_DIR+ '/src/m'):
+ for file in files:
+ if file.find(".py") != -1:
+ if file.find(".pyc") == -1:
+ #add to path
+ sys.path.append(root)
+ file=os.path.splitext(file)[0]
+ #__import__(file)
-sys.path.append(ISSM_TIER + '/src/mex')
+sys.path.append(ISSM_DIR + '/src/modules/python')
#Deal with scipy import:
import scipy
@@ -78,7 +81,8 @@
from hydrology import *
from miscellaneous import *
from private import *
-from TriMesh import *
+from triangle import *
+from setmask import *
#}}}
Modified: issm/trunk/test/NightlyRun/runme.m
===================================================================
--- issm/trunk/test/NightlyRun/runme.m 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/test/NightlyRun/runme.m 2012-06-02 00:27:43 UTC (rev 12332)
@@ -29,8 +29,8 @@
% runme('exclude',101);
% md=runme('id',102,'procedure','model');
-%Get ISSM_TIER variable
-ISSM_TIER=issmtier();
+%Get ISSM_DIR variable
+ISSM_DIR=issmdir();
%Check inputs
% {{{1
@@ -167,13 +167,13 @@
directory=strsplit(pwd,'/');
message=getReport(me2);
if strcmpi(output,'nightly')
- fid=fopen([ISSM_TIER '/nightlylog/matlaberror.log'], 'at');
+ fid=fopen([ISSM_DIR '/nightlylog/matlaberror.log'], 'at');
fprintf(fid,'%s',message);
fprintf(fid,'\n------------------------------------------------------------------\n');
fclose(fid);
disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,id_string,fieldname));
elseif strcmpi(output,'daily');
- fid=fopen([ISSM_TIER '/dailylog/matlaberror.log'], 'at');
+ fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at');
fprintf(fid,'%s',message);
fprintf(fid,'\n------------------------------------------------------------------\n');
fclose(fid);
@@ -192,13 +192,13 @@
directory=strsplit(pwd,'/');
message=getReport(me);
if strcmpi(output,'nightly')
- fid=fopen([ISSM_TIER '/nightlylog/matlaberror.log'], 'at');
+ fid=fopen([ISSM_DIR '/nightlylog/matlaberror.log'], 'at');
fprintf(fid,'%s',message);
fprintf(fid,'\n------------------------------------------------------------------\n');
fclose(fid);
disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,id_string,'N/A'));
elseif strcmpi(output,'daily');
- fid=fopen([ISSM_TIER '/dailylog/matlaberror.log'], 'at');
+ fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at');
fprintf(fid,'%s',message);
fprintf(fid,'\n------------------------------------------------------------------\n');
fclose(fid);
Modified: issm/trunk/test/NightlyRun/test448.m
===================================================================
--- issm/trunk/test/NightlyRun/test448.m 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/test/NightlyRun/test448.m 2012-06-02 00:27:43 UTC (rev 12332)
@@ -2,7 +2,6 @@
md=setmask(md,'../Exp/SquareShelf.exp','');
md=parameterize(md,'../Par/SquareSheetShelf.par');
md=setflowequation(md,'macayeal','all');
-md.cluster=none;
md.initialization.vx(:)=0;
md.initialization.vy(:)=0;
md.initialization.vel(:)=0;
Modified: issm/trunk/test/NightlyRun/test450.m
===================================================================
--- issm/trunk/test/NightlyRun/test450.m 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/test/NightlyRun/test450.m 2012-06-02 00:27:43 UTC (rev 12332)
@@ -2,7 +2,6 @@
md=setmask(md,'../Exp/SquareShelf.exp','');
md=parameterize(md,'../Par/SquareSheetShelf.par');
md=setflowequation(md,'macayeal','all');
-md.cluster=none;
md.initialization.vx(:)=0;
md.initialization.vy(:)=0;
md.initialization.vel(:)=0;
Modified: issm/trunk/test/NightlyRun/test452.m
===================================================================
--- issm/trunk/test/NightlyRun/test452.m 2012-06-02 00:26:21 UTC (rev 12331)
+++ issm/trunk/test/NightlyRun/test452.m 2012-06-02 00:27:43 UTC (rev 12332)
@@ -1,7 +1,6 @@
md=triangle(model,'../Exp/Square.exp',350000);
md=setmask(md,'../Exp/SquareShelf.exp','');
md=parameterize(md,'../Par/SquareSheetShelf.par');
-md.cluster=none;
md.initialization.vx(:)=0;
md.initialization.vy(:)=0;
md.initialization.vel(:)=0;
More information about the issm-svn
mailing list