Changeset 6088


Ignore:
Timestamp:
09/29/10 18:27:26 (14 years ago)
Author:
Eric.Larour
Message:

Updated all routines to take into account ISSM_DIR AND ISSM_TIER environment variables

Location:
issm/trunk
Files:
81 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/configs/altix64/altix64.sh.petsc2

    r3225 r6088  
    11#!/bin/csh
    22
    3 ./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/externalpackages/PLAPACKR32-hg/$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/externalpackages/MUMPS_4.6.3/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH/ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-graphics-lib=/usr/X11R6/lib/libX11.so --with-petsc-version=2
     3./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/externalpackages/PLAPACKR32-hg/$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/externalpackages/MUMPS_4.6.3/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH/ --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-graphics-lib=/usr/X11R6/lib/libX11.so --with-petsc-version=2
  • issm/trunk/configs/altix64/altix64.sh.petsc3

    r3225 r6088  
    11#!/bin/csh
    22
    3 ./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 --with-petsc-version=3
     3./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 --with-petsc-version=3
  • issm/trunk/configs/linux32-cosmos/linux32.sh.petsc2

    r3225 r6088  
    11#!/bin/csh
    22
    3 ./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-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-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH/ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH  --with-vendor=intel-linux --with-graphics-lib=/usr/X11R6/lib/libX11.so --with-petsc-version=2
     3./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-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-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH/ --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH  --with-vendor=intel-linux --with-graphics-lib=/usr/X11R6/lib/libX11.so --with-petsc-version=2
  • issm/trunk/configs/linux32-cosmos/linux32.sh.petsc3

    r3225 r6088  
    11#!/bin/csh
    22
    3 ./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 --with-petsc-version=3
     3./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 --with-petsc-version=3
  • issm/trunk/configs/linux64/linux64.sh.petsc2

    r5883 r6088  
    11#!/bin/sh
    22
    3 ./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-petsc-version=2  --with-scotch-dir=$ISSM_DIR/externalpackages/scotch/install --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install --enable-debugging
     3./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-petsc-version=2  --with-scotch-dir=$ISSM_TIER/externalpackages/scotch/install --with-chaco-dir=$ISSM_TIER/externalpackages/chaco/install --enable-debugging
  • issm/trunk/configs/linux64/linux64.sh.petsc3

    r3223 r6088  
    11#!/bin/sh
    22
    3 ./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-petsc-version=3 --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/$ISSM_ARCH --with-plapack-lib="-L $ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I $ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/$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
     3./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-petsc-version=3 --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/$ISSM_ARCH --with-plapack-lib="-L $ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I $ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/$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
  • issm/trunk/configs/macosx32/macosx32.sh.petsc2

    r3673 r6088  
    11#!/bin/sh
    22
    3 ./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=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a" --with-petsc-arch=$ISSM_ARCH --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH  --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32/$ISSM_ARCH -lPLAPACK"  --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32/$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="/usr/local/lib/libgfortran.a" --with-math-lib="/usr/lib/libm.dylib" --with-graphics-lib="/usr/X11/lib/libX11.dylib" --with-petsc-version=2
     3./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=" $ISSM_TIER/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpich.a" --with-petsc-arch=$ISSM_ARCH --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH  --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32/$ISSM_ARCH -lPLAPACK"  --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32/$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="/usr/local/lib/libgfortran.a" --with-math-lib="/usr/lib/libm.dylib" --with-graphics-lib="/usr/X11/lib/libX11.dylib" --with-petsc-version=2
  • issm/trunk/configs/macosx32/macosx32.sh.petsc3

    r3225 r6088  
    11#!/bin/sh
    22
    3 ./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=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a" --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/$ISSM_ARCH -lPLAPACK" --with-plapack-include=$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32/$ISSM_ARCH" --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH/ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH --with-fortran-lib="/usr/local/lib/libgfortran.a" --with-math-lib="/usr/lib/libm.dylib" --with-graphics-lib="/usr/X11/lib/libX11.dylib" --with-petsc-version=3
     3./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=" $ISSM_TIER/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_TIER/externalpackages/mpich2/install/lib/libmpich.a" --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/$ISSM_ARCH -lPLAPACK" --with-plapack-include=$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32/$ISSM_ARCH" --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH/ --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH --with-fortran-lib="/usr/local/lib/libgfortran.a" --with-math-lib="/usr/lib/libm.dylib" --with-graphics-lib="/usr/X11/lib/libX11.dylib" --with-petsc-version=3
  • issm/trunk/configs/macosx64/macosx64.sh.petsc2

    r5680 r6088  
    11#!/bin/sh
    22
    3 ./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-petsc-version=2 --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" --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="$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 --with-fortran-lib="/usr/local/lib/libgfortran.a" --with-math-lib="/usr/lib/libm.dylib" --with-graphics-lib="/usr/X11/lib/libX11.dylib" --with-cxxoptflags=" -DMATLAB_MEX_FILE -fno-common -no-cpp-precomp -fexceptions -arch i386  -DMX_COMPAT_32 -O3 -DNDEBUG -w" --with-numthreads=8
     3./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-petsc-version=2 --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" --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="$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 --with-fortran-lib="/usr/local/lib/libgfortran.a" --with-math-lib="/usr/lib/libm.dylib" --with-graphics-lib="/usr/X11/lib/libX11.dylib" --with-cxxoptflags=" -DMATLAB_MEX_FILE -fno-common -no-cpp-precomp -fexceptions -arch i386  -DMX_COMPAT_32 -O3 -DNDEBUG -w" --with-numthreads=8
  • issm/trunk/configs/macosx64/macosx64.sh.petsc3

    r3321 r6088  
    11#!/bin/sh
    22
    3 ./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-petsc-version=3 --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" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH -lPLAPACK" --with-plapack-include="$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH/ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH --with-fortran-lib="/usr/local/lib/libgfortran.a" --with-math-lib="/usr/lib/libm.dylib" --with-graphics-lib="/usr/X11/lib/libX11.dylib" --with-cxxoptflags="-march=opteron -O2" --with-numthreads=8
     3./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-petsc-version=3 --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" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH -lPLAPACK" --with-plapack-include="$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH/ --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/$ISSM_ARCH --with-fortran-lib="/usr/local/lib/libgfortran.a" --with-math-lib="/usr/lib/libm.dylib" --with-graphics-lib="/usr/X11/lib/libX11.dylib" --with-cxxoptflags="-march=opteron -O2" --with-numthreads=8
  • issm/trunk/configs/pleiades/pleiades.sh.petsc2

    r3225 r6088  
    11#!/bin/csh
    22
    3 ./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=/nasa/sgi/mpt/1.23.nas/includ  --with-mpi-lib="-L/nasa/sgi/mpt/1.23.nas/lib64/ -lmpi -lpthread -lgfortran" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-mkl-dir=/nasa/intel/mkl/10.0.011/lib/64/ --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-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH/ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-graphics-lib=/usr/X11/lib64/libX11.so --with-cxxoptflags="-O3 -xS" --with-vendor=intel-pleiades --with-petsc-version=2
     3./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=/nasa/sgi/mpt/1.23.nas/includ  --with-mpi-lib="-L/nasa/sgi/mpt/1.23.nas/lib64/ -lmpi -lpthread -lgfortran" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install --with-mkl-dir=/nasa/intel/mkl/10.0.011/lib/64/ --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-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH/ --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-graphics-lib=/usr/X11/lib64/libX11.so --with-cxxoptflags="-O3 -xS" --with-vendor=intel-pleiades --with-petsc-version=2
  • issm/trunk/configs/pleiades/pleiades.sh.petsc3

    r3225 r6088  
    11#!/bin/csh
    22
    3 ./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=/nasa/sgi/mpt/1.23.nas/includ  --with-mpi-lib="-L/nasa/sgi/mpt/1.23.nas/lib64/ -lmpi -lpthread -lgfortran" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-mkl-dir=/nasa/intel/mkl/10.0.011/lib/64/ --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/externalpackages/MUMPS_4.6.3/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH/ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-graphics-lib=/usr/X11/lib64/libX11.so --with-cxxoptflags="-O3 -xS" --with-vendor=intel-pleiades --with-petsc-version=2
     3./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=/nasa/sgi/mpt/1.23.nas/includ  --with-mpi-lib="-L/nasa/sgi/mpt/1.23.nas/lib64/ -lmpi -lpthread -lgfortran" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install --with-mkl-dir=/nasa/intel/mkl/10.0.011/lib/64/ --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/externalpackages/MUMPS_4.6.3/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH/ --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-graphics-lib=/usr/X11/lib64/libX11.so --with-cxxoptflags="-O3 -xS" --with-vendor=intel-pleiades --with-petsc-version=2
  • issm/trunk/configs/winxp32/winxp32.sh.petsc2

    r3225 r6088  
    44#get configure.sh to pick up the intel compiler
    55
    6 ./configure --prefix=$ISSM_DIR --with-parallel=no --with-vendor=intel  --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  --with-petsc-version=2
     6./configure --prefix=$ISSM_TIER --with-parallel=no --with-vendor=intel  --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  --with-petsc-version=2
  • issm/trunk/configs/winxp32/winxp32.sh.petsc3

    r3225 r6088  
    44#get configure.sh to pick up the intel compiler
    55
    6 ./configure --prefix=$ISSM_DIR --with-parallel=no --with-vendor=intel  --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  --with-petsc-version=3
     6./configure --prefix=$ISSM_TIER --with-parallel=no --with-vendor=intel  --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  --with-petsc-version=3
  • issm/trunk/cron/README

    r42 r6088  
    77For example, if you add:
    88
    9 5 5 * * * cd $ISSM_DIR/cron && ./nightlyrun.sh
     95 5 * * * cd $ISSM_TIER/cron && ./nightlyrun.sh
    1010
    1111This will run all the scripts in the Cron directory, every day, at 5:05 am.
  • issm/trunk/cron/configs/linux64_larour

    r5068 r6088  
    77
    88#ISSM main directory (full pathto ISSM trunk)
    9 ISSM_DIR="/u/astrid-r1b/larour/issm/trunk/cron/trunk"
    10 #ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2"
     9ISSM_TIER="/u/astrid-r1b/larour/issm/trunk/cron/trunk"
     10#ISSM_TIER="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2"
    1111
    1212#ISSM Architecture
     
    7070
    7171#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
    72 #sent to the adresses present in $ISSM_DIR/cron/mailinglist.
     72#sent to the adresses present in $ISSM_TIER/cron/mailinglist.
    7373SKIPMAIL="no"
    7474
  • issm/trunk/cron/configs/linux64_morlighem_daily

    r5603 r6088  
    77
    88#ISSM main directory (full pathto ISSM trunk)
    9 ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/trunk"
    10 #ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2"
     9ISSM_TIER="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/trunk"
     10#ISSM_TIER="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2"
    1111
    1212#ISSM Architecture
     
    7070
    7171#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
    72 #sent to the adresses present in $ISSM_DIR/cron/mailinglist.
     72#sent to the adresses present in $ISSM_TIER/cron/mailinglist.
    7373SKIPMAIL="no"
    7474
  • issm/trunk/cron/configs/linux64_morlighem_nightly

    r5603 r6088  
    77
    88#ISSM main directory (full pathto ISSM trunk)
    9 ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/trunk"
    10 #ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2"
     9ISSM_TIER="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/trunk"
     10#ISSM_TIER="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2"
    1111
    1212#ISSM Architecture
     
    7070
    7171#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
    72 #sent to the adresses present in $ISSM_DIR/cron/mailinglist.
     72#sent to the adresses present in $ISSM_TIER/cron/mailinglist.
    7373SKIPMAIL="no"
    7474
  • issm/trunk/cron/configs/linux64_morlighem_validation

    r5603 r6088  
    66
    77#ISSM main directory (full pathto ISSM trunk)
    8 ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/trunk"
    9 #ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2"
     8ISSM_TIER="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/trunk"
     9#ISSM_TIER="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2"
    1010
    1111#ISSM Architecture
     
    6969
    7070#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
    71 #sent to the adresses present in $ISSM_DIR/cron/mailinglist.
     71#sent to the adresses present in $ISSM_TIER/cron/mailinglist.
    7272SKIPMAIL="no"
    7373
  • issm/trunk/cron/configs/linux64_seroussi

    r5068 r6088  
    77
    88#ISSM main directory (full pathto ISSM trunk)
    9 ISSM_DIR="/u/wilkes-r1b/seroussi/svn/issm/trunk/cron/trunk"
     9ISSM_TIER="/u/wilkes-r1b/seroussi/svn/issm/trunk/cron/trunk"
    1010
    1111#ISSM Architecture
     
    6969
    7070#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
    71 #sent to the adresses present in $ISSM_DIR/cron/mailinglist.
     71#sent to the adresses present in $ISSM_TIER/cron/mailinglist.
    7272SKIPMAIL="no"
    7373
  • issm/trunk/cron/configs/macosx32_seroussi

    r5068 r6088  
    77
    88#ISSM main directory (full pathto ISSM trunk)
    9 ISSM_DIR="/Users/seroussi/Desktop/backup/svn/issm/trunk/cron/trunk"
     9ISSM_TIER="/Users/seroussi/Desktop/backup/svn/issm/trunk/cron/trunk"
    1010
    1111#ISSM Architecture
     
    6969
    7070#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
    71 #sent to the adresses present in $ISSM_DIR/cron/mailinglist.
     71#sent to the adresses present in $ISSM_TIER/cron/mailinglist.
    7272SKIPMAIL="no"
    7373
  • issm/trunk/cron/configs/winxp32_larour

    r5068 r6088  
    77
    88#ISSM main directory (full pathto ISSM trunk)
    9 ISSM_DIR="C:/home/issm/trunk/cron/trunk"
     9ISSM_TIER="C:/home/issm/trunk/cron/trunk"
    1010
    1111#ISSM Architecture
     
    6969
    7070#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
    71 #sent to the adresses present in $ISSM_DIR/cron/mailinglist.
     71#sent to the adresses present in $ISSM_TIER/cron/mailinglist.
    7272SKIPMAIL="no"
    7373
  • issm/trunk/cron/nightlyrun.sh

    r5983 r6088  
    5454#}}}
    5555#Export ISSM_* variables{{{1
    56 export ISSM_DIR
     56export ISSM_TIER
    5757export ISSM_ARCH
    5858#}}}
     
    7979
    8080        #only update ISSM
    81         cd $ISSM_DIR
     81        cd $ISSM_TIER
    8282        svn update
    8383
     
    9898#Create cluster's settings{{{1
    9999#create simpler  cluster.rc file, with only the cluster we are interested in.
    100 cd $ISSM_DIR/test/NightlyRun/
     100cd $ISSM_TIER/test/NightlyRun/
    101101cat << END > SetParallel.m
    102102function md=SetParallel(md,numcpus);
    103103
    104 eval(['md.cluster=' oshostname() '(''np'',numcpus,''login'',''$USER'',''codepath'',''$ISSM_DIR/bin'',''executionpath'',''$EXECUTION_PATH'');']);
     104eval(['md.cluster=' oshostname() '(''np'',numcpus,''login'',''$USER'',''codepath'',''$ISSM_TIER/bin'',''executionpath'',''$EXECUTION_PATH'');']);
    105105END
    106106#}}}
    107107#Source environment variables with new matlab path {{{1
    108 cd $ISSM_DIR/etc
     108cd $ISSM_TIER/etc
    109109source environment.sh MATLAB_DIR=$MATLAB_PATH
    110110#}}}
     
    112112if [ "$ISSM_EXTERNALPACKAGES" == "install" ]
    113113then
    114         cd $ISSM_DIR/externalpackages
     114        cd $ISSM_TIER/externalpackages
    115115        for ep in $EXTERNALPACKAGES
    116116        do
     
    131131
    132132        #3: install automake and autoconf
    133         cd $ISSM_DIR/devpackages
     133        cd $ISSM_TIER/devpackages
    134134        make
    135135        cd ..
     
    139139
    140140        #erase externapackages, and link with externalpackages_dir
    141         cd $ISSM_DIR
     141        cd $ISSM_TIER
    142142        rm -rf externalpackages
    143143        cp -Rf $EXTERNALPACKAGESDIR ./
     
    164164then
    165165
    166         cd $ISSM_DIR
     166        cd $ISSM_TIER
    167167        make distclean
    168168        sh scripts/automakererun.sh
     
    173173        if [ "$OS" = "winxp32" ]
    174174        then
    175                 cd $ISSM_DIR/src/c
     175                cd $ISSM_TIER/src/c
    176176                ./intel-compile.sh
    177                 cd $ISSM_DIR/src/mex
     177                cd $ISSM_TIER/src/mex
    178178                make install
    179                 cd $ISSM_DIR
     179                cd $ISSM_TIER
    180180        else
    181181                make -j $NUMCPUS_INSTALL
     
    200200#Prepare run
    201201#Windows hack for startup.m {{{1
    202 #windows environments: ISSM_DIR_WIN variable not correctly picked up when using
    203 #the cron job. just get startup to take the ISSM_DIR variable as the pwd:
     202#windows environments: ISSM_TIER_WIN variable not correctly picked up when using
     203#the cron job. just get startup to take the ISSM_TIER variable as the pwd:
    204204if [ "$OS" = "winxp32" ]
    205205then
    206         cat startup.m | sed 's/clear status/clear status; ISSM_DIR=pwd;/g' > startup.m.bak
     206        cat startup.m | sed 's/clear status/clear status; ISSM_TIER=pwd;/g' > startup.m.bak
    207207        mv startup.m.bak startup.m
    208208fi
    209209#}}}
    210210#create softlink to startup {{{1
    211 cd $ISSM_DIR/test/NightlyRun/
    212 ln -s $ISSM_DIR/startup.m .
     211cd $ISSM_TIER/test/NightlyRun/
     212ln -s $ISSM_TIER/startup.m .
    213213#}}}
    214214#Create nightlylog directory and info.log {{{1
     
    216216INSTALL_TIME=$(timer)
    217217ELAPSED_INSTALL=$(timer $START_TIME)
    218 rm -rf $ISSM_DIR/nightlylog
    219 mkdir  $ISSM_DIR/nightlylog
    220 cat << END > $ISSM_DIR/nightlylog/info.log
     218rm -rf $ISSM_TIER/nightlylog
     219mkdir  $ISSM_TIER/nightlylog
     220cat << END > $ISSM_TIER/nightlylog/info.log
    221221today:     $(echo $TODAY)
    222222user:      $(echo $USER)
     
    241241do
    242242        #Launch matlab and the nightly run script
    243         cat > $ISSM_DIR/nightlylog/matlab_run$i.m << EOF
     243        cat > $ISSM_TIER/nightlylog/matlab_run$i.m << EOF
    244244        warning off %necessary to avoid a info.log of several Go for parallel runs
    245245        try,
    246         cd $ISSM_DIR/test/NightlyRun
     246        cd $ISSM_TIER/test/NightlyRun
    247247        startup;
    248248        $(if [ "$NROPTIONS" = ""  ]
     
    257257                directory=strsplit(pwd,'/');
    258258                message=getReport(me)
    259                 fid=fopen([ISSM_DIR '/nightlylog/matlaberror.log'], 'at');
     259                fid=fopen([ISSM_TIER '/nightlylog/matlaberror.log'], 'at');
    260260                fprintf(fid,'\nMatlab error occured in: %s\n\n',directory{end});
    261261                fprintf(fid,'%s',message);
     
    267267
    268268        #Start run from nightlylog directory
    269         cd $ISSM_DIR/nightlylog/
     269        cd $ISSM_TIER/nightlylog/
    270270
    271271        #Start test
     
    278278#}}}
    279279#concatenate all reports {{{1
    280 cd $ISSM_DIR/nightlylog/
     280cd $ISSM_TIER/nightlylog/
    281281mv matlab_log1.log  matlab_log.log
    282282for (( i=2;i<=$NUMCPUS_RUN;i++ ))
     
    295295ELAPSED_RUN=$(timer $INSTALL_TIME)
    296296ELAPSED_TOTAL=$(timer $START_TIME)
    297 cat << END >>  $ISSM_DIR/nightlylog/info.log
     297cat << END >>  $ISSM_TIER/nightlylog/info.log
    298298elapsed_run:   $(echo $ELAPSED_RUN)
    299299elapsed_total: $(echo $ELAPSED_TOTAL)
     
    304304#Send Report
    305305#Build html report {{{1
    306 cd $ISSM_DIR/nightlylog/
     306cd $ISSM_TIER/nightlylog/
    307307sh ../scripts/report.sh
    308 echo "html report located in $ISSM_DIR/nightlylog/report.html"
     308echo "html report located in $ISSM_TIER/nightlylog/report.html"
    309309#}}}
    310310#send mail if requested                  (SKIPMAIL) {{{1
     
    312312then
    313313        echo "sending report..."
    314         source $ISSM_DIR/cron/mailinglist
     314        source $ISSM_TIER/cron/mailinglist
    315315        for i in `echo $MAILINGLIST`; do
    316316
    317317                if [ "$OS" = "winxp32" ]
    318318                then
    319                         email -html -f "ISSM Nightly run $EMAIL_ADRESS" -s "Nightly runs of $ISSM_RELEASE , operating system: $OS, host: $HOST_NAME, user: $USER. " $i < $ISSM_DIR/test/Verification/NightlyRun/report.html
     319                        email -html -f "ISSM Nightly run $EMAIL_ADRESS" -s "Nightly runs of $ISSM_RELEASE , operating system: $OS, host: $HOST_NAME, user: $USER. " $i < $ISSM_TIER/test/Verification/NightlyRun/report.html
    320320                else
    321321                        if [ "$OS" = "linux64" ]
    322322                        then
    323 cat - $ISSM_DIR/nightlylog/report.html <<HERE | /usr/lib/sendmail  -oi -t
     323cat - $ISSM_TIER/nightlylog/report.html <<HERE | /usr/lib/sendmail  -oi -t
    324324From: "ISSM Nightly run" <$EMAIL_ADRESS>
    325325To: $i
     
    329329HERE
    330330                else
    331 cat - $ISSM_DIR/nightlylog/report.html <<HERE | /usr/sbin/sendmail  -oi -t
     331cat - $ISSM_TIER/nightlylog/report.html <<HERE | /usr/sbin/sendmail  -oi -t
    332332From: "ISSM Nightly run" <$EMAIL_ADRESS>
    333333To: $i
  • issm/trunk/devpackages/autoconf/install.sh

    r18 r6088  
    1919#Compile autoconf
    2020cd src
    21 ./configure --prefix="$ISSM_DIR/devpackages/autoconf/install"
     21./configure --prefix="$ISSM_TIER/devpackages/autoconf/install"
    2222make 
    2323make install
  • issm/trunk/devpackages/automake/install.sh

    r18 r6088  
    1919#Compile automake
    2020cd src
    21 ./configure --prefix="$ISSM_DIR/devpackages/automake/install"
     21./configure --prefix="$ISSM_TIER/devpackages/automake/install"
    2222make 
    2323make install
  • issm/trunk/doc/issmdoc.m

    r1282 r6088  
    11%Quick documentation for ISSM
    22
    3 %First get ISSM dir:
    4 ISSM_DIR=issmdir;
     3%First get ISSM tier:
     4ISSM_TIER=issmtier;
    55
    6 disp(sprintf('\n%s%s%s','  The following documentations are available in ',ISSM_DIR,'/doc/'));
     6disp(sprintf('\n%s%s%s','  The following documentations are available in ',ISSM_TIER,'/doc/'));
    77disp(sprintf('%s','        userguide: how to use ISSM, quick tutorial'));
    88disp(sprintf('%s','        theoryguide: theory behind the ISSM models'));
     
    1010disp(sprintf('\n%s','  Website: a comprehensive documentation is available on http://www.issm.jpl.nasa.gov'));
    1111disp(sprintf('\n%s','  Example: how to create a square ice shelf'));
    12 disp(sprintf('%s','        go to ',ISSM_DIR,'/examples/SquareIceshelf'));
     12disp(sprintf('%s','        go to ',ISSM_TIER,'/examples/SquareIceshelf'));
    1313disp(sprintf('%s','        md=model;                                %creates a new empty model structure'));
    1414disp(sprintf('%s','        md=mesh(md,''DomainOutline.exp'',50000);   %creates a mesh of the domain outline with a resolution of 50000m'));
  • issm/trunk/etc/environment.csh

    r3592 r6088  
    1 #ISSM_DIR and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
    2 source $ISSM_DIR/etc/environment_variables.csh
     1#ISSM_TIER and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
     2source $ISSM_TIER/etc/environment_variables.csh
    33
    44#Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them before exporting the variables
     
    1010
    1111#CRON utilities
    12 setenv PATH {$PATH}:{$ISSM_DIR}/cron
     12setenv PATH {$PATH}:{$ISSM_TIER}/cron
    1313
    1414#SCRIPTS utilities
    15 setenv PATH {$PATH}:{$ISSM_DIR}/scripts
     15setenv PATH {$PATH}:{$ISSM_TIER}/scripts
    1616
    1717#MATLAB
  • issm/trunk/etc/environment.sh

    r4615 r6088  
    1 #ISSM_DIR and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
    2 source $ISSM_DIR/etc/environment_variables.sh
     1#ISSM_TIER and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
     2source $ISSM_TIER/etc/environment_variables.sh
    33
    44#Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them before exporting the variables
     
    1010
    1111#CRON utilities
    12 PATH="$PATH:$ISSM_DIR/cron"
     12PATH="$PATH:$ISSM_TIER/cron"
    1313
    1414#scripts
    15 PATH="$PATH:$ISSM_DIR/scripts"
     15PATH="$PATH:$ISSM_TIER/scripts"
    1616
    1717##MATLAB
     
    102102
    103103#LATEX2RTF
    104 export RTFPATH="$ISSM_DIR/externalpackages/latex2rtf/cfg"
     104export RTFPATH="$ISSM_TIER/externalpackages/latex2rtf/cfg"
    105105
    106106#Chaco
     
    132132#export INTEL_DIR
    133133#PATH="$PATH:$INTEL_DIR"
    134 #source $ISSM_DIR/externalpackages/intel/intel.sh
     134#source $ISSM_TIER/externalpackages/intel/intel.sh
    135135
    136136#SDK
  • issm/trunk/etc/environment_variables.csh

    r5262 r6088  
    11#
    22#
    3 #This routine can only be run if the ISSM_DIR variable has been correctly set!
     3#This routine can only be run if the ISSM_TIER variable has been correctly set!
    44#
    55#
    66
    77#MATLAB
    8 set MATLAB_DIR={$ISSM_DIR}/externalpackages/matlab/install
     8set MATLAB_DIR={$ISSM_TIER}/externalpackages/matlab/install
    99set MATLAB_VERSION=
    1010
    1111#MPI
    12 set MPI_DIR={$ISSM_DIR}/externalpackages/mpich2/install
     12set MPI_DIR={$ISSM_TIER}/externalpackages/mpich2/install
    1313
    1414#PETSC
    15 set PETSC_DIR={$ISSM_DIR}/externalpackages/petsc/install
     15set PETSC_DIR={$ISSM_TIER}/externalpackages/petsc/install
    1616
    1717#SLEPC
    18 set SLEPC_DIR={$ISSM_DIR}/externalpackages/slepc/install
     18set SLEPC_DIR={$ISSM_TIER}/externalpackages/slepc/install
    1919
    2020#Dakota
    21 set DAKOTA_DIR={$ISSM_DIR}/externalpackages/dakota/install
     21set DAKOTA_DIR={$ISSM_TIER}/externalpackages/dakota/install
    2222
    2323#Qhull
    24 set QHULL_DIR={$ISSM_DIR}/externalpackages/qhull/install
     24set QHULL_DIR={$ISSM_TIER}/externalpackages/qhull/install
    2525
    2626#Doxygen
    27 set DOXYGEN_DIR={$ISSM_DIR}/externalpackages/doxygen/install
     27set DOXYGEN_DIR={$ISSM_TIER}/externalpackages/doxygen/install
    2828
    2929#MTOC
    30 set MTOC_DIR={$ISSM_DIR}/externalpackages/mtoc/install
     30set MTOC_DIR={$ISSM_TIER}/externalpackages/mtoc/install
    3131
    3232#Triangle
    33 set TRIANGLE_DIR={$ISSM_DIR}/externalpackages/triangle/install
     33set TRIANGLE_DIR={$ISSM_TIER}/externalpackages/triangle/install
    3434
    3535#METIS
    36 set METIS_DIR={$ISSM_DIR}/externalpackages/metis/install
     36set METIS_DIR={$ISSM_TIER}/externalpackages/metis/install
    3737
    3838#BLAS
    39 set BLAS_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/fblaslapack
     39set BLAS_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/fblaslapack
    4040
    4141#LAPACK
    42 set LAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/fblaslapack/$ISSM_ARCH
     42set LAPACK_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/fblaslapack/$ISSM_ARCH
    4343
    4444#SCALAPACK
    45 set SCALAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/SCALAPACK/$ISSM_ARCH
     45set SCALAPACK_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/SCALAPACK/$ISSM_ARCH
    4646
    4747#PLAPACK
    48 set PLAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/PLAPACKR32
     48set PLAPACK_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/PLAPACKR32
    4949
    5050#BLACS
    51 set BLACS_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/blacs-dev/$ISSM_ARCH
     51set BLACS_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/blacs-dev/$ISSM_ARCH
    5252
    5353#sowing
    54 set SOWING_DIR={$ISSM_DIR}/externalpackages/sowing/install
     54set SOWING_DIR={$ISSM_TIER}/externalpackages/sowing/install
    5555
    5656#YAMS
    57 set YAMS_DIR={$ISSM_DIR}/externalpackages/yams/install
     57set YAMS_DIR={$ISSM_TIER}/externalpackages/yams/install
    5858
    5959#TEX2IM
    60 set TEX2IM_DIR={$ISSM_DIR}/externalpackages/tex2im/install
     60set TEX2IM_DIR={$ISSM_TIER}/externalpackages/tex2im/install
    6161
    6262#Chaco
    63 set CHACO_DIR={$ISSM_DIR}/externalpackages/chaco/install
     63set CHACO_DIR={$ISSM_TIER}/externalpackages/chaco/install
    6464
    6565#MeshPart
    66 set MESHPART_DIR={$ISSM_DIR}/externalpackages/meshpart/install
     66set MESHPART_DIR={$ISSM_TIER}/externalpackages/meshpart/install
    6767
    6868#SCOTCH
    69 set SCOTCH_DIR={$ISSM_DIR}/externalpackages/scotch/install
     69set SCOTCH_DIR={$ISSM_TIER}/externalpackages/scotch/install
    7070
    7171#Development packages
    7272#automake
    73 set AUTOMAKE_DIR={$ISSM_DIR}/devpackages/automake/install
     73set AUTOMAKE_DIR={$ISSM_TIER}/devpackages/automake/install
    7474
    7575#autoconf
    76 set AUTOCONF_DIR={$ISSM_DIR}/devpackages/autoconf/install
     76set AUTOCONF_DIR={$ISSM_TIER}/devpackages/autoconf/install
    7777
    7878#borland
     
    8080
    8181#ssh
    82 set SSH_DIR={$ISSM_DIR}/externalpackages/ssh
     82set SSH_DIR={$ISSM_TIER}/externalpackages/ssh
    8383
    8484#valgrind
    85 set VALGRIND_DIR={$ISSM_DIR}/externalpackages/valgrind/install/bin
     85set VALGRIND_DIR={$ISSM_TIER}/externalpackages/valgrind/install/bin
  • issm/trunk/etc/environment_variables.sh

    r3984 r6088  
    11#
    22#
    3 #This routine can only be run if the ISSM_DIR variable has been correctly set!
     3#This routine can only be run if the ISSM_TIER variable has been correctly set!
    44#
    55#
    66
    77#MATLAB
    8 MATLAB_DIR="$ISSM_DIR/externalpackages/matlab/install"
     8MATLAB_DIR="$ISSM_TIER/externalpackages/matlab/install"
    99MATLAB_VERSION=R2008a
    1010
    1111#MPI
    12 MPI_DIR="$ISSM_DIR/externalpackages/mpich2/install"
     12MPI_DIR="$ISSM_TIER/externalpackages/mpich2/install"
    1313
    1414#PETSC
    15 PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install"
     15PETSC_DIR="$ISSM_TIER/externalpackages/petsc/install"
    1616
    1717#SLEPC
    18 SLEPC_DIR="$ISSM_DIR/externalpackages/slepc/install"
     18SLEPC_DIR="$ISSM_TIER/externalpackages/slepc/install"
    1919
    2020#Dakota
    21 DAKOTA_DIR="$ISSM_DIR/externalpackages/dakota/install"
     21DAKOTA_DIR="$ISSM_TIER/externalpackages/dakota/install"
    2222
    2323#Qhull
    24 QHULL_DIR="$ISSM_DIR/externalpackages/qhull/install"
     24QHULL_DIR="$ISSM_TIER/externalpackages/qhull/install"
    2525
    2626#Doxygen
    27 DOXYGEN_DIR="$ISSM_DIR/externalpackages/doxygen/install"
     27DOXYGEN_DIR="$ISSM_TIER/externalpackages/doxygen/install"
    2828
    2929#MTOC
    30 MTOC_DIR="$ISSM_DIR/externalpackages/mtoc/install"
     30MTOC_DIR="$ISSM_TIER/externalpackages/mtoc/install"
    3131
    3232#Triangle
    33 TRIANGLE_DIR="$ISSM_DIR/externalpackages/triangle/install"
     33TRIANGLE_DIR="$ISSM_TIER/externalpackages/triangle/install"
    3434
    3535#METIS
    36 METIS_DIR="$ISSM_DIR/externalpackages/metis/install"
     36METIS_DIR="$ISSM_TIER/externalpackages/metis/install"
    3737
    3838#BLAS
    39 BLAS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack"
     39BLAS_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/fblaslapack"
    4040
    4141#LAPACK
    42 LAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH"
     42LAPACK_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH"
    4343
    4444#SCALAPACK
    45 SCALAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH"
     45SCALAPACK_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH"
    4646
    4747#PLAPACK
    48 PLAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32"
     48PLAPACK_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32"
    4949
    5050#BLACS
    51 BLACS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
     51BLACS_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
    5252
    5353#sowing
    54 SOWING_DIR="$ISSM_DIR/externalpackages/sowing/install"
     54SOWING_DIR="$ISSM_TIER/externalpackages/sowing/install"
    5555
    5656#BLACS
    57 BLACS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
     57BLACS_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
    5858
    5959#YAMS
    60 YAMS_DIR="$ISSM_DIR/externalpackages/yams/install"
     60YAMS_DIR="$ISSM_TIER/externalpackages/yams/install"
    6161
    6262#BAMG
    63 BAMG_DIR="$ISSM_DIR/externalpackages/bamg/install"
     63BAMG_DIR="$ISSM_TIER/externalpackages/bamg/install"
    6464
    6565#Chaco
    66 CHACO_DIR="$ISSM_DIR/externalpackages/chaco/install"
     66CHACO_DIR="$ISSM_TIER/externalpackages/chaco/install"
    6767
    6868#MeshPart
    69 MESHPART_DIR="$ISSM_DIR/externalpackages/meshpart/install"
     69MESHPART_DIR="$ISSM_TIER/externalpackages/meshpart/install"
    7070
    7171#SCOTCH
    72 SCOTCH_DIR="$ISSM_DIR/externalpackages/scotch/install"
     72SCOTCH_DIR="$ISSM_TIER/externalpackages/scotch/install"
    7373
    7474#Development packages
    7575#automake
    76 AUTOMAKE_DIR="$ISSM_DIR/devpackages/automake/install"
     76AUTOMAKE_DIR="$ISSM_TIER/devpackages/automake/install"
    7777
    7878#autoconf
    79 AUTOCONF_DIR="$ISSM_DIR/devpackages/autoconf/install"
     79AUTOCONF_DIR="$ISSM_TIER/devpackages/autoconf/install"
    8080
    8181#borland
     
    8686
    8787#TEX2IM                 
    88 TEX2IM_DIR="$ISSM_DIR/externalpackages/tex2im/install"
     88TEX2IM_DIR="$ISSM_TIER/externalpackages/tex2im/install"
    8989
    9090#sdk
     
    9292
    9393#ssh
    94 SSH_DIR="$ISSM_DIR/externalpackages/ssh"
     94SSH_DIR="$ISSM_TIER/externalpackages/ssh"
    9595
    9696#valgrind
    97 VALGRIND_DIR="$ISSM_DIR/externalpackages/valgrind/install/bin"
     97VALGRIND_DIR="$ISSM_TIER/externalpackages/valgrind/install/bin"
    9898
    9999#graphviz
    100 GRAPHVIZ_DIR="$ISSM_DIR/externalpackages/graphviz/install/bin"
     100GRAPHVIZ_DIR="$ISSM_TIER/externalpackages/graphviz/install/bin"
    101101
    102102#cppcheck
    103 CPPCHECK_DIR="$ISSM_DIR/externalpackages/cppcheck/install"
     103CPPCHECK_DIR="$ISSM_TIER/externalpackages/cppcheck/install"
  • issm/trunk/externalpackages/README

    r1060 r6088  
    22
    33
    4 1/ source the ISSM_DIR/Etc/environment.sh file. This will set up all the necessary
     41/ source the ISSM_TIER/Etc/environment.sh file. This will set up all the necessary
    55environment variables in your shell.
    66
  • issm/trunk/scripts/archive.sh

    r2619 r6088  
    1010
    1111#Cleanup code
    12 cd $ISSM_DIR
     12cd $ISSM_TIER
    1313make clean
    1414make distclean
     
    1818
    1919#Create tar file, with today's date in the title;
    20 cd $ISSM_DIR/..
     20cd $ISSM_TIER/..
    2121today=`today_date`
    22 tar zcvf issm-3.0-$today.tar.gz  `basename $ISSM_DIR`
     22tar zcvf issm-3.0-$today.tar.gz  `basename $ISSM_TIER`
  • issm/trunk/scripts/automakererun.sh

    r3364 r6088  
    77rm -rf aclocal.m4
    88echo "Calling alocal"
    9 $ISSM_DIR/devpackages/automake/install/bin/aclocal -I m4
     9$ISSM_TIER/devpackages/automake/install/bin/aclocal -I m4
    1010echo "Calling autoconf"
    11 $ISSM_DIR/devpackages/autoconf/install/bin/autoconf
     11$ISSM_TIER/devpackages/autoconf/install/bin/autoconf
    1212echo "Calling autoheader"
    13 $ISSM_DIR/devpackages/autoconf/install/bin/autoheader
     13$ISSM_TIER/devpackages/autoconf/install/bin/autoheader
    1414echo "Calling automake"
    15 $ISSM_DIR/devpackages/automake/install/bin/automake -a
     15$ISSM_TIER/devpackages/automake/install/bin/automake -a
  • issm/trunk/scripts/createlinks.sh

    r1 r6088  
    33
    44#go to ISSM main directory
    5 cd $ISSM_DIR
     5cd $ISSM_TIER
    66
    77#get path of runmes.m
     
    1010#loop over the directories
    1111for i in $FILES; do
    12         cd $ISSM_DIR$i
    13         ln -s $ISSM_DIR/startup.m .
    14         cd $ISSM_DIR
     12        cd $ISSM_TIER$i
     13        ln -s $ISSM_TIER/startup.m .
     14        cd $ISSM_TIER
    1515done
  • issm/trunk/scripts/dailyrun.sh

    r5591 r6088  
    5454#Prepare run
    5555#Windows hack for startup.m {{{1
    56 #windows environments: ISSM_DIR_WIN variable not correctly picked up when using
    57 #the cron job. just get startup to take the ISSM_DIR variable as the pwd:
     56#windows environments: ISSM_TIER_WIN variable not correctly picked up when using
     57#the cron job. just get startup to take the ISSM_TIER variable as the pwd:
    5858if [ "$OS" = "winxp32" ]
    5959then
    60         cat startup.m | sed 's/clear status/clear status; ISSM_DIR=pwd;/g' > startup.m.bak
     60        cat startup.m | sed 's/clear status/clear status; ISSM_TIER=pwd;/g' > startup.m.bak
    6161        mv startup.m.bak startup.m
    6262fi
    6363#}}}
    6464#create softlink to startup {{{1
    65 cd $ISSM_DIR/test/NightlyRun/
    66 ln -s $ISSM_DIR/startup.m .
     65cd $ISSM_TIER/test/NightlyRun/
     66ln -s $ISSM_TIER/startup.m .
    6767#}}}
    6868#Create dailylog directory and info.log {{{1
     
    7070INSTALL_TIME=$(timer)
    7171ELAPSED_INSTALL=$(timer $START_TIME)
    72 rm -rf $ISSM_DIR/dailylog
    73 mkdir  $ISSM_DIR/dailylog
    74 cat << END > $ISSM_DIR/dailylog/info.log
     72rm -rf $ISSM_TIER/dailylog
     73mkdir  $ISSM_TIER/dailylog
     74cat << END > $ISSM_TIER/dailylog/info.log
    7575today:     $(echo $TODAY)
    7676user:      $(echo $USER)
     
    9595do
    9696        #Launch matlab and the daily run script
    97         cat > $ISSM_DIR/dailylog/matlab_run$i.m << EOF
     97        cat > $ISSM_TIER/dailylog/matlab_run$i.m << EOF
    9898        warning off %necessary to avoid a info.log of several Go for parallel runs
    9999        try,
    100         cd $ISSM_DIR/test/NightlyRun
     100        cd $ISSM_TIER/test/NightlyRun
    101101        startup;
    102102        $(if [ "$NROPTIONS" = ""  ]
     
    111111                directory=strsplit(pwd,'/');
    112112                message=getReport(me)
    113                 fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at');
     113                fid=fopen([ISSM_TIER '/dailylog/matlaberror.log'], 'at');
    114114                fprintf(fid,'\nMatlab error occured in: %s\n\n',directory{end});
    115115                fprintf(fid,'%s',message);
     
    121121
    122122        #Start run from dailylog directory
    123         cd $ISSM_DIR/dailylog/
     123        cd $ISSM_TIER/dailylog/
    124124
    125125        #Start test
     
    132132#}}}
    133133#concatenate all reports {{{1
    134 cd $ISSM_DIR/dailylog/
     134cd $ISSM_TIER/dailylog/
    135135mv matlab_log1.log  matlab_log.log
    136136for (( i=2;i<=$NUMCPUS_RUN;i++ ))
     
    149149ELAPSED_RUN=$(timer $INSTALL_TIME)
    150150ELAPSED_TOTAL=$(timer $START_TIME)
    151 cat << END >>  $ISSM_DIR/dailylog/info.log
     151cat << END >>  $ISSM_TIER/dailylog/info.log
    152152elapsed_run:   $(echo $ELAPSED_RUN)
    153153elapsed_total: $(echo $ELAPSED_TOTAL)
     
    158158#Send Report
    159159#Build html report {{{1
    160 cd $ISSM_DIR/dailylog/
     160cd $ISSM_TIER/dailylog/
    161161sh ../scripts/report.sh
    162 ln -s $ISSM_DIR/dailylog/report.html $INIT_PATH
    163 echo "html report located in $ISSM_DIR/dailylog/report.html and $INIT_PATH/report.html"
     162ln -s $ISSM_TIER/dailylog/report.html $INIT_PATH
     163echo "html report located in $ISSM_TIER/dailylog/report.html and $INIT_PATH/report.html"
    164164#}}}
  • issm/trunk/scripts/eraselinks.sh

    r1 r6088  
    33
    44#go to ISSM main directory
    5 cd $ISSM_DIR
     5cd $ISSM_TIER
    66
    77#get path of runmes.m
     
    1010#loop over the directories
    1111for i in $FILES; do
    12         cd $ISSM_DIR$i
     12        cd $ISSM_TIER$i
    1313        rm startup.m
    14         cd $ISSM_DIR
     14        cd $ISSM_TIER
    1515done
  • issm/trunk/scripts/getloc.sh

    r4909 r6088  
    33
    44#get Matlab number of lines
    5 cd $ISSM_DIR/src/m
     5cd $ISSM_TIER/src/m
    66M_LOC=$(find . -name "*.m" -exec wc -l '{}' \; | awk '{ sum += $1 } END { print sum}');
    77echo "Matlab code: $M_LOC"
    88
    99#get C/CPP number of lines
    10 cd $ISSM_DIR/src
     10cd $ISSM_TIER/src
    1111CPP_LOC=$(find . -name "*.cpp" -exec wc -l '{}' \; | awk '{ sum += $1 } END { print sum}');
    1212echo "C++    code: $CPP_LOC"
  • issm/trunk/scripts/quickinstall.sh

    r898 r6088  
    99
    1010#go to root
    11 cd $ISSM_DIR
     11cd $ISSM_TIER
    1212HERE=`pwd`;
    1313
    14 #check that ISSM_DIR is correctly set up
    15 if [ $HERE != $ISSM_DIR ]; then
     14#check that ISSM_TIER is correctly set up
     15if [ $HERE != $ISSM_TIER ]; then
    1616
    1717        cd ..
     
    2525       
    2626        #ISSM
    27         export ISSM_DIR=` pwd `
    28         source $ISSM_DIR/etc/environment.sh
     27        export ISSM_TIER=` pwd `
     28        source $ISSM_TIER/etc/environment.sh
    2929       
    3030        **********************************************************************************************************
     
    4242        cd ../triangle
    4343        sh install.sh
    44         cd $ISSM_DIR
     44        cd $ISSM_TIER
    4545
    4646        #2: install automake and autoconf
  • issm/trunk/scripts/report.sh

    r5591 r6088  
    4848
    4949#create some variables
    50 if [ $(ls -1 $ISSM_DIR/bin | wc -l) -le 20 ];
     50if [ $(ls -1 $ISSM_TIER/bin | wc -l) -le 20 ];
    5151then
    5252        IS_INSTALL=0
  • issm/trunk/scripts/run.sh

    r5077 r6088  
    66MATLAB_VERSION="7.6" #7.2,7.4,7.6 and 7.8
    77#create softlink to startup {{{1
    8 cd $ISSM_DIR/test/NightlyRun/
    9 ln -s $ISSM_DIR/startup.m .
     8cd $ISSM_TIER/test/NightlyRun/
     9ln -s $ISSM_TIER/startup.m .
    1010#}}}
    1111
     
    1414do
    1515        #Launch matlab and the daily run script
    16         cat > $ISSM_DIR/dailylog/matlab_run$i.m << EOF
     16        cat > $ISSM_TIER/dailylog/matlab_run$i.m << EOF
    1717        warning off %necessary to avoid a daily.log of several Go for parallel runs
    1818        try,
    19                 cd $ISSM_DIR/test/NightlyRun
     19                cd $ISSM_TIER/test/NightlyRun
    2020                startup;
    2121                $(if [ "$NROPTIONS" = ""  ]
     
    3030                directory=strsplit(pwd,'/');
    3131                message=getReport(me)
    32                 fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at');
     32                fid=fopen([ISSM_TIER '/dailylog/matlaberror.log'], 'at');
    3333                fprintf(fid,'\nMatlab error occured in: %s\n\n',directory{end});
    3434                fprintf(fid,'%s',message);
     
    3939
    4040        #Start run from dailylog directory
    41         cd $ISSM_DIR/dailylog/
     41        cd $ISSM_TIER/dailylog/
    4242
    4343        #Start test
  • issm/trunk/scripts/windowsbuild.sh

    r1427 r6088  
    1212today=`today_date`
    1313
    14 cd $ISSM_DIR/bin
     14cd $ISSM_TIER/bin
    1515
    1616#Filter out .svn files
  • issm/trunk/src/c/modules/MeshProfileIntersectionx/SegmentIntersect.cpp

    r5239 r6088  
    66int SegmentIntersect(double* palpha, double* pbeta, double* x1, double* y1, double* x2, double* y2){
    77
    8         /*See ISSM_DIR/src/m/utils/Geometry/SegIntersect.m for matlab routine from which we take this routine: */
     8        /*See ISSM_TIER/src/m/utils/Geometry/SegIntersect.m for matlab routine from which we take this routine: */
    99
    1010        /*output: */
  • issm/trunk/src/m/model/modeldefault/modeldefault_process.m

    r5088 r6088  
    77%retrieve some paths
    88global ISSM_DIR
    9 modeldatapath='/u/astrid-r1b/larour/ModelData';
     9modeldatapath=[ISSM_DIR '/projects/ModelData'];
    1010
    1111%initialize output
     
    2020
    2121%iceshelves
    22 iceshelves=[ISSM_DIR '/../models/Antarctica/Exp_Par/Iceshelves.exp'];
     22iceshelves=[ISSM_DIR '/projects/Exp/Antarctica.exp']);
    2323optionstruct.iceshelves=getfieldvalue(options,'iceshelves',iceshelves);
    2424disp(sprintf('   %-18s: %s','iceshelves',optionstruct.iceshelves));
    2525
    2626%islands
    27 islands=[ISSM_DIR '/../models/Antarctica/Exp_Par/Islands.exp'];
     27islands=[ISSM_DIR '/projects/Exp/Antarctica.exp'];
    2828optionstruct.islands=getfieldvalue(options,'islands',islands);
    2929disp(sprintf('   %-18s: %s','islands',optionstruct.islands));
  • issm/trunk/src/m/model/modis.m

    r3260 r6088  
    66%
    77
    8 global ISSM_DIR
     8global ISSM_TIER
    99
    1010%find gdal coordinates
     
    1616
    1717%Get path  to gdal binaries
    18 path_gdal=[ISSM_DIR '/externalpackages/gdal/install/bin/'];
     18path_gdal=[ISSM_TIER '/externalpackages/gdal/install/bin/'];
    1919
    2020%Was gdal compiled?
    2121if ~exist([path_gdal 'gdal_translate']),
    22         error(['modis error message: GDAL library needs to be compiled to use this routine. Compile GDAL in ' ISSM_DIR '/externalpackages/gdal to use this routine.']);
     22        error(['modis error message: GDAL library needs to be compiled to use this routine. Compile GDAL in ' ISSM_TIER '/externalpackages/gdal to use this routine.']);
    2323end
    2424
  • issm/trunk/src/m/model/multiplequeue/BuildMultipleQueueingScriptGeneric.m

    r5949 r6088  
    55%      BuildMultipleQueueingScriptGeneric(executionpath,codepath)
    66
    7 global ISSM_DIR
     7global ISSM_TIER
    88
    99
  • issm/trunk/src/m/model/plot/applyoptions.m

    r5867 r6088  
    279279        %box off
    280280        if strcmpi(md.hemisphere,'n') | strcmpi(md.hemisphere,'north'),
    281                 A=expread([ ISSM_DIR '/../models/Greenland/Exp_Par/DomainOutline.exp']);
     281                A=expread([ ISSM_DIR 'projects/Exp/Greenland.exp']);
    282282        elseif strcmpi(md.hemisphere,'s') | strcmpi(md.hemisphere,'south'),
    283                 A=expread([ ISSM_DIR '/../models/Antarctica/Exp_Par/DomainOutline.exp']);
     283                A=expread([ ISSM_DIR '/projects/Exp/Antarctica.exp']);
    284284        else
    285285                error('applyoptions error message: hemisphere not defined');
  • issm/trunk/src/m/model/plot/plotmodel.m

    r3338 r6088  
    22%At command prompt, type plotdoc for help on documentation.
    33
    4 global ISSM_DIR
    5 if isempty(ISSM_DIR),
    6         error('ISSM_DIR variable got erased! This variable is needed to run Ice code correctly. Please rerun your startup file.');
     4global ISSM_TIER
     5if isempty(ISSM_TIER),
     6        error('ISSM_TIER variable got erased! This variable is needed to run Ice code correctly. Please rerun your startup file.');
    77end
    88
  • issm/trunk/src/m/model/radarpower.m

    r2884 r6088  
    99%      md=radarpower(md,hemisphere,xlim,ylim,highres)
    1010
    11 global ISSM_DIR
     11global ISSM_TIER
    1212global MODELDATA
    1313
     
    2323
    2424%Get path  to gdal binaries
    25 path_gdal=[ISSM_DIR '/externalpackages/gdal/install/bin/'];
     25path_gdal=[ISSM_TIER '/externalpackages/gdal/install/bin/'];
    2626
    2727%Was gdal compiled?
    2828if ~exist([path_gdal 'gdal_translate']),
    29         error(['radarpower error message: GDAL library needs to be compiled to use this routine. Compile GDAL in ' ISSM_DIR '/externalpackages/gdal to use this routine.']);
     29        error(['radarpower error message: GDAL library needs to be compiled to use this routine. Compile GDAL in ' ISSM_TIER '/externalpackages/gdal to use this routine.']);
    3030end
    3131
  • issm/trunk/src/m/model/solve.m

    r5954 r6088  
    1515
    1616%some checks on list of arguments
    17 global ISSM_DIR
     17global ISSM_TIER
    1818
    1919%recover options
  • issm/trunk/src/m/qmu/postqmu.m

    r5243 r6088  
    44%Deal with dakota output results in files.
    55
    6 global ISSM_DIR;
     6global ISSM_TIER;
    77
    88%  check to see if dakota returned errors in the err file
  • issm/trunk/src/m/qmu/preqmu.m

    r5487 r6088  
    1818%       runmpi: (John?)
    1919
    20 global ISSM_DIR;
     20global ISSM_TIER;
    2121
    2222displaystring(md.verbose,'\n%s\n','preprocessing dakota inputs');
  • issm/trunk/src/m/utils/DataProcessing/TracksToMatrix.m

    r1177 r6088  
    2020%   See also: CREATEDATABOUNDARIES, CREATEDATAMATRIX
    2121
    22 global ISSM_DIR
     22global ISSM_TIER
    2323
    2424%some checks
     
    2828
    2929%Add path to dace
    30 addpath([ISSM_DIR '/externalpackages/dace/install'])
     30addpath([ISSM_TIER '/externalpackages/dace/install'])
    3131
    3232%First create the x_m and y_m fot the matrix
     
    8484
    8585%remove DACE path
    86 rmpath([ISSM_DIR '/externalpackages/dace/install']);
     86rmpath([ISSM_TIER '/externalpackages/dace/install']);
  • issm/trunk/src/m/utils/Mesh/BamgCall.m

    r2890 r6088  
    1515%      md=BamgCall(md,md.vel_obs,1500,10^8,1.3,0.9);
    1616
    17 global ISSM_DIR
     17global ISSM_TIER
    1818
    1919%2d geometric parameter (do not change)
  • issm/trunk/src/m/utils/Mesh/BamgCallFromMetric.m

    r2953 r6088  
    1111%      md=BamgCall(md,metric,1500,10^8,1.3,0.9);
    1212
    13 global ISSM_DIR
     13global ISSM_TIER
    1414
    1515%2d geometric parameter (do not change)
  • issm/trunk/src/m/utils/Mesh/YamsCall.m

    r2744 r6088  
    1515%      md=YamsCall(md,md.vel_obs,1500,10^8,1.3,0.9);
    1616
    17 global ISSM_DIR
     17global ISSM_TIER
    1818
    1919%2d geometric parameter (do not change)
  • issm/trunk/src/m/utils/OS/clearall.m

    r2270 r6088  
    1 %script that erases all variables except ISSM_DIR
     1%script that erases all variables except ISSM_TIER
    22
    33%get all localvariables
    44Lvariables=evalin('base','who');
    55
    6 %remove ISSM_DIR from this list
    7 Lvariables=Lvariables(find(~strcmp(Lvariables,'ISSM_DIR')));
     6%remove ISSM_TIER from this list
     7Lvariables=Lvariables(find(~strcmp(Lvariables,'ISSM_TIER')));
    88
    99%clear all
  • issm/trunk/src/m/utils/OS/issmscpin.m

    r3150 r6088  
    3232                %use the putty project pscp.exe: it should be in the path.
    3333               
    34                 %get ISSM_DIR variable
    35                 [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]');
     34                %get ISSM_TIER variable
     35                [status,ISSM_TIER]=system('echo [%ISSM_TIER_WIN%]');
    3636                if status,
    37                         error('scpin error message: could not find ISSM_DIR_WIN envirnoment variable');
     37                        error('scpin error message: could not find ISSM_TIER_WIN envirnoment variable');
    3838                end
    39                 ISSM_DIR=ISSM_DIR(2:end-2);
     39                ISSM_TIER=ISSM_TIER(2:end-2);
    4040
    4141                username=input('Username: (quoted string) ');
     
    4343
    4444                for i=1:numel(packages),
    45                         [status,result]=system([ISSM_DIR '/externalpackages/ssh/pscp.exe -l "' username '" -pw "' password '" ' host ':' path '/' packages{i} ' ./']);
     45                        [status,result]=system([ISSM_TIER '/externalpackages/ssh/pscp.exe -l "' username '" -pw "' password '" ' host ':' path '/' packages{i} ' ./']);
    4646                        if status,
    4747                                error('scpin error message: could not call putty pscp');
  • issm/trunk/src/m/utils/OS/issmscpout.m

    r3150 r6088  
    2323                %use the putty project pscp.exe: it should be in the path.
    2424               
    25                 %get ISSM_DIR variable
    26                 [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]');
     25                %get ISSM_TIER variable
     26                [status,ISSM_TIER]=system('echo [%ISSM_TIER_WIN%]');
    2727                if status,
    28                         error('scpout error message: could not find ISSM_DIR_WIN envirnoment variable');
     28                        error('scpout error message: could not find ISSM_TIER_WIN envirnoment variable');
    2929                end
    30                 ISSM_DIR=ISSM_DIR(2:end-2);
     30                ISSM_TIER=ISSM_TIER(2:end-2);
    3131
    3232                username=input('Username: (quoted string) ');
     
    3434
    3535                for i=1:numel(packages),
    36                         [status,result]=system([ISSM_DIR '/externalpackages/ssh/pscp.exe -l "' username '" -pw "' password '" ' packages{i} ' ' host ':' path]);
     36                        [status,result]=system([ISSM_TIER '/externalpackages/ssh/pscp.exe -l "' username '" -pw "' password '" ' packages{i} ' ' host ':' path]);
    3737                        if status,
    3838                                error('scpout error message: could not call putty pscp');
  • issm/trunk/src/m/utils/OS/issmssh.m

    r3150 r6088  
    1515                %use the putty project plink.exe: it should be in the path.
    1616               
    17                 %get ISSM_DIR variable
    18                 [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]');
     17                %get ISSM_TIER variable
     18                [status,ISSM_TIER]=system('echo [%ISSM_TIER_WIN%]');
    1919                if status,
    20                         error('issmssh error message: could not find ISSM_DIR_WIN envirnoment variable');
     20                        error('issmssh error message: could not find ISSM_TIER_WIN envirnoment variable');
    2121                end
    22                 ISSM_DIR=ISSM_DIR(2:end-2);
     22                ISSM_TIER=ISSM_TIER(2:end-2);
    2323
    2424                username=input('Username: (quoted string) ');
    2525                password=input('Password: (quoted string) ');
    2626
    27                 system([ISSM_DIR '/externalpackages/ssh/plink.exe -ssh -l "' username '" -pw "' password '" ' host ' "' command '"']);
     27                system([ISSM_TIER '/externalpackages/ssh/plink.exe -ssh -l "' username '" -pw "' password '" ' host ' "' command '"']);
    2828
    2929        else
  • issm/trunk/startup.m

    r6071 r6088  
    99%   Copyright Jet Propulsion Laboratory.
    1010
    11 global ISSM_DIR
     11global ISSM_TIER
    1212lastwarn(''); % clear the last warning to focus on the warnings of the ISSM path
    1313
    14 %Recover ISSM_DIR
     14%Recover ISSM_TIER
    1515if ispc,
    16         [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]');
     16        [status,ISSM_TIER]=system('echo [%ISSM_TIER_WIN%]');
    1717else
    18         [status,ISSM_DIR]=system('echo $ISSM_DIR');
     18        [status,ISSM_TIER]=system('echo $ISSM_TIER');
    1919end
    2020if status~=0,
    21         error('issmdir error message: problem when running ''echo $ISSM_DIR'' shell command');
     21        error('startup error message: problem when running ''echo $ISSM_TIER'' shell command');
    2222end
    23 if (length(ISSM_DIR)<=1),
    24         error('issmdir error message: ''ISSM_DIR'' environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!');
     23if (length(ISSM_TIER)<=1),
     24        error('issmdir error message: ''ISSM_TIER'' environment variable is empty! You should define ISSM_TIER in your .cshrc or .bashrc!');
    2525end
    2626%get rid of useless symbols in the name
     
    3030%Now add all issm code paths necessary to run issm smoothly.
    3131%We capture the error output, so that we can warn the user to update
    32 %the variable ISSM_DIR in this file, in case it is not correctly setup.
     32%the variable ISSM_TIER in this file, in case it is not correctly setup.
    3333
    3434%ISSM path
    35 addpath([ISSM_DIR '/src/m/utils/']); %loads genpath_ice
    36 addpath([ISSM_DIR '/etc']);
    37 addpath([ISSM_DIR '/doc']);
    38 addpath([ISSM_DIR '/bin']);
    39 addpath(genpath_ice([ISSM_DIR '/src/m']));
    40 addpath(genpath_ice([ISSM_DIR '/src/pro']));
    41 addpath(genpath_ice([ISSM_DIR '/externalpackages/subplotSpacing']));
    42 addpath(genpath_ice([ISSM_DIR '/externalpackages/scotch']));
     35addpath([ISSM_TIER '/src/m/utils/']); %loads genpath_ice
     36addpath([ISSM_TIER '/etc']);
     37addpath([ISSM_TIER '/doc']);
     38addpath([ISSM_TIER '/bin']);
     39addpath(genpath_ice([ISSM_TIER '/src/m']));
     40addpath(genpath_ice([ISSM_TIER '/src/pro']));
     41addpath(genpath_ice([ISSM_TIER '/externalpackages/subplotSpacing']));
     42addpath(genpath_ice([ISSM_TIER '/externalpackages/scotch']));
    4343
    4444%Check on any warning messages that might indicate that the paths were not correct.
    4545if ~isempty(lastwarn),
    46         fprintf('\n  Error trying to setup ''ISSM'' code paths. Try and update the ISSM_DIR variable in your .cshrc or .bashrc!\n');
     46        fprintf('\n  Error trying to setup ''ISSM'' code paths. Try and update the ISSM_TIER variable in your .cshrc or .bashrc!\n');
    4747        fprintf('  ''ISSM'' will not  work at all until this is resolved\n\n');
    4848else
     
    7575        error('startup error message: problem when running ''echo $USER'' shell command');
    7676end
    77 if exist([ISSM_DIR '/src/m/contrib/' USERNAME],'dir'),
    78         addpath([ISSM_DIR '/src/m/contrib/' USERNAME]);
     77if exist([ISSM_TIER '/src/m/contrib/' USERNAME],'dir'),
     78        addpath([ISSM_TIER '/src/m/contrib/' USERNAME]);
    7979end
  • issm/trunk/test/NightlyRun/runme.m

    r5501 r6088  
    3030%      md=runme('id',102,'procedure','model');
    3131
    32 %use ISSM_DIR generated by startup.m
    33 global ISSM_DIR
     32%use ISSM_TIER generated by startup.m
     33global ISSM_TIER
    3434
    3535%Check inputs
     
    162162                                        message=getReport(me2);
    163163                                        if strcmpi(output,'nightly')
    164                                                 fid=fopen([ISSM_DIR '/nightlylog/matlaberror.log'], 'at');
     164                                                fid=fopen([ISSM_TIER '/nightlylog/matlaberror.log'], 'at');
    165165                                                fprintf(fid,'%s',message);
    166166                                                fprintf(fid,'\n------------------------------------------------------------------\n');
     
    168168                                                disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,id_string,fieldname));
    169169                                        elseif strcmpi(output,'daily');
    170                                                 fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at');
     170                                                fid=fopen([ISSM_TIER '/dailylog/matlaberror.log'], 'at');
    171171                                                fprintf(fid,'%s',message);
    172172                                                fprintf(fid,'\n------------------------------------------------------------------\n');
     
    186186                message=getReport(me);
    187187                if strcmpi(output,'nightly')
    188                         fid=fopen([ISSM_DIR '/nightlylog/matlaberror.log'], 'at');
     188                        fid=fopen([ISSM_TIER '/nightlylog/matlaberror.log'], 'at');
    189189                        fprintf(fid,'%s',message);
    190190                        fprintf(fid,'\n------------------------------------------------------------------\n');
     
    192192                        disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,id_string,'N/A'));
    193193                elseif strcmpi(output,'daily');
    194                         fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at');
     194                        fid=fopen([ISSM_TIER '/dailylog/matlaberror.log'], 'at');
    195195                        fprintf(fid,'%s',message);
    196196                        fprintf(fid,'\n------------------------------------------------------------------\n');
  • issm/trunk/test/NightlyRun/test1101.m

    r5760 r6088  
    5050                set(gcf,'Color','w')
    5151                printmodel(['ismipapattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    52                 system(['mv ismipapattynvx' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']);
     52                system(['mv ismipapattynvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']);
    5353        end
    5454        plotmodel(md,'data',vy,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km')
     
    5656                set(gcf,'Color','w')
    5757                printmodel(['ismipapattynvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    58                 system(['mv ismipapattynvy' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']);
     58                system(['mv ismipapattynvy' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']);
    5959        end
    6060        plotmodel(md,'data',vz,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km')
     
    6262                set(gcf,'Color','w')
    6363                printmodel(['ismipapattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    64                 system(['mv ismipapattynvz' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']);
     64                system(['mv ismipapattynvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']);
    6565        end
    6666
     
    8787                set(gcf,'Color','w')
    8888                printmodel(['ismipapattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    89                 system(['mv ismipapattynvxsec' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']);
     89                system(['mv ismipapattynvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']);
    9090        end
    9191end
     
    9696        set(gcf,'Color','w')
    9797        printmodel('ismipapattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    98         system(['mv ismipapattynminvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']);
     98        system(['mv ismipapattynminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']);
    9999end
    100100plot([5 10 20 40 80 160],maxvx);ylim([0 120]);xlim([0 160])
     
    102102        set(gcf,'Color','w')
    103103        printmodel('ismipapattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    104         system(['mv ismipapattynmaxvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']);
     104        system(['mv ismipapattynmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']);
    105105end
    106106%Fields and tolerances to track changes
  • issm/trunk/test/NightlyRun/test1102.m

    r5606 r6088  
    6565                set(gcf,'Color','w')
    6666                printmodel(['ismipastokesvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    67                 system(['mv ismipastokesvx' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']);
     67                system(['mv ismipastokesvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']);
    6868        end
    6969        plotmodel(md,'data',vy,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',3)
     
    7171                set(gcf,'Color','w')
    7272                printmodel(['ismipastokesvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    73                 system(['mv ismipastokesvy' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']);
     73                system(['mv ismipastokesvy' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']);
    7474        end
    7575        plotmodel(md,'data',vz,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',4)
     
    7777                set(gcf,'Color','w')
    7878                printmodel(['ismipastokesvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    79                 system(['mv ismipastokesvz' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']);
     79                system(['mv ismipastokesvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']);
    8080        end
    8181
     
    102102                set(gcf,'Color','w')
    103103                printmodel(['ismipastokesvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    104                 system(['mv ismipastokesvxsec' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']);
     104                system(['mv ismipastokesvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']);
    105105        end
    106106end
     
    111111        set(gcf,'Color','w')
    112112        printmodel('ismipastokesminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    113         system(['mv ismipastokesminvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']);
     113        system(['mv ismipastokesminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']);
    114114end
    115115plot([5 10 20 40 80 160],maxvx);ylim([0 120])
     
    117117        set(gcf,'Color','w')
    118118        printmodel('ismipastokesmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    119         system(['mv ismipastokesmaxvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']);
     119        system(['mv ismipastokesmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']);
    120120end
    121121%Fields and tolerances to track changes
  • issm/trunk/test/NightlyRun/test1103.m

    r5760 r6088  
    4848                set(gcf,'Color','w')
    4949                printmodel(['ismipbpattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    50                 system(['mv ismipbpattynvx' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestB ']);
     50                system(['mv ismipbpattynvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB ']);
    5151        end
    5252        plotmodel(md,'data',vz,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km')
     
    5454                set(gcf,'Color','w')
    5555                printmodel(['ismipbpattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    56                 system(['mv ismipbpattynvz' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestB ']);
     56                system(['mv ismipbpattynvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB ']);
    5757        end
    5858
     
    7979                set(gcf,'Color','w')
    8080                printmodel(['ismipbpattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    81                 system(['mv ismipbpattynvxsec' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestB ']);
     81                system(['mv ismipbpattynvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB ']);
    8282        end
    8383end
     
    8888        set(gcf,'Color','w')
    8989        printmodel('ismipbpattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    90         system(['mv ismipbpattynminvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestB ']);
     90        system(['mv ismipbpattynminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB ']);
    9191end
    9292plot([5 10 20 40 80 160],maxvx);ylim([0 120]);xlim([0 160])
     
    9494        set(gcf,'Color','w')
    9595        printmodel('ismipbpattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    96         system(['mv ismipbpattynmaxvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestB ']);
     96        system(['mv ismipbpattynmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB ']);
    9797end
    9898%Fields and tolerances to track changes
  • issm/trunk/test/NightlyRun/test1105.m

    r5606 r6088  
    7474                set(gcf,'Color','w')
    7575                printmodel(['ismipcpattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    76                 system(['mv ismipcpattynvx' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestC ']);
     76                system(['mv ismipcpattynvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC ']);
    7777        end
    7878        plotmodel(md,'data',vy,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',3)
     
    8080                set(gcf,'Color','w')
    8181                printmodel(['ismipcpattynvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    82                 system(['mv ismipcpattynvy' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestC ']);
     82                system(['mv ismipcpattynvy' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC ']);
    8383        end
    8484        plotmodel(md,'data',vz,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',4)
     
    8686                set(gcf,'Color','w')
    8787                printmodel(['ismipcpattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    88                 system(['mv ismipcpattynvz' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestC ']);
     88                system(['mv ismipcpattynvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC ']);
    8989        end
    9090
     
    111111                set(gcf,'Color','w')
    112112                printmodel(['ismipcpattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    113                 system(['mv ismipcpattynvxsec' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestC ']);
     113                system(['mv ismipcpattynvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC ']);
    114114        end
    115115end
     
    120120        set(gcf,'Color','w')
    121121        printmodel('ismipcpattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    122         system(['mv ismipcpattynminvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestC ']);
     122        system(['mv ismipcpattynminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC ']);
    123123end
    124124plot([5 10 20 40 80 160],maxvx);ylim([0 200]); xlim([0 160])
     
    126126        set(gcf,'Color','w')
    127127        printmodel('ismipcpattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    128         system(['mv ismipcpattynmaxvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestC ']);
     128        system(['mv ismipcpattynmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC ']);
    129129end
    130130%Fields and tolerances to track changes
  • issm/trunk/test/NightlyRun/test1107.m

    r5606 r6088  
    7070                set(gcf,'Color','w')
    7171                printmodel(['ismipdpattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    72                 system(['mv ismipdpattynvx' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestD ']);
     72                system(['mv ismipdpattynvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD ']);
    7373        end
    7474        plotmodel(md,'data',vz,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',3)
     
    7676                set(gcf,'Color','w')
    7777                printmodel(['ismipdpattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    78                 system(['mv ismipdpattynvz' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestD ']);
     78                system(['mv ismipdpattynvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD ']);
    7979        end
    8080
     
    101101                set(gcf,'Color','w')
    102102                printmodel(['ismipdpattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    103                 system(['mv ismipdpattynvxsec' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestD ']);
     103                system(['mv ismipdpattynvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD ']);
    104104        end
    105105end
     
    110110        set(gcf,'Color','w')
    111111        printmodel('ismipdpattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    112         system(['mv ismipdpattynminvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestD ']);
     112        system(['mv ismipdpattynminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD ']);
    113113end
    114114plot([5 10 20 40 80 160],maxvx);ylim([0 300]);xlim([0 160])
     
    116116        set(gcf,'Color','w')
    117117        printmodel('ismipdpattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    118         system(['mv ismipdpattynmaxvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestD ']);
     118        system(['mv ismipdpattynmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD ']);
    119119end
    120120%Fields and tolerances to track changes
  • issm/trunk/test/NightlyRun/test1109.m

    r5606 r6088  
    5353                set(gcf,'Color','w')
    5454                printmodel('ismipepattynvxfrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    55                 system(['mv ismipepattynvxfrozen.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestE ']);
     55                system(['mv ismipepattynvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE ']);
    5656        elseif i==2,
    5757                plotmodel(md,'data',vy,'ylim',[-10 80],'layer',md.numlayers,'sectionvalue','../Exp/ISMIPE.exp','resolution',[10 10],'title','','xlabel','')
    5858                set(gcf,'Color','w')
    5959                printmodel('ismipestokesvxfrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    60                 system(['mv ismipestokesvxfrozen.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestE ']);
     60                system(['mv ismipestokesvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE ']);
    6161        elseif i==3,
    6262                plotmodel(md,'data',vy,'ylim',[-50 200],'layer',md.numlayers,'sectionvalue','../Exp/ISMIPE.exp','resolution',[10 10],'title','','xlabel','')
    6363                set(gcf,'Color','w')
    6464                printmodel('ismipepattynvxsliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    65                 system(['mv ismipepattynvxsliding.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestE ']);
     65                system(['mv ismipepattynvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE ']);
    6666        elseif i==4,
    6767                plotmodel(md,'data',vy,'ylim',[-50 200],'layer',md.numlayers,'sectionvalue','../Exp/ISMIPE.exp','resolution',[10 10],'title','','xlabel','')
    6868                set(gcf,'Color','w')
    6969                printmodel('ismipestokesvxsliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off');
    70                 system(['mv ismipestokesvxsliding.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestE ']);
     70                system(['mv ismipestokesvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE ']);
    7171        end
    7272end
  • issm/trunk/test/NightlyRun/test120.m

    r5964 r6088  
    44md=setelementstype(md,'macayeal','all');
    55md=SetParallel(md,3);
     6md.verbose=0;
     7
     8md.petscoptions=addoptions(md.petscoptions,DiagnosticHorizAnalysisEnum,asmoptions);
     9md.petscoptions=addoptions(md.petscoptions,PrognosticAnalysisEnum,mumpsoptions);
     10
     11
    612md=solve(md,'analysis_type',Transient2DSolutionEnum);
    713
  • issm/trunk/test/NightlyRun/test1201.m

    r5606 r6088  
    6161        set(gcf,'Color','w')
    6262        printmodel('eismintmasscthickness','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off');
    63         system(['mv eismintmasscthickness.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/EISMINT ']);
     63        system(['mv eismintmasscthickness.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT ']);
    6464end
    6565
  • issm/trunk/test/NightlyRun/test1202.m

    r5606 r6088  
    2828        set(gcf,'Color','w')
    2929        printmodel('eismintdiag1vy','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off');
    30         system(['mv eismintdiag1vy.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/EISMINT ']);
     30        system(['mv eismintdiag1vy.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT ']);
    3131end
    3232
  • issm/trunk/test/NightlyRun/test1203.m

    r5606 r6088  
    3131        set(gcf,'Color','w')
    3232        printmodel('eismintdiag2vy','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off');
    33         system(['mv eismintdiag2vy.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/EISMINT ']);
     33        system(['mv eismintdiag2vy.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT ']);
    3434end
    3535
  • issm/trunk/test/NightlyRun/test1205.m

    r5765 r6088  
    8282        set(gcf,'Color','w')
    8383        printmodel('hutterstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off');
    84         system(['mv hutterstatic.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/EISMINT/IceSheet']);
     84        system(['mv hutterstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']);
    8585end
    8686
  • issm/trunk/test/NightlyRun/test1206.m

    r5765 r6088  
    8181        set(gcf,'Color','w')
    8282        printmodel('pattynstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off');
    83         system(['mv pattynstatic.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/EISMINT/IceSheet']);
     83        system(['mv pattynstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']);
    8484end
    8585
  • issm/trunk/test/NightlyRun/test1207.m

    r5765 r6088  
    8181        set(gcf,'Color','w')
    8282        printmodel('stokesstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off');
    83         system(['mv stokesstatic.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/EISMINT/IceSheet']);
     83        system(['mv stokesstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']);
    8484end
    8585
  • issm/trunk/test/NightlyRun/test1301.m

    r5606 r6088  
    3838        set(gcf,'Color','w')
    3939        printmodel('thermalmelting','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off');
    40         system(['mv thermalmelting.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Thermal ']);
     40        system(['mv thermalmelting.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Thermal ']);
    4141end
    4242
  • issm/trunk/test/NightlyRun/test1302.m

    r5606 r6088  
    4040        set(gcf,'Color','w')
    4141        printmodel('thermaladvection','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off');
    42         system(['mv thermaladvection.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/EISMINT ']);
     42        system(['mv thermaladvection.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT ']);
    4343end
    4444
  • issm/trunk/test/NightlyRun/test1303.m

    r5606 r6088  
    3535        set(gcf,'Color','w')
    3636        printmodel('thermalconduction','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off');
    37         system(['mv thermalconduction.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Thermal ']);
     37        system(['mv thermalconduction.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Thermal ']);
    3838end
    3939
  • issm/trunk/test/NightlyRun/test1304.m

    r5606 r6088  
    3636        set(gcf,'Color','w')
    3737        printmodel('thermalgeothermalflux','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off');
    38         system(['mv thermalgeothermalflux.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Thermal ']);
     38        system(['mv thermalgeothermalflux.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Thermal ']);
    3939end
    4040
  • issm/trunk/test/NightlyRun/test1401.m

    r5496 r6088  
    1616        set(gcf,'Color','w')
    1717        printmodel('mesh1_yams1','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off');
    18         system(['mv mesh1_yams1.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']);
     18        system(['mv mesh1_yams1.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']);
    1919end
    2020
     
    2525        set(gcf,'Color','w')
    2626        printmodel('mesh1_yams2','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off');
    27         system(['mv mesh1_yams2.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']);
     27        system(['mv mesh1_yams2.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']);
    2828end
    2929
     
    3434        set(gcf,'Color','w')
    3535        printmodel('mesh1_yams3','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off');
    36         system(['mv mesh1_yams3.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']);
     36        system(['mv mesh1_yams3.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']);
    3737end
    3838x1=md.x;
     
    4646        set(gcf,'Color','w')
    4747        printmodel('mesh1_bamg1','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off');
    48         system(['mv mesh1_bamg1.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']);
     48        system(['mv mesh1_bamg1.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']);
    4949end
    5050
     
    5656        set(gcf,'Color','w')
    5757        printmodel('mesh1_bamg2','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off');
    58         system(['mv mesh1_bamg2.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']);
     58        system(['mv mesh1_bamg2.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']);
    5959end
    6060
     
    6666        set(gcf,'Color','w')
    6767        printmodel('mesh1_bamg3','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off');
    68         system(['mv mesh1_bamg3.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']);
     68        system(['mv mesh1_bamg3.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']);
    6969end
    7070x2=md.x;
  • issm/trunk/test/NightlyRun/test1402.m

    r5496 r6088  
    1818        set(gcf,'Color','w')
    1919        printmodel('mesh2_yams1','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off');
    20         system(['mv mesh2_yams1.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']);
     20        system(['mv mesh2_yams1.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']);
    2121end
    2222
     
    3030        set(gcf,'Color','w')
    3131        printmodel('mesh2_yams2','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off');
    32         system(['mv mesh2_yams2.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']);
     32        system(['mv mesh2_yams2.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']);
    3333end
    3434
     
    4242        set(gcf,'Color','w')
    4343        printmodel('mesh2_yams3','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off');
    44         system(['mv mesh2_yams3.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']);
     44        system(['mv mesh2_yams3.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']);
    4545end
    4646x1=md.x;
     
    5757        set(gcf,'Color','w')
    5858        printmodel('mesh2_bamg1','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off');
    59         system(['mv mesh2_bamg1.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']);
     59        system(['mv mesh2_bamg1.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']);
    6060end
    6161
     
    7070        set(gcf,'Color','w')
    7171        printmodel('mesh2_bamg2','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off');
    72         system(['mv mesh2_bamg2.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']);
     72        system(['mv mesh2_bamg2.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']);
    7373end
    7474
     
    8383        set(gcf,'Color','w')
    8484        printmodel('mesh2_bamg3','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off');
    85         system(['mv mesh2_bamg3.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']);
     85        system(['mv mesh2_bamg3.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']);
    8686end
    8787
     
    9696        set(gcf,'Color','w')
    9797        printmodel('mesh2_bamgiso','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off');
    98         system(['mv mesh2_bamgiso.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']);
     98        system(['mv mesh2_bamgiso.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']);
    9999end
    100100x2=md.x;
  • issm/trunk/test/NightlyRun/test218.m

    r5964 r6088  
    55md=setelementstype(md,'macayeal','all');
    66md=SetParallel(md,3);
     7
    78md=solve(md,'analysis_type',Transient3DSolutionEnum);
    89
Note: See TracChangeset for help on using the changeset viewer.