Index: /issm/trunk/configs/altix64/altix64.sh.petsc2 =================================================================== --- /issm/trunk/configs/altix64/altix64.sh.petsc2 (revision 6087) +++ /issm/trunk/configs/altix64/altix64.sh.petsc2 (revision 6088) @@ -1,3 +1,3 @@ #!/bin/csh -./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 +./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 Index: /issm/trunk/configs/altix64/altix64.sh.petsc3 =================================================================== --- /issm/trunk/configs/altix64/altix64.sh.petsc3 (revision 6087) +++ /issm/trunk/configs/altix64/altix64.sh.petsc3 (revision 6088) @@ -1,3 +1,3 @@ #!/bin/csh -./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 +./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 Index: /issm/trunk/configs/linux32-cosmos/linux32.sh.petsc2 =================================================================== --- /issm/trunk/configs/linux32-cosmos/linux32.sh.petsc2 (revision 6087) +++ /issm/trunk/configs/linux32-cosmos/linux32.sh.petsc2 (revision 6088) @@ -1,3 +1,3 @@ #!/bin/csh -./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 +./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 Index: /issm/trunk/configs/linux32-cosmos/linux32.sh.petsc3 =================================================================== --- /issm/trunk/configs/linux32-cosmos/linux32.sh.petsc3 (revision 6087) +++ /issm/trunk/configs/linux32-cosmos/linux32.sh.petsc3 (revision 6088) @@ -1,3 +1,3 @@ #!/bin/csh -./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 +./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 Index: /issm/trunk/configs/linux64/linux64.sh.petsc2 =================================================================== --- /issm/trunk/configs/linux64/linux64.sh.petsc2 (revision 6087) +++ /issm/trunk/configs/linux64/linux64.sh.petsc2 (revision 6088) @@ -1,3 +1,3 @@ #!/bin/sh -./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 +./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 Index: /issm/trunk/configs/linux64/linux64.sh.petsc3 =================================================================== --- /issm/trunk/configs/linux64/linux64.sh.petsc3 (revision 6087) +++ /issm/trunk/configs/linux64/linux64.sh.petsc3 (revision 6088) @@ -1,3 +1,3 @@ #!/bin/sh -./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 +./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 Index: /issm/trunk/configs/macosx32/macosx32.sh.petsc2 =================================================================== --- /issm/trunk/configs/macosx32/macosx32.sh.petsc2 (revision 6087) +++ /issm/trunk/configs/macosx32/macosx32.sh.petsc2 (revision 6088) @@ -1,3 +1,3 @@ #!/bin/sh -./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 +./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 Index: /issm/trunk/configs/macosx32/macosx32.sh.petsc3 =================================================================== --- /issm/trunk/configs/macosx32/macosx32.sh.petsc3 (revision 6087) +++ /issm/trunk/configs/macosx32/macosx32.sh.petsc3 (revision 6088) @@ -1,3 +1,3 @@ #!/bin/sh -./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 +./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 Index: /issm/trunk/configs/macosx64/macosx64.sh.petsc2 =================================================================== --- /issm/trunk/configs/macosx64/macosx64.sh.petsc2 (revision 6087) +++ /issm/trunk/configs/macosx64/macosx64.sh.petsc2 (revision 6088) @@ -1,3 +1,3 @@ #!/bin/sh -./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 +./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 Index: /issm/trunk/configs/macosx64/macosx64.sh.petsc3 =================================================================== --- /issm/trunk/configs/macosx64/macosx64.sh.petsc3 (revision 6087) +++ /issm/trunk/configs/macosx64/macosx64.sh.petsc3 (revision 6088) @@ -1,3 +1,3 @@ #!/bin/sh -./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 +./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 Index: /issm/trunk/configs/pleiades/pleiades.sh.petsc2 =================================================================== --- /issm/trunk/configs/pleiades/pleiades.sh.petsc2 (revision 6087) +++ /issm/trunk/configs/pleiades/pleiades.sh.petsc2 (revision 6088) @@ -1,3 +1,3 @@ #!/bin/csh -./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 +./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 Index: /issm/trunk/configs/pleiades/pleiades.sh.petsc3 =================================================================== --- /issm/trunk/configs/pleiades/pleiades.sh.petsc3 (revision 6087) +++ /issm/trunk/configs/pleiades/pleiades.sh.petsc3 (revision 6088) @@ -1,3 +1,3 @@ #!/bin/csh -./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 +./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 Index: /issm/trunk/configs/winxp32/winxp32.sh.petsc2 =================================================================== --- /issm/trunk/configs/winxp32/winxp32.sh.petsc2 (revision 6087) +++ /issm/trunk/configs/winxp32/winxp32.sh.petsc2 (revision 6088) @@ -4,3 +4,3 @@ #get configure.sh to pick up the intel compiler -./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 +./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 Index: /issm/trunk/configs/winxp32/winxp32.sh.petsc3 =================================================================== --- /issm/trunk/configs/winxp32/winxp32.sh.petsc3 (revision 6087) +++ /issm/trunk/configs/winxp32/winxp32.sh.petsc3 (revision 6088) @@ -4,3 +4,3 @@ #get configure.sh to pick up the intel compiler -./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 +./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 Index: /issm/trunk/cron/README =================================================================== --- /issm/trunk/cron/README (revision 6087) +++ /issm/trunk/cron/README (revision 6088) @@ -7,5 +7,5 @@ For example, if you add: -5 5 * * * cd $ISSM_DIR/cron && ./nightlyrun.sh +5 5 * * * cd $ISSM_TIER/cron && ./nightlyrun.sh This will run all the scripts in the Cron directory, every day, at 5:05 am. Index: /issm/trunk/cron/configs/linux64_larour =================================================================== --- /issm/trunk/cron/configs/linux64_larour (revision 6087) +++ /issm/trunk/cron/configs/linux64_larour (revision 6088) @@ -7,6 +7,6 @@ #ISSM main directory (full pathto ISSM trunk) -ISSM_DIR="/u/astrid-r1b/larour/issm/trunk/cron/trunk" -#ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2" +ISSM_TIER="/u/astrid-r1b/larour/issm/trunk/cron/trunk" +#ISSM_TIER="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2" #ISSM Architecture @@ -70,5 +70,5 @@ #Mail delivery. If SKIPMAIL="no", the html nightly run report will be -#sent to the adresses present in $ISSM_DIR/cron/mailinglist. +#sent to the adresses present in $ISSM_TIER/cron/mailinglist. SKIPMAIL="no" Index: /issm/trunk/cron/configs/linux64_morlighem_daily =================================================================== --- /issm/trunk/cron/configs/linux64_morlighem_daily (revision 6087) +++ /issm/trunk/cron/configs/linux64_morlighem_daily (revision 6088) @@ -7,6 +7,6 @@ #ISSM main directory (full pathto ISSM trunk) -ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/trunk" -#ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2" +ISSM_TIER="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/trunk" +#ISSM_TIER="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2" #ISSM Architecture @@ -70,5 +70,5 @@ #Mail delivery. If SKIPMAIL="no", the html nightly run report will be -#sent to the adresses present in $ISSM_DIR/cron/mailinglist. +#sent to the adresses present in $ISSM_TIER/cron/mailinglist. SKIPMAIL="no" Index: /issm/trunk/cron/configs/linux64_morlighem_nightly =================================================================== --- /issm/trunk/cron/configs/linux64_morlighem_nightly (revision 6087) +++ /issm/trunk/cron/configs/linux64_morlighem_nightly (revision 6088) @@ -7,6 +7,6 @@ #ISSM main directory (full pathto ISSM trunk) -ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/trunk" -#ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2" +ISSM_TIER="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/trunk" +#ISSM_TIER="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2" #ISSM Architecture @@ -70,5 +70,5 @@ #Mail delivery. If SKIPMAIL="no", the html nightly run report will be -#sent to the adresses present in $ISSM_DIR/cron/mailinglist. +#sent to the adresses present in $ISSM_TIER/cron/mailinglist. SKIPMAIL="no" Index: /issm/trunk/cron/configs/linux64_morlighem_validation =================================================================== --- /issm/trunk/cron/configs/linux64_morlighem_validation (revision 6087) +++ /issm/trunk/cron/configs/linux64_morlighem_validation (revision 6088) @@ -6,6 +6,6 @@ #ISSM main directory (full pathto ISSM trunk) -ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/trunk" -#ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2" +ISSM_TIER="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/trunk" +#ISSM_TIER="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2" #ISSM Architecture @@ -69,5 +69,5 @@ #Mail delivery. If SKIPMAIL="no", the html nightly run report will be -#sent to the adresses present in $ISSM_DIR/cron/mailinglist. +#sent to the adresses present in $ISSM_TIER/cron/mailinglist. SKIPMAIL="no" Index: /issm/trunk/cron/configs/linux64_seroussi =================================================================== --- /issm/trunk/cron/configs/linux64_seroussi (revision 6087) +++ /issm/trunk/cron/configs/linux64_seroussi (revision 6088) @@ -7,5 +7,5 @@ #ISSM main directory (full pathto ISSM trunk) -ISSM_DIR="/u/wilkes-r1b/seroussi/svn/issm/trunk/cron/trunk" +ISSM_TIER="/u/wilkes-r1b/seroussi/svn/issm/trunk/cron/trunk" #ISSM Architecture @@ -69,5 +69,5 @@ #Mail delivery. If SKIPMAIL="no", the html nightly run report will be -#sent to the adresses present in $ISSM_DIR/cron/mailinglist. +#sent to the adresses present in $ISSM_TIER/cron/mailinglist. SKIPMAIL="no" Index: /issm/trunk/cron/configs/macosx32_seroussi =================================================================== --- /issm/trunk/cron/configs/macosx32_seroussi (revision 6087) +++ /issm/trunk/cron/configs/macosx32_seroussi (revision 6088) @@ -7,5 +7,5 @@ #ISSM main directory (full pathto ISSM trunk) -ISSM_DIR="/Users/seroussi/Desktop/backup/svn/issm/trunk/cron/trunk" +ISSM_TIER="/Users/seroussi/Desktop/backup/svn/issm/trunk/cron/trunk" #ISSM Architecture @@ -69,5 +69,5 @@ #Mail delivery. If SKIPMAIL="no", the html nightly run report will be -#sent to the adresses present in $ISSM_DIR/cron/mailinglist. +#sent to the adresses present in $ISSM_TIER/cron/mailinglist. SKIPMAIL="no" Index: /issm/trunk/cron/configs/winxp32_larour =================================================================== --- /issm/trunk/cron/configs/winxp32_larour (revision 6087) +++ /issm/trunk/cron/configs/winxp32_larour (revision 6088) @@ -7,5 +7,5 @@ #ISSM main directory (full pathto ISSM trunk) -ISSM_DIR="C:/home/issm/trunk/cron/trunk" +ISSM_TIER="C:/home/issm/trunk/cron/trunk" #ISSM Architecture @@ -69,5 +69,5 @@ #Mail delivery. If SKIPMAIL="no", the html nightly run report will be -#sent to the adresses present in $ISSM_DIR/cron/mailinglist. +#sent to the adresses present in $ISSM_TIER/cron/mailinglist. SKIPMAIL="no" Index: /issm/trunk/cron/nightlyrun.sh =================================================================== --- /issm/trunk/cron/nightlyrun.sh (revision 6087) +++ /issm/trunk/cron/nightlyrun.sh (revision 6088) @@ -54,5 +54,5 @@ #}}} #Export ISSM_* variables{{{1 -export ISSM_DIR +export ISSM_TIER export ISSM_ARCH #}}} @@ -79,5 +79,5 @@ #only update ISSM - cd $ISSM_DIR + cd $ISSM_TIER svn update @@ -98,13 +98,13 @@ #Create cluster's settings{{{1 #create simpler cluster.rc file, with only the cluster we are interested in. -cd $ISSM_DIR/test/NightlyRun/ +cd $ISSM_TIER/test/NightlyRun/ cat << END > SetParallel.m function md=SetParallel(md,numcpus); -eval(['md.cluster=' oshostname() '(''np'',numcpus,''login'',''$USER'',''codepath'',''$ISSM_DIR/bin'',''executionpath'',''$EXECUTION_PATH'');']); +eval(['md.cluster=' oshostname() '(''np'',numcpus,''login'',''$USER'',''codepath'',''$ISSM_TIER/bin'',''executionpath'',''$EXECUTION_PATH'');']); END #}}} #Source environment variables with new matlab path {{{1 -cd $ISSM_DIR/etc +cd $ISSM_TIER/etc source environment.sh MATLAB_DIR=$MATLAB_PATH #}}} @@ -112,5 +112,5 @@ if [ "$ISSM_EXTERNALPACKAGES" == "install" ] then - cd $ISSM_DIR/externalpackages + cd $ISSM_TIER/externalpackages for ep in $EXTERNALPACKAGES do @@ -131,5 +131,5 @@ #3: install automake and autoconf - cd $ISSM_DIR/devpackages + cd $ISSM_TIER/devpackages make cd .. @@ -139,5 +139,5 @@ #erase externapackages, and link with externalpackages_dir - cd $ISSM_DIR + cd $ISSM_TIER rm -rf externalpackages cp -Rf $EXTERNALPACKAGESDIR ./ @@ -164,5 +164,5 @@ then - cd $ISSM_DIR + cd $ISSM_TIER make distclean sh scripts/automakererun.sh @@ -173,9 +173,9 @@ if [ "$OS" = "winxp32" ] then - cd $ISSM_DIR/src/c + cd $ISSM_TIER/src/c ./intel-compile.sh - cd $ISSM_DIR/src/mex + cd $ISSM_TIER/src/mex make install - cd $ISSM_DIR + cd $ISSM_TIER else make -j $NUMCPUS_INSTALL @@ -200,15 +200,15 @@ #Prepare run #Windows hack for startup.m {{{1 -#windows environments: ISSM_DIR_WIN variable not correctly picked up when using -#the cron job. just get startup to take the ISSM_DIR variable as the pwd: +#windows environments: ISSM_TIER_WIN variable not correctly picked up when using +#the cron job. just get startup to take the ISSM_TIER variable as the pwd: if [ "$OS" = "winxp32" ] then - cat startup.m | sed 's/clear status/clear status; ISSM_DIR=pwd;/g' > startup.m.bak + cat startup.m | sed 's/clear status/clear status; ISSM_TIER=pwd;/g' > startup.m.bak mv startup.m.bak startup.m fi #}}} #create softlink to startup {{{1 -cd $ISSM_DIR/test/NightlyRun/ -ln -s $ISSM_DIR/startup.m . +cd $ISSM_TIER/test/NightlyRun/ +ln -s $ISSM_TIER/startup.m . #}}} #Create nightlylog directory and info.log {{{1 @@ -216,7 +216,7 @@ INSTALL_TIME=$(timer) ELAPSED_INSTALL=$(timer $START_TIME) -rm -rf $ISSM_DIR/nightlylog -mkdir $ISSM_DIR/nightlylog -cat << END > $ISSM_DIR/nightlylog/info.log +rm -rf $ISSM_TIER/nightlylog +mkdir $ISSM_TIER/nightlylog +cat << END > $ISSM_TIER/nightlylog/info.log today: $(echo $TODAY) user: $(echo $USER) @@ -241,8 +241,8 @@ do #Launch matlab and the nightly run script - cat > $ISSM_DIR/nightlylog/matlab_run$i.m << EOF + cat > $ISSM_TIER/nightlylog/matlab_run$i.m << EOF warning off %necessary to avoid a info.log of several Go for parallel runs try, - cd $ISSM_DIR/test/NightlyRun + cd $ISSM_TIER/test/NightlyRun startup; $(if [ "$NROPTIONS" = "" ] @@ -257,5 +257,5 @@ directory=strsplit(pwd,'/'); message=getReport(me) - fid=fopen([ISSM_DIR '/nightlylog/matlaberror.log'], 'at'); + fid=fopen([ISSM_TIER '/nightlylog/matlaberror.log'], 'at'); fprintf(fid,'\nMatlab error occured in: %s\n\n',directory{end}); fprintf(fid,'%s',message); @@ -267,5 +267,5 @@ #Start run from nightlylog directory - cd $ISSM_DIR/nightlylog/ + cd $ISSM_TIER/nightlylog/ #Start test @@ -278,5 +278,5 @@ #}}} #concatenate all reports {{{1 -cd $ISSM_DIR/nightlylog/ +cd $ISSM_TIER/nightlylog/ mv matlab_log1.log matlab_log.log for (( i=2;i<=$NUMCPUS_RUN;i++ )) @@ -295,5 +295,5 @@ ELAPSED_RUN=$(timer $INSTALL_TIME) ELAPSED_TOTAL=$(timer $START_TIME) -cat << END >> $ISSM_DIR/nightlylog/info.log +cat << END >> $ISSM_TIER/nightlylog/info.log elapsed_run: $(echo $ELAPSED_RUN) elapsed_total: $(echo $ELAPSED_TOTAL) @@ -304,7 +304,7 @@ #Send Report #Build html report {{{1 -cd $ISSM_DIR/nightlylog/ +cd $ISSM_TIER/nightlylog/ sh ../scripts/report.sh -echo "html report located in $ISSM_DIR/nightlylog/report.html" +echo "html report located in $ISSM_TIER/nightlylog/report.html" #}}} #send mail if requested (SKIPMAIL) {{{1 @@ -312,14 +312,14 @@ then echo "sending report..." - source $ISSM_DIR/cron/mailinglist + source $ISSM_TIER/cron/mailinglist for i in `echo $MAILINGLIST`; do if [ "$OS" = "winxp32" ] then - 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 + 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 else if [ "$OS" = "linux64" ] then -cat - $ISSM_DIR/nightlylog/report.html < To: $i @@ -329,5 +329,5 @@ HERE else -cat - $ISSM_DIR/nightlylog/report.html < To: $i Index: /issm/trunk/devpackages/autoconf/install.sh =================================================================== --- /issm/trunk/devpackages/autoconf/install.sh (revision 6087) +++ /issm/trunk/devpackages/autoconf/install.sh (revision 6088) @@ -19,5 +19,5 @@ #Compile autoconf cd src -./configure --prefix="$ISSM_DIR/devpackages/autoconf/install" +./configure --prefix="$ISSM_TIER/devpackages/autoconf/install" make make install Index: /issm/trunk/devpackages/automake/install.sh =================================================================== --- /issm/trunk/devpackages/automake/install.sh (revision 6087) +++ /issm/trunk/devpackages/automake/install.sh (revision 6088) @@ -19,5 +19,5 @@ #Compile automake cd src -./configure --prefix="$ISSM_DIR/devpackages/automake/install" +./configure --prefix="$ISSM_TIER/devpackages/automake/install" make make install Index: /issm/trunk/doc/issmdoc.m =================================================================== --- /issm/trunk/doc/issmdoc.m (revision 6087) +++ /issm/trunk/doc/issmdoc.m (revision 6088) @@ -1,8 +1,8 @@ %Quick documentation for ISSM -%First get ISSM dir: -ISSM_DIR=issmdir; +%First get ISSM tier: +ISSM_TIER=issmtier; -disp(sprintf('\n%s%s%s',' The following documentations are available in ',ISSM_DIR,'/doc/')); +disp(sprintf('\n%s%s%s',' The following documentations are available in ',ISSM_TIER,'/doc/')); disp(sprintf('%s',' userguide: how to use ISSM, quick tutorial')); disp(sprintf('%s',' theoryguide: theory behind the ISSM models')); @@ -10,5 +10,5 @@ disp(sprintf('\n%s',' Website: a comprehensive documentation is available on http://www.issm.jpl.nasa.gov')); disp(sprintf('\n%s',' Example: how to create a square ice shelf')); -disp(sprintf('%s',' go to ',ISSM_DIR,'/examples/SquareIceshelf')); +disp(sprintf('%s',' go to ',ISSM_TIER,'/examples/SquareIceshelf')); disp(sprintf('%s',' md=model; %creates a new empty model structure')); disp(sprintf('%s',' md=mesh(md,''DomainOutline.exp'',50000); %creates a mesh of the domain outline with a resolution of 50000m')); Index: /issm/trunk/etc/environment.csh =================================================================== --- /issm/trunk/etc/environment.csh (revision 6087) +++ /issm/trunk/etc/environment.csh (revision 6088) @@ -1,4 +1,4 @@ -#ISSM_DIR and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...) -source $ISSM_DIR/etc/environment_variables.csh +#ISSM_TIER and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...) +source $ISSM_TIER/etc/environment_variables.csh #Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them before exporting the variables @@ -10,8 +10,8 @@ #CRON utilities -setenv PATH {$PATH}:{$ISSM_DIR}/cron +setenv PATH {$PATH}:{$ISSM_TIER}/cron #SCRIPTS utilities -setenv PATH {$PATH}:{$ISSM_DIR}/scripts +setenv PATH {$PATH}:{$ISSM_TIER}/scripts #MATLAB Index: /issm/trunk/etc/environment.sh =================================================================== --- /issm/trunk/etc/environment.sh (revision 6087) +++ /issm/trunk/etc/environment.sh (revision 6088) @@ -1,4 +1,4 @@ -#ISSM_DIR and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...) -source $ISSM_DIR/etc/environment_variables.sh +#ISSM_TIER and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...) +source $ISSM_TIER/etc/environment_variables.sh #Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them before exporting the variables @@ -10,8 +10,8 @@ #CRON utilities -PATH="$PATH:$ISSM_DIR/cron" +PATH="$PATH:$ISSM_TIER/cron" #scripts -PATH="$PATH:$ISSM_DIR/scripts" +PATH="$PATH:$ISSM_TIER/scripts" ##MATLAB @@ -102,5 +102,5 @@ #LATEX2RTF -export RTFPATH="$ISSM_DIR/externalpackages/latex2rtf/cfg" +export RTFPATH="$ISSM_TIER/externalpackages/latex2rtf/cfg" #Chaco @@ -132,5 +132,5 @@ #export INTEL_DIR #PATH="$PATH:$INTEL_DIR" -#source $ISSM_DIR/externalpackages/intel/intel.sh +#source $ISSM_TIER/externalpackages/intel/intel.sh #SDK Index: /issm/trunk/etc/environment_variables.csh =================================================================== --- /issm/trunk/etc/environment_variables.csh (revision 6087) +++ /issm/trunk/etc/environment_variables.csh (revision 6088) @@ -1,78 +1,78 @@ # # -#This routine can only be run if the ISSM_DIR variable has been correctly set! +#This routine can only be run if the ISSM_TIER variable has been correctly set! # # #MATLAB -set MATLAB_DIR={$ISSM_DIR}/externalpackages/matlab/install +set MATLAB_DIR={$ISSM_TIER}/externalpackages/matlab/install set MATLAB_VERSION= #MPI -set MPI_DIR={$ISSM_DIR}/externalpackages/mpich2/install +set MPI_DIR={$ISSM_TIER}/externalpackages/mpich2/install #PETSC -set PETSC_DIR={$ISSM_DIR}/externalpackages/petsc/install +set PETSC_DIR={$ISSM_TIER}/externalpackages/petsc/install #SLEPC -set SLEPC_DIR={$ISSM_DIR}/externalpackages/slepc/install +set SLEPC_DIR={$ISSM_TIER}/externalpackages/slepc/install #Dakota -set DAKOTA_DIR={$ISSM_DIR}/externalpackages/dakota/install +set DAKOTA_DIR={$ISSM_TIER}/externalpackages/dakota/install #Qhull -set QHULL_DIR={$ISSM_DIR}/externalpackages/qhull/install +set QHULL_DIR={$ISSM_TIER}/externalpackages/qhull/install #Doxygen -set DOXYGEN_DIR={$ISSM_DIR}/externalpackages/doxygen/install +set DOXYGEN_DIR={$ISSM_TIER}/externalpackages/doxygen/install #MTOC -set MTOC_DIR={$ISSM_DIR}/externalpackages/mtoc/install +set MTOC_DIR={$ISSM_TIER}/externalpackages/mtoc/install #Triangle -set TRIANGLE_DIR={$ISSM_DIR}/externalpackages/triangle/install +set TRIANGLE_DIR={$ISSM_TIER}/externalpackages/triangle/install #METIS -set METIS_DIR={$ISSM_DIR}/externalpackages/metis/install +set METIS_DIR={$ISSM_TIER}/externalpackages/metis/install #BLAS -set BLAS_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/fblaslapack +set BLAS_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/fblaslapack #LAPACK -set LAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/fblaslapack/$ISSM_ARCH +set LAPACK_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/fblaslapack/$ISSM_ARCH #SCALAPACK -set SCALAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/SCALAPACK/$ISSM_ARCH +set SCALAPACK_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/SCALAPACK/$ISSM_ARCH #PLAPACK -set PLAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/PLAPACKR32 +set PLAPACK_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/PLAPACKR32 #BLACS -set BLACS_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/blacs-dev/$ISSM_ARCH +set BLACS_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/blacs-dev/$ISSM_ARCH #sowing -set SOWING_DIR={$ISSM_DIR}/externalpackages/sowing/install +set SOWING_DIR={$ISSM_TIER}/externalpackages/sowing/install #YAMS -set YAMS_DIR={$ISSM_DIR}/externalpackages/yams/install +set YAMS_DIR={$ISSM_TIER}/externalpackages/yams/install #TEX2IM -set TEX2IM_DIR={$ISSM_DIR}/externalpackages/tex2im/install +set TEX2IM_DIR={$ISSM_TIER}/externalpackages/tex2im/install #Chaco -set CHACO_DIR={$ISSM_DIR}/externalpackages/chaco/install +set CHACO_DIR={$ISSM_TIER}/externalpackages/chaco/install #MeshPart -set MESHPART_DIR={$ISSM_DIR}/externalpackages/meshpart/install +set MESHPART_DIR={$ISSM_TIER}/externalpackages/meshpart/install #SCOTCH -set SCOTCH_DIR={$ISSM_DIR}/externalpackages/scotch/install +set SCOTCH_DIR={$ISSM_TIER}/externalpackages/scotch/install #Development packages #automake -set AUTOMAKE_DIR={$ISSM_DIR}/devpackages/automake/install +set AUTOMAKE_DIR={$ISSM_TIER}/devpackages/automake/install #autoconf -set AUTOCONF_DIR={$ISSM_DIR}/devpackages/autoconf/install +set AUTOCONF_DIR={$ISSM_TIER}/devpackages/autoconf/install #borland @@ -80,6 +80,6 @@ #ssh -set SSH_DIR={$ISSM_DIR}/externalpackages/ssh +set SSH_DIR={$ISSM_TIER}/externalpackages/ssh #valgrind -set VALGRIND_DIR={$ISSM_DIR}/externalpackages/valgrind/install/bin +set VALGRIND_DIR={$ISSM_TIER}/externalpackages/valgrind/install/bin Index: /issm/trunk/etc/environment_variables.sh =================================================================== --- /issm/trunk/etc/environment_variables.sh (revision 6087) +++ /issm/trunk/etc/environment_variables.sh (revision 6088) @@ -1,81 +1,81 @@ # # -#This routine can only be run if the ISSM_DIR variable has been correctly set! +#This routine can only be run if the ISSM_TIER variable has been correctly set! # # #MATLAB -MATLAB_DIR="$ISSM_DIR/externalpackages/matlab/install" +MATLAB_DIR="$ISSM_TIER/externalpackages/matlab/install" MATLAB_VERSION=R2008a #MPI -MPI_DIR="$ISSM_DIR/externalpackages/mpich2/install" +MPI_DIR="$ISSM_TIER/externalpackages/mpich2/install" #PETSC -PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install" +PETSC_DIR="$ISSM_TIER/externalpackages/petsc/install" #SLEPC -SLEPC_DIR="$ISSM_DIR/externalpackages/slepc/install" +SLEPC_DIR="$ISSM_TIER/externalpackages/slepc/install" #Dakota -DAKOTA_DIR="$ISSM_DIR/externalpackages/dakota/install" +DAKOTA_DIR="$ISSM_TIER/externalpackages/dakota/install" #Qhull -QHULL_DIR="$ISSM_DIR/externalpackages/qhull/install" +QHULL_DIR="$ISSM_TIER/externalpackages/qhull/install" #Doxygen -DOXYGEN_DIR="$ISSM_DIR/externalpackages/doxygen/install" +DOXYGEN_DIR="$ISSM_TIER/externalpackages/doxygen/install" #MTOC -MTOC_DIR="$ISSM_DIR/externalpackages/mtoc/install" +MTOC_DIR="$ISSM_TIER/externalpackages/mtoc/install" #Triangle -TRIANGLE_DIR="$ISSM_DIR/externalpackages/triangle/install" +TRIANGLE_DIR="$ISSM_TIER/externalpackages/triangle/install" #METIS -METIS_DIR="$ISSM_DIR/externalpackages/metis/install" +METIS_DIR="$ISSM_TIER/externalpackages/metis/install" #BLAS -BLAS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack" +BLAS_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/fblaslapack" #LAPACK -LAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH" +LAPACK_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH" #SCALAPACK -SCALAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH" +SCALAPACK_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH" #PLAPACK -PLAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32" +PLAPACK_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32" #BLACS -BLACS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH" +BLACS_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH" #sowing -SOWING_DIR="$ISSM_DIR/externalpackages/sowing/install" +SOWING_DIR="$ISSM_TIER/externalpackages/sowing/install" #BLACS -BLACS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH" +BLACS_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH" #YAMS -YAMS_DIR="$ISSM_DIR/externalpackages/yams/install" +YAMS_DIR="$ISSM_TIER/externalpackages/yams/install" #BAMG -BAMG_DIR="$ISSM_DIR/externalpackages/bamg/install" +BAMG_DIR="$ISSM_TIER/externalpackages/bamg/install" #Chaco -CHACO_DIR="$ISSM_DIR/externalpackages/chaco/install" +CHACO_DIR="$ISSM_TIER/externalpackages/chaco/install" #MeshPart -MESHPART_DIR="$ISSM_DIR/externalpackages/meshpart/install" +MESHPART_DIR="$ISSM_TIER/externalpackages/meshpart/install" #SCOTCH -SCOTCH_DIR="$ISSM_DIR/externalpackages/scotch/install" +SCOTCH_DIR="$ISSM_TIER/externalpackages/scotch/install" #Development packages #automake -AUTOMAKE_DIR="$ISSM_DIR/devpackages/automake/install" +AUTOMAKE_DIR="$ISSM_TIER/devpackages/automake/install" #autoconf -AUTOCONF_DIR="$ISSM_DIR/devpackages/autoconf/install" +AUTOCONF_DIR="$ISSM_TIER/devpackages/autoconf/install" #borland @@ -86,5 +86,5 @@ #TEX2IM -TEX2IM_DIR="$ISSM_DIR/externalpackages/tex2im/install" +TEX2IM_DIR="$ISSM_TIER/externalpackages/tex2im/install" #sdk @@ -92,12 +92,12 @@ #ssh -SSH_DIR="$ISSM_DIR/externalpackages/ssh" +SSH_DIR="$ISSM_TIER/externalpackages/ssh" #valgrind -VALGRIND_DIR="$ISSM_DIR/externalpackages/valgrind/install/bin" +VALGRIND_DIR="$ISSM_TIER/externalpackages/valgrind/install/bin" #graphviz -GRAPHVIZ_DIR="$ISSM_DIR/externalpackages/graphviz/install/bin" +GRAPHVIZ_DIR="$ISSM_TIER/externalpackages/graphviz/install/bin" #cppcheck -CPPCHECK_DIR="$ISSM_DIR/externalpackages/cppcheck/install" +CPPCHECK_DIR="$ISSM_TIER/externalpackages/cppcheck/install" Index: /issm/trunk/externalpackages/README =================================================================== --- /issm/trunk/externalpackages/README (revision 6087) +++ /issm/trunk/externalpackages/README (revision 6088) @@ -2,5 +2,5 @@ -1/ source the ISSM_DIR/Etc/environment.sh file. This will set up all the necessary +1/ source the ISSM_TIER/Etc/environment.sh file. This will set up all the necessary environment variables in your shell. Index: /issm/trunk/scripts/archive.sh =================================================================== --- /issm/trunk/scripts/archive.sh (revision 6087) +++ /issm/trunk/scripts/archive.sh (revision 6088) @@ -10,5 +10,5 @@ #Cleanup code -cd $ISSM_DIR +cd $ISSM_TIER make clean make distclean @@ -18,5 +18,5 @@ #Create tar file, with today's date in the title; -cd $ISSM_DIR/.. +cd $ISSM_TIER/.. today=`today_date` -tar zcvf issm-3.0-$today.tar.gz `basename $ISSM_DIR` +tar zcvf issm-3.0-$today.tar.gz `basename $ISSM_TIER` Index: /issm/trunk/scripts/automakererun.sh =================================================================== --- /issm/trunk/scripts/automakererun.sh (revision 6087) +++ /issm/trunk/scripts/automakererun.sh (revision 6088) @@ -7,9 +7,9 @@ rm -rf aclocal.m4 echo "Calling alocal" -$ISSM_DIR/devpackages/automake/install/bin/aclocal -I m4 +$ISSM_TIER/devpackages/automake/install/bin/aclocal -I m4 echo "Calling autoconf" -$ISSM_DIR/devpackages/autoconf/install/bin/autoconf +$ISSM_TIER/devpackages/autoconf/install/bin/autoconf echo "Calling autoheader" -$ISSM_DIR/devpackages/autoconf/install/bin/autoheader +$ISSM_TIER/devpackages/autoconf/install/bin/autoheader echo "Calling automake" -$ISSM_DIR/devpackages/automake/install/bin/automake -a +$ISSM_TIER/devpackages/automake/install/bin/automake -a Index: /issm/trunk/scripts/createlinks.sh =================================================================== --- /issm/trunk/scripts/createlinks.sh (revision 6087) +++ /issm/trunk/scripts/createlinks.sh (revision 6088) @@ -3,5 +3,5 @@ #go to ISSM main directory -cd $ISSM_DIR +cd $ISSM_TIER #get path of runmes.m @@ -10,6 +10,6 @@ #loop over the directories for i in $FILES; do - cd $ISSM_DIR$i - ln -s $ISSM_DIR/startup.m . - cd $ISSM_DIR + cd $ISSM_TIER$i + ln -s $ISSM_TIER/startup.m . + cd $ISSM_TIER done Index: /issm/trunk/scripts/dailyrun.sh =================================================================== --- /issm/trunk/scripts/dailyrun.sh (revision 6087) +++ /issm/trunk/scripts/dailyrun.sh (revision 6088) @@ -54,15 +54,15 @@ #Prepare run #Windows hack for startup.m {{{1 -#windows environments: ISSM_DIR_WIN variable not correctly picked up when using -#the cron job. just get startup to take the ISSM_DIR variable as the pwd: +#windows environments: ISSM_TIER_WIN variable not correctly picked up when using +#the cron job. just get startup to take the ISSM_TIER variable as the pwd: if [ "$OS" = "winxp32" ] then - cat startup.m | sed 's/clear status/clear status; ISSM_DIR=pwd;/g' > startup.m.bak + cat startup.m | sed 's/clear status/clear status; ISSM_TIER=pwd;/g' > startup.m.bak mv startup.m.bak startup.m fi #}}} #create softlink to startup {{{1 -cd $ISSM_DIR/test/NightlyRun/ -ln -s $ISSM_DIR/startup.m . +cd $ISSM_TIER/test/NightlyRun/ +ln -s $ISSM_TIER/startup.m . #}}} #Create dailylog directory and info.log {{{1 @@ -70,7 +70,7 @@ INSTALL_TIME=$(timer) ELAPSED_INSTALL=$(timer $START_TIME) -rm -rf $ISSM_DIR/dailylog -mkdir $ISSM_DIR/dailylog -cat << END > $ISSM_DIR/dailylog/info.log +rm -rf $ISSM_TIER/dailylog +mkdir $ISSM_TIER/dailylog +cat << END > $ISSM_TIER/dailylog/info.log today: $(echo $TODAY) user: $(echo $USER) @@ -95,8 +95,8 @@ do #Launch matlab and the daily run script - cat > $ISSM_DIR/dailylog/matlab_run$i.m << EOF + cat > $ISSM_TIER/dailylog/matlab_run$i.m << EOF warning off %necessary to avoid a info.log of several Go for parallel runs try, - cd $ISSM_DIR/test/NightlyRun + cd $ISSM_TIER/test/NightlyRun startup; $(if [ "$NROPTIONS" = "" ] @@ -111,5 +111,5 @@ directory=strsplit(pwd,'/'); message=getReport(me) - fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at'); + fid=fopen([ISSM_TIER '/dailylog/matlaberror.log'], 'at'); fprintf(fid,'\nMatlab error occured in: %s\n\n',directory{end}); fprintf(fid,'%s',message); @@ -121,5 +121,5 @@ #Start run from dailylog directory - cd $ISSM_DIR/dailylog/ + cd $ISSM_TIER/dailylog/ #Start test @@ -132,5 +132,5 @@ #}}} #concatenate all reports {{{1 -cd $ISSM_DIR/dailylog/ +cd $ISSM_TIER/dailylog/ mv matlab_log1.log matlab_log.log for (( i=2;i<=$NUMCPUS_RUN;i++ )) @@ -149,5 +149,5 @@ ELAPSED_RUN=$(timer $INSTALL_TIME) ELAPSED_TOTAL=$(timer $START_TIME) -cat << END >> $ISSM_DIR/dailylog/info.log +cat << END >> $ISSM_TIER/dailylog/info.log elapsed_run: $(echo $ELAPSED_RUN) elapsed_total: $(echo $ELAPSED_TOTAL) @@ -158,7 +158,7 @@ #Send Report #Build html report {{{1 -cd $ISSM_DIR/dailylog/ +cd $ISSM_TIER/dailylog/ sh ../scripts/report.sh -ln -s $ISSM_DIR/dailylog/report.html $INIT_PATH -echo "html report located in $ISSM_DIR/dailylog/report.html and $INIT_PATH/report.html" +ln -s $ISSM_TIER/dailylog/report.html $INIT_PATH +echo "html report located in $ISSM_TIER/dailylog/report.html and $INIT_PATH/report.html" #}}} Index: /issm/trunk/scripts/eraselinks.sh =================================================================== --- /issm/trunk/scripts/eraselinks.sh (revision 6087) +++ /issm/trunk/scripts/eraselinks.sh (revision 6088) @@ -3,5 +3,5 @@ #go to ISSM main directory -cd $ISSM_DIR +cd $ISSM_TIER #get path of runmes.m @@ -10,6 +10,6 @@ #loop over the directories for i in $FILES; do - cd $ISSM_DIR$i + cd $ISSM_TIER$i rm startup.m - cd $ISSM_DIR + cd $ISSM_TIER done Index: /issm/trunk/scripts/getloc.sh =================================================================== --- /issm/trunk/scripts/getloc.sh (revision 6087) +++ /issm/trunk/scripts/getloc.sh (revision 6088) @@ -3,10 +3,10 @@ #get Matlab number of lines -cd $ISSM_DIR/src/m +cd $ISSM_TIER/src/m M_LOC=$(find . -name "*.m" -exec wc -l '{}' \; | awk '{ sum += $1 } END { print sum}'); echo "Matlab code: $M_LOC" #get C/CPP number of lines -cd $ISSM_DIR/src +cd $ISSM_TIER/src CPP_LOC=$(find . -name "*.cpp" -exec wc -l '{}' \; | awk '{ sum += $1 } END { print sum}'); echo "C++ code: $CPP_LOC" Index: /issm/trunk/scripts/quickinstall.sh =================================================================== --- /issm/trunk/scripts/quickinstall.sh (revision 6087) +++ /issm/trunk/scripts/quickinstall.sh (revision 6088) @@ -9,9 +9,9 @@ #go to root -cd $ISSM_DIR +cd $ISSM_TIER HERE=`pwd`; -#check that ISSM_DIR is correctly set up -if [ $HERE != $ISSM_DIR ]; then +#check that ISSM_TIER is correctly set up +if [ $HERE != $ISSM_TIER ]; then cd .. @@ -25,6 +25,6 @@ #ISSM - export ISSM_DIR=` pwd ` - source $ISSM_DIR/etc/environment.sh + export ISSM_TIER=` pwd ` + source $ISSM_TIER/etc/environment.sh ********************************************************************************************************** @@ -42,5 +42,5 @@ cd ../triangle sh install.sh - cd $ISSM_DIR + cd $ISSM_TIER #2: install automake and autoconf Index: /issm/trunk/scripts/report.sh =================================================================== --- /issm/trunk/scripts/report.sh (revision 6087) +++ /issm/trunk/scripts/report.sh (revision 6088) @@ -48,5 +48,5 @@ #create some variables -if [ $(ls -1 $ISSM_DIR/bin | wc -l) -le 20 ]; +if [ $(ls -1 $ISSM_TIER/bin | wc -l) -le 20 ]; then IS_INSTALL=0 Index: /issm/trunk/scripts/run.sh =================================================================== --- /issm/trunk/scripts/run.sh (revision 6087) +++ /issm/trunk/scripts/run.sh (revision 6088) @@ -6,6 +6,6 @@ MATLAB_VERSION="7.6" #7.2,7.4,7.6 and 7.8 #create softlink to startup {{{1 -cd $ISSM_DIR/test/NightlyRun/ -ln -s $ISSM_DIR/startup.m . +cd $ISSM_TIER/test/NightlyRun/ +ln -s $ISSM_TIER/startup.m . #}}} @@ -14,8 +14,8 @@ do #Launch matlab and the daily run script - cat > $ISSM_DIR/dailylog/matlab_run$i.m << EOF + cat > $ISSM_TIER/dailylog/matlab_run$i.m << EOF warning off %necessary to avoid a daily.log of several Go for parallel runs try, - cd $ISSM_DIR/test/NightlyRun + cd $ISSM_TIER/test/NightlyRun startup; $(if [ "$NROPTIONS" = "" ] @@ -30,5 +30,5 @@ directory=strsplit(pwd,'/'); message=getReport(me) - fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at'); + fid=fopen([ISSM_TIER '/dailylog/matlaberror.log'], 'at'); fprintf(fid,'\nMatlab error occured in: %s\n\n',directory{end}); fprintf(fid,'%s',message); @@ -39,5 +39,5 @@ #Start run from dailylog directory - cd $ISSM_DIR/dailylog/ + cd $ISSM_TIER/dailylog/ #Start test Index: /issm/trunk/scripts/windowsbuild.sh =================================================================== --- /issm/trunk/scripts/windowsbuild.sh (revision 6087) +++ /issm/trunk/scripts/windowsbuild.sh (revision 6088) @@ -12,5 +12,5 @@ today=`today_date` -cd $ISSM_DIR/bin +cd $ISSM_TIER/bin #Filter out .svn files Index: /issm/trunk/src/c/modules/MeshProfileIntersectionx/SegmentIntersect.cpp =================================================================== --- /issm/trunk/src/c/modules/MeshProfileIntersectionx/SegmentIntersect.cpp (revision 6087) +++ /issm/trunk/src/c/modules/MeshProfileIntersectionx/SegmentIntersect.cpp (revision 6088) @@ -6,5 +6,5 @@ int SegmentIntersect(double* palpha, double* pbeta, double* x1, double* y1, double* x2, double* y2){ - /*See ISSM_DIR/src/m/utils/Geometry/SegIntersect.m for matlab routine from which we take this routine: */ + /*See ISSM_TIER/src/m/utils/Geometry/SegIntersect.m for matlab routine from which we take this routine: */ /*output: */ Index: /issm/trunk/src/m/model/modeldefault/modeldefault_process.m =================================================================== --- /issm/trunk/src/m/model/modeldefault/modeldefault_process.m (revision 6087) +++ /issm/trunk/src/m/model/modeldefault/modeldefault_process.m (revision 6088) @@ -7,5 +7,5 @@ %retrieve some paths global ISSM_DIR -modeldatapath='/u/astrid-r1b/larour/ModelData'; +modeldatapath=[ISSM_DIR '/projects/ModelData']; %initialize output @@ -20,10 +20,10 @@ %iceshelves -iceshelves=[ISSM_DIR '/../models/Antarctica/Exp_Par/Iceshelves.exp']; +iceshelves=[ISSM_DIR '/projects/Exp/Antarctica.exp']); optionstruct.iceshelves=getfieldvalue(options,'iceshelves',iceshelves); disp(sprintf(' %-18s: %s','iceshelves',optionstruct.iceshelves)); %islands -islands=[ISSM_DIR '/../models/Antarctica/Exp_Par/Islands.exp']; +islands=[ISSM_DIR '/projects/Exp/Antarctica.exp']; optionstruct.islands=getfieldvalue(options,'islands',islands); disp(sprintf(' %-18s: %s','islands',optionstruct.islands)); Index: /issm/trunk/src/m/model/modis.m =================================================================== --- /issm/trunk/src/m/model/modis.m (revision 6087) +++ /issm/trunk/src/m/model/modis.m (revision 6088) @@ -6,5 +6,5 @@ % -global ISSM_DIR +global ISSM_TIER %find gdal coordinates @@ -16,9 +16,9 @@ %Get path to gdal binaries -path_gdal=[ISSM_DIR '/externalpackages/gdal/install/bin/']; +path_gdal=[ISSM_TIER '/externalpackages/gdal/install/bin/']; %Was gdal compiled? if ~exist([path_gdal 'gdal_translate']), - 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.']); + 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.']); end Index: /issm/trunk/src/m/model/multiplequeue/BuildMultipleQueueingScriptGeneric.m =================================================================== --- /issm/trunk/src/m/model/multiplequeue/BuildMultipleQueueingScriptGeneric.m (revision 6087) +++ /issm/trunk/src/m/model/multiplequeue/BuildMultipleQueueingScriptGeneric.m (revision 6088) @@ -5,5 +5,5 @@ % BuildMultipleQueueingScriptGeneric(executionpath,codepath) -global ISSM_DIR +global ISSM_TIER Index: /issm/trunk/src/m/model/plot/applyoptions.m =================================================================== --- /issm/trunk/src/m/model/plot/applyoptions.m (revision 6087) +++ /issm/trunk/src/m/model/plot/applyoptions.m (revision 6088) @@ -279,7 +279,7 @@ %box off if strcmpi(md.hemisphere,'n') | strcmpi(md.hemisphere,'north'), - A=expread([ ISSM_DIR '/../models/Greenland/Exp_Par/DomainOutline.exp']); + A=expread([ ISSM_DIR 'projects/Exp/Greenland.exp']); elseif strcmpi(md.hemisphere,'s') | strcmpi(md.hemisphere,'south'), - A=expread([ ISSM_DIR '/../models/Antarctica/Exp_Par/DomainOutline.exp']); + A=expread([ ISSM_DIR '/projects/Exp/Antarctica.exp']); else error('applyoptions error message: hemisphere not defined'); Index: /issm/trunk/src/m/model/plot/plotmodel.m =================================================================== --- /issm/trunk/src/m/model/plot/plotmodel.m (revision 6087) +++ /issm/trunk/src/m/model/plot/plotmodel.m (revision 6088) @@ -2,7 +2,7 @@ %At command prompt, type plotdoc for help on documentation. -global ISSM_DIR -if isempty(ISSM_DIR), - error('ISSM_DIR variable got erased! This variable is needed to run Ice code correctly. Please rerun your startup file.'); +global ISSM_TIER +if isempty(ISSM_TIER), + error('ISSM_TIER variable got erased! This variable is needed to run Ice code correctly. Please rerun your startup file.'); end Index: /issm/trunk/src/m/model/radarpower.m =================================================================== --- /issm/trunk/src/m/model/radarpower.m (revision 6087) +++ /issm/trunk/src/m/model/radarpower.m (revision 6088) @@ -9,5 +9,5 @@ % md=radarpower(md,hemisphere,xlim,ylim,highres) -global ISSM_DIR +global ISSM_TIER global MODELDATA @@ -23,9 +23,9 @@ %Get path to gdal binaries -path_gdal=[ISSM_DIR '/externalpackages/gdal/install/bin/']; +path_gdal=[ISSM_TIER '/externalpackages/gdal/install/bin/']; %Was gdal compiled? if ~exist([path_gdal 'gdal_translate']), - 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.']); + 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.']); end Index: /issm/trunk/src/m/model/solve.m =================================================================== --- /issm/trunk/src/m/model/solve.m (revision 6087) +++ /issm/trunk/src/m/model/solve.m (revision 6088) @@ -15,5 +15,5 @@ %some checks on list of arguments -global ISSM_DIR +global ISSM_TIER %recover options Index: /issm/trunk/src/m/qmu/postqmu.m =================================================================== --- /issm/trunk/src/m/qmu/postqmu.m (revision 6087) +++ /issm/trunk/src/m/qmu/postqmu.m (revision 6088) @@ -4,5 +4,5 @@ %Deal with dakota output results in files. -global ISSM_DIR; +global ISSM_TIER; % check to see if dakota returned errors in the err file Index: /issm/trunk/src/m/qmu/preqmu.m =================================================================== --- /issm/trunk/src/m/qmu/preqmu.m (revision 6087) +++ /issm/trunk/src/m/qmu/preqmu.m (revision 6088) @@ -18,5 +18,5 @@ % runmpi: (John?) -global ISSM_DIR; +global ISSM_TIER; displaystring(md.verbose,'\n%s\n','preprocessing dakota inputs'); Index: /issm/trunk/src/m/utils/DataProcessing/TracksToMatrix.m =================================================================== --- /issm/trunk/src/m/utils/DataProcessing/TracksToMatrix.m (revision 6087) +++ /issm/trunk/src/m/utils/DataProcessing/TracksToMatrix.m (revision 6088) @@ -20,5 +20,5 @@ % See also: CREATEDATABOUNDARIES, CREATEDATAMATRIX -global ISSM_DIR +global ISSM_TIER %some checks @@ -28,5 +28,5 @@ %Add path to dace -addpath([ISSM_DIR '/externalpackages/dace/install']) +addpath([ISSM_TIER '/externalpackages/dace/install']) %First create the x_m and y_m fot the matrix @@ -84,3 +84,3 @@ %remove DACE path -rmpath([ISSM_DIR '/externalpackages/dace/install']); +rmpath([ISSM_TIER '/externalpackages/dace/install']); Index: /issm/trunk/src/m/utils/Mesh/BamgCall.m =================================================================== --- /issm/trunk/src/m/utils/Mesh/BamgCall.m (revision 6087) +++ /issm/trunk/src/m/utils/Mesh/BamgCall.m (revision 6088) @@ -15,5 +15,5 @@ % md=BamgCall(md,md.vel_obs,1500,10^8,1.3,0.9); -global ISSM_DIR +global ISSM_TIER %2d geometric parameter (do not change) Index: /issm/trunk/src/m/utils/Mesh/BamgCallFromMetric.m =================================================================== --- /issm/trunk/src/m/utils/Mesh/BamgCallFromMetric.m (revision 6087) +++ /issm/trunk/src/m/utils/Mesh/BamgCallFromMetric.m (revision 6088) @@ -11,5 +11,5 @@ % md=BamgCall(md,metric,1500,10^8,1.3,0.9); -global ISSM_DIR +global ISSM_TIER %2d geometric parameter (do not change) Index: /issm/trunk/src/m/utils/Mesh/YamsCall.m =================================================================== --- /issm/trunk/src/m/utils/Mesh/YamsCall.m (revision 6087) +++ /issm/trunk/src/m/utils/Mesh/YamsCall.m (revision 6088) @@ -15,5 +15,5 @@ % md=YamsCall(md,md.vel_obs,1500,10^8,1.3,0.9); -global ISSM_DIR +global ISSM_TIER %2d geometric parameter (do not change) Index: /issm/trunk/src/m/utils/OS/clearall.m =================================================================== --- /issm/trunk/src/m/utils/OS/clearall.m (revision 6087) +++ /issm/trunk/src/m/utils/OS/clearall.m (revision 6088) @@ -1,9 +1,9 @@ -%script that erases all variables except ISSM_DIR +%script that erases all variables except ISSM_TIER %get all localvariables Lvariables=evalin('base','who'); -%remove ISSM_DIR from this list -Lvariables=Lvariables(find(~strcmp(Lvariables,'ISSM_DIR'))); +%remove ISSM_TIER from this list +Lvariables=Lvariables(find(~strcmp(Lvariables,'ISSM_TIER'))); %clear all Index: /issm/trunk/src/m/utils/OS/issmscpin.m =================================================================== --- /issm/trunk/src/m/utils/OS/issmscpin.m (revision 6087) +++ /issm/trunk/src/m/utils/OS/issmscpin.m (revision 6088) @@ -32,10 +32,10 @@ %use the putty project pscp.exe: it should be in the path. - %get ISSM_DIR variable - [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]'); + %get ISSM_TIER variable + [status,ISSM_TIER]=system('echo [%ISSM_TIER_WIN%]'); if status, - error('scpin error message: could not find ISSM_DIR_WIN envirnoment variable'); + error('scpin error message: could not find ISSM_TIER_WIN envirnoment variable'); end - ISSM_DIR=ISSM_DIR(2:end-2); + ISSM_TIER=ISSM_TIER(2:end-2); username=input('Username: (quoted string) '); @@ -43,5 +43,5 @@ for i=1:numel(packages), - [status,result]=system([ISSM_DIR '/externalpackages/ssh/pscp.exe -l "' username '" -pw "' password '" ' host ':' path '/' packages{i} ' ./']); + [status,result]=system([ISSM_TIER '/externalpackages/ssh/pscp.exe -l "' username '" -pw "' password '" ' host ':' path '/' packages{i} ' ./']); if status, error('scpin error message: could not call putty pscp'); Index: /issm/trunk/src/m/utils/OS/issmscpout.m =================================================================== --- /issm/trunk/src/m/utils/OS/issmscpout.m (revision 6087) +++ /issm/trunk/src/m/utils/OS/issmscpout.m (revision 6088) @@ -23,10 +23,10 @@ %use the putty project pscp.exe: it should be in the path. - %get ISSM_DIR variable - [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]'); + %get ISSM_TIER variable + [status,ISSM_TIER]=system('echo [%ISSM_TIER_WIN%]'); if status, - error('scpout error message: could not find ISSM_DIR_WIN envirnoment variable'); + error('scpout error message: could not find ISSM_TIER_WIN envirnoment variable'); end - ISSM_DIR=ISSM_DIR(2:end-2); + ISSM_TIER=ISSM_TIER(2:end-2); username=input('Username: (quoted string) '); @@ -34,5 +34,5 @@ for i=1:numel(packages), - [status,result]=system([ISSM_DIR '/externalpackages/ssh/pscp.exe -l "' username '" -pw "' password '" ' packages{i} ' ' host ':' path]); + [status,result]=system([ISSM_TIER '/externalpackages/ssh/pscp.exe -l "' username '" -pw "' password '" ' packages{i} ' ' host ':' path]); if status, error('scpout error message: could not call putty pscp'); Index: /issm/trunk/src/m/utils/OS/issmssh.m =================================================================== --- /issm/trunk/src/m/utils/OS/issmssh.m (revision 6087) +++ /issm/trunk/src/m/utils/OS/issmssh.m (revision 6088) @@ -15,15 +15,15 @@ %use the putty project plink.exe: it should be in the path. - %get ISSM_DIR variable - [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]'); + %get ISSM_TIER variable + [status,ISSM_TIER]=system('echo [%ISSM_TIER_WIN%]'); if status, - error('issmssh error message: could not find ISSM_DIR_WIN envirnoment variable'); + error('issmssh error message: could not find ISSM_TIER_WIN envirnoment variable'); end - ISSM_DIR=ISSM_DIR(2:end-2); + ISSM_TIER=ISSM_TIER(2:end-2); username=input('Username: (quoted string) '); password=input('Password: (quoted string) '); - system([ISSM_DIR '/externalpackages/ssh/plink.exe -ssh -l "' username '" -pw "' password '" ' host ' "' command '"']); + system([ISSM_TIER '/externalpackages/ssh/plink.exe -ssh -l "' username '" -pw "' password '" ' host ' "' command '"']); else Index: /issm/trunk/startup.m =================================================================== --- /issm/trunk/startup.m (revision 6087) +++ /issm/trunk/startup.m (revision 6088) @@ -9,18 +9,18 @@ % Copyright Jet Propulsion Laboratory. -global ISSM_DIR +global ISSM_TIER lastwarn(''); % clear the last warning to focus on the warnings of the ISSM path -%Recover ISSM_DIR +%Recover ISSM_TIER if ispc, - [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]'); + [status,ISSM_TIER]=system('echo [%ISSM_TIER_WIN%]'); else - [status,ISSM_DIR]=system('echo $ISSM_DIR'); + [status,ISSM_TIER]=system('echo $ISSM_TIER'); end if status~=0, - error('issmdir error message: problem when running ''echo $ISSM_DIR'' shell command'); + error('startup error message: problem when running ''echo $ISSM_TIER'' shell command'); end -if (length(ISSM_DIR)<=1), - error('issmdir error message: ''ISSM_DIR'' environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!'); +if (length(ISSM_TIER)<=1), + error('issmdir error message: ''ISSM_TIER'' environment variable is empty! You should define ISSM_TIER in your .cshrc or .bashrc!'); end %get rid of useless symbols in the name @@ -30,19 +30,19 @@ %Now add all issm code paths necessary to run issm smoothly. %We capture the error output, so that we can warn the user to update -%the variable ISSM_DIR in this file, in case it is not correctly setup. +%the variable ISSM_TIER in this file, in case it is not correctly setup. %ISSM path -addpath([ISSM_DIR '/src/m/utils/']); %loads genpath_ice -addpath([ISSM_DIR '/etc']); -addpath([ISSM_DIR '/doc']); -addpath([ISSM_DIR '/bin']); -addpath(genpath_ice([ISSM_DIR '/src/m'])); -addpath(genpath_ice([ISSM_DIR '/src/pro'])); -addpath(genpath_ice([ISSM_DIR '/externalpackages/subplotSpacing'])); -addpath(genpath_ice([ISSM_DIR '/externalpackages/scotch'])); +addpath([ISSM_TIER '/src/m/utils/']); %loads genpath_ice +addpath([ISSM_TIER '/etc']); +addpath([ISSM_TIER '/doc']); +addpath([ISSM_TIER '/bin']); +addpath(genpath_ice([ISSM_TIER '/src/m'])); +addpath(genpath_ice([ISSM_TIER '/src/pro'])); +addpath(genpath_ice([ISSM_TIER '/externalpackages/subplotSpacing'])); +addpath(genpath_ice([ISSM_TIER '/externalpackages/scotch'])); %Check on any warning messages that might indicate that the paths were not correct. if ~isempty(lastwarn), - fprintf('\n Error trying to setup ''ISSM'' code paths. Try and update the ISSM_DIR variable in your .cshrc or .bashrc!\n'); + fprintf('\n Error trying to setup ''ISSM'' code paths. Try and update the ISSM_TIER variable in your .cshrc or .bashrc!\n'); fprintf(' ''ISSM'' will not work at all until this is resolved\n\n'); else @@ -75,5 +75,5 @@ error('startup error message: problem when running ''echo $USER'' shell command'); end -if exist([ISSM_DIR '/src/m/contrib/' USERNAME],'dir'), - addpath([ISSM_DIR '/src/m/contrib/' USERNAME]); +if exist([ISSM_TIER '/src/m/contrib/' USERNAME],'dir'), + addpath([ISSM_TIER '/src/m/contrib/' USERNAME]); end Index: /issm/trunk/test/NightlyRun/runme.m =================================================================== --- /issm/trunk/test/NightlyRun/runme.m (revision 6087) +++ /issm/trunk/test/NightlyRun/runme.m (revision 6088) @@ -30,6 +30,6 @@ % md=runme('id',102,'procedure','model'); -%use ISSM_DIR generated by startup.m -global ISSM_DIR +%use ISSM_TIER generated by startup.m +global ISSM_TIER %Check inputs @@ -162,5 +162,5 @@ message=getReport(me2); if strcmpi(output,'nightly') - fid=fopen([ISSM_DIR '/nightlylog/matlaberror.log'], 'at'); + fid=fopen([ISSM_TIER '/nightlylog/matlaberror.log'], 'at'); fprintf(fid,'%s',message); fprintf(fid,'\n------------------------------------------------------------------\n'); @@ -168,5 +168,5 @@ disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,id_string,fieldname)); elseif strcmpi(output,'daily'); - fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at'); + fid=fopen([ISSM_TIER '/dailylog/matlaberror.log'], 'at'); fprintf(fid,'%s',message); fprintf(fid,'\n------------------------------------------------------------------\n'); @@ -186,5 +186,5 @@ message=getReport(me); if strcmpi(output,'nightly') - fid=fopen([ISSM_DIR '/nightlylog/matlaberror.log'], 'at'); + fid=fopen([ISSM_TIER '/nightlylog/matlaberror.log'], 'at'); fprintf(fid,'%s',message); fprintf(fid,'\n------------------------------------------------------------------\n'); @@ -192,5 +192,5 @@ disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,id_string,'N/A')); elseif strcmpi(output,'daily'); - fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at'); + fid=fopen([ISSM_TIER '/dailylog/matlaberror.log'], 'at'); fprintf(fid,'%s',message); fprintf(fid,'\n------------------------------------------------------------------\n'); Index: /issm/trunk/test/NightlyRun/test1101.m =================================================================== --- /issm/trunk/test/NightlyRun/test1101.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1101.m (revision 6088) @@ -50,5 +50,5 @@ set(gcf,'Color','w') printmodel(['ismipapattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipapattynvx' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']); + system(['mv ismipapattynvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']); end plotmodel(md,'data',vy,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km') @@ -56,5 +56,5 @@ set(gcf,'Color','w') printmodel(['ismipapattynvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipapattynvy' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']); + system(['mv ismipapattynvy' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']); end plotmodel(md,'data',vz,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km') @@ -62,5 +62,5 @@ set(gcf,'Color','w') printmodel(['ismipapattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipapattynvz' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']); + system(['mv ismipapattynvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']); end @@ -87,5 +87,5 @@ set(gcf,'Color','w') printmodel(['ismipapattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipapattynvxsec' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']); + system(['mv ismipapattynvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']); end end @@ -96,5 +96,5 @@ set(gcf,'Color','w') printmodel('ismipapattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipapattynminvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']); + system(['mv ismipapattynminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']); end plot([5 10 20 40 80 160],maxvx);ylim([0 120]);xlim([0 160]) @@ -102,5 +102,5 @@ set(gcf,'Color','w') printmodel('ismipapattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipapattynmaxvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']); + system(['mv ismipapattynmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']); end %Fields and tolerances to track changes Index: /issm/trunk/test/NightlyRun/test1102.m =================================================================== --- /issm/trunk/test/NightlyRun/test1102.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1102.m (revision 6088) @@ -65,5 +65,5 @@ set(gcf,'Color','w') printmodel(['ismipastokesvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipastokesvx' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']); + system(['mv ismipastokesvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']); end plotmodel(md,'data',vy,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',3) @@ -71,5 +71,5 @@ set(gcf,'Color','w') printmodel(['ismipastokesvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipastokesvy' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']); + system(['mv ismipastokesvy' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']); end plotmodel(md,'data',vz,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',4) @@ -77,5 +77,5 @@ set(gcf,'Color','w') printmodel(['ismipastokesvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipastokesvz' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']); + system(['mv ismipastokesvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']); end @@ -102,5 +102,5 @@ set(gcf,'Color','w') printmodel(['ismipastokesvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipastokesvxsec' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']); + system(['mv ismipastokesvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']); end end @@ -111,5 +111,5 @@ set(gcf,'Color','w') printmodel('ismipastokesminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipastokesminvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']); + system(['mv ismipastokesminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']); end plot([5 10 20 40 80 160],maxvx);ylim([0 120]) @@ -117,5 +117,5 @@ set(gcf,'Color','w') printmodel('ismipastokesmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipastokesmaxvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestA ']); + system(['mv ismipastokesmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA ']); end %Fields and tolerances to track changes Index: /issm/trunk/test/NightlyRun/test1103.m =================================================================== --- /issm/trunk/test/NightlyRun/test1103.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1103.m (revision 6088) @@ -48,5 +48,5 @@ set(gcf,'Color','w') printmodel(['ismipbpattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipbpattynvx' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestB ']); + system(['mv ismipbpattynvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB ']); end plotmodel(md,'data',vz,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km') @@ -54,5 +54,5 @@ set(gcf,'Color','w') printmodel(['ismipbpattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipbpattynvz' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestB ']); + system(['mv ismipbpattynvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB ']); end @@ -79,5 +79,5 @@ set(gcf,'Color','w') printmodel(['ismipbpattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipbpattynvxsec' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestB ']); + system(['mv ismipbpattynvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB ']); end end @@ -88,5 +88,5 @@ set(gcf,'Color','w') printmodel('ismipbpattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipbpattynminvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestB ']); + system(['mv ismipbpattynminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB ']); end plot([5 10 20 40 80 160],maxvx);ylim([0 120]);xlim([0 160]) @@ -94,5 +94,5 @@ set(gcf,'Color','w') printmodel('ismipbpattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipbpattynmaxvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestB ']); + system(['mv ismipbpattynmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB ']); end %Fields and tolerances to track changes Index: /issm/trunk/test/NightlyRun/test1105.m =================================================================== --- /issm/trunk/test/NightlyRun/test1105.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1105.m (revision 6088) @@ -74,5 +74,5 @@ set(gcf,'Color','w') printmodel(['ismipcpattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipcpattynvx' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestC ']); + system(['mv ismipcpattynvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC ']); end plotmodel(md,'data',vy,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',3) @@ -80,5 +80,5 @@ set(gcf,'Color','w') printmodel(['ismipcpattynvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipcpattynvy' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestC ']); + system(['mv ismipcpattynvy' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC ']); end plotmodel(md,'data',vz,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',4) @@ -86,5 +86,5 @@ set(gcf,'Color','w') printmodel(['ismipcpattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipcpattynvz' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestC ']); + system(['mv ismipcpattynvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC ']); end @@ -111,5 +111,5 @@ set(gcf,'Color','w') printmodel(['ismipcpattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipcpattynvxsec' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestC ']); + system(['mv ismipcpattynvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC ']); end end @@ -120,5 +120,5 @@ set(gcf,'Color','w') printmodel('ismipcpattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipcpattynminvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestC ']); + system(['mv ismipcpattynminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC ']); end plot([5 10 20 40 80 160],maxvx);ylim([0 200]); xlim([0 160]) @@ -126,5 +126,5 @@ set(gcf,'Color','w') printmodel('ismipcpattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipcpattynmaxvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestC ']); + system(['mv ismipcpattynmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC ']); end %Fields and tolerances to track changes Index: /issm/trunk/test/NightlyRun/test1107.m =================================================================== --- /issm/trunk/test/NightlyRun/test1107.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1107.m (revision 6088) @@ -70,5 +70,5 @@ set(gcf,'Color','w') printmodel(['ismipdpattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipdpattynvx' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestD ']); + system(['mv ismipdpattynvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD ']); end plotmodel(md,'data',vz,'layer#all',md.numlayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',3) @@ -76,5 +76,5 @@ set(gcf,'Color','w') printmodel(['ismipdpattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipdpattynvz' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestD ']); + system(['mv ismipdpattynvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD ']); end @@ -101,5 +101,5 @@ set(gcf,'Color','w') printmodel(['ismipdpattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipdpattynvxsec' num2str(L) '.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestD ']); + system(['mv ismipdpattynvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD ']); end end @@ -110,5 +110,5 @@ set(gcf,'Color','w') printmodel('ismipdpattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipdpattynminvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestD ']); + system(['mv ismipdpattynminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD ']); end plot([5 10 20 40 80 160],maxvx);ylim([0 300]);xlim([0 160]) @@ -116,5 +116,5 @@ set(gcf,'Color','w') printmodel('ismipdpattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipdpattynmaxvx.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestD ']); + system(['mv ismipdpattynmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD ']); end %Fields and tolerances to track changes Index: /issm/trunk/test/NightlyRun/test1109.m =================================================================== --- /issm/trunk/test/NightlyRun/test1109.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1109.m (revision 6088) @@ -53,20 +53,20 @@ set(gcf,'Color','w') printmodel('ismipepattynvxfrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipepattynvxfrozen.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestE ']); + system(['mv ismipepattynvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE ']); elseif i==2, plotmodel(md,'data',vy,'ylim',[-10 80],'layer',md.numlayers,'sectionvalue','../Exp/ISMIPE.exp','resolution',[10 10],'title','','xlabel','') set(gcf,'Color','w') printmodel('ismipestokesvxfrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipestokesvxfrozen.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestE ']); + system(['mv ismipestokesvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE ']); elseif i==3, plotmodel(md,'data',vy,'ylim',[-50 200],'layer',md.numlayers,'sectionvalue','../Exp/ISMIPE.exp','resolution',[10 10],'title','','xlabel','') set(gcf,'Color','w') printmodel('ismipepattynvxsliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipepattynvxsliding.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestE ']); + system(['mv ismipepattynvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE ']); elseif i==4, plotmodel(md,'data',vy,'ylim',[-50 200],'layer',md.numlayers,'sectionvalue','../Exp/ISMIPE.exp','resolution',[10 10],'title','','xlabel','') set(gcf,'Color','w') printmodel('ismipestokesvxsliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipestokesvxsliding.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/ISMIP/TestE ']); + system(['mv ismipestokesvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE ']); end end Index: /issm/trunk/test/NightlyRun/test120.m =================================================================== --- /issm/trunk/test/NightlyRun/test120.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test120.m (revision 6088) @@ -4,4 +4,10 @@ md=setelementstype(md,'macayeal','all'); md=SetParallel(md,3); +md.verbose=0; + +md.petscoptions=addoptions(md.petscoptions,DiagnosticHorizAnalysisEnum,asmoptions); +md.petscoptions=addoptions(md.petscoptions,PrognosticAnalysisEnum,mumpsoptions); + + md=solve(md,'analysis_type',Transient2DSolutionEnum); Index: /issm/trunk/test/NightlyRun/test1201.m =================================================================== --- /issm/trunk/test/NightlyRun/test1201.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1201.m (revision 6088) @@ -61,5 +61,5 @@ set(gcf,'Color','w') printmodel('eismintmasscthickness','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off'); - system(['mv eismintmasscthickness.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/EISMINT ']); + system(['mv eismintmasscthickness.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT ']); end Index: /issm/trunk/test/NightlyRun/test1202.m =================================================================== --- /issm/trunk/test/NightlyRun/test1202.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1202.m (revision 6088) @@ -28,5 +28,5 @@ set(gcf,'Color','w') printmodel('eismintdiag1vy','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off'); - system(['mv eismintdiag1vy.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/EISMINT ']); + system(['mv eismintdiag1vy.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT ']); end Index: /issm/trunk/test/NightlyRun/test1203.m =================================================================== --- /issm/trunk/test/NightlyRun/test1203.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1203.m (revision 6088) @@ -31,5 +31,5 @@ set(gcf,'Color','w') printmodel('eismintdiag2vy','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off'); - system(['mv eismintdiag2vy.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/EISMINT ']); + system(['mv eismintdiag2vy.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT ']); end Index: /issm/trunk/test/NightlyRun/test1205.m =================================================================== --- /issm/trunk/test/NightlyRun/test1205.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1205.m (revision 6088) @@ -82,5 +82,5 @@ set(gcf,'Color','w') printmodel('hutterstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); - system(['mv hutterstatic.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/EISMINT/IceSheet']); + system(['mv hutterstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']); end Index: /issm/trunk/test/NightlyRun/test1206.m =================================================================== --- /issm/trunk/test/NightlyRun/test1206.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1206.m (revision 6088) @@ -81,5 +81,5 @@ set(gcf,'Color','w') printmodel('pattynstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); - system(['mv pattynstatic.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/EISMINT/IceSheet']); + system(['mv pattynstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']); end Index: /issm/trunk/test/NightlyRun/test1207.m =================================================================== --- /issm/trunk/test/NightlyRun/test1207.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1207.m (revision 6088) @@ -81,5 +81,5 @@ set(gcf,'Color','w') printmodel('stokesstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); - system(['mv stokesstatic.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/EISMINT/IceSheet']); + system(['mv stokesstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']); end Index: /issm/trunk/test/NightlyRun/test1301.m =================================================================== --- /issm/trunk/test/NightlyRun/test1301.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1301.m (revision 6088) @@ -38,5 +38,5 @@ set(gcf,'Color','w') printmodel('thermalmelting','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); - system(['mv thermalmelting.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Thermal ']); + system(['mv thermalmelting.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Thermal ']); end Index: /issm/trunk/test/NightlyRun/test1302.m =================================================================== --- /issm/trunk/test/NightlyRun/test1302.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1302.m (revision 6088) @@ -40,5 +40,5 @@ set(gcf,'Color','w') printmodel('thermaladvection','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); - system(['mv thermaladvection.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/EISMINT ']); + system(['mv thermaladvection.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT ']); end Index: /issm/trunk/test/NightlyRun/test1303.m =================================================================== --- /issm/trunk/test/NightlyRun/test1303.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1303.m (revision 6088) @@ -35,5 +35,5 @@ set(gcf,'Color','w') printmodel('thermalconduction','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); - system(['mv thermalconduction.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Thermal ']); + system(['mv thermalconduction.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Thermal ']); end Index: /issm/trunk/test/NightlyRun/test1304.m =================================================================== --- /issm/trunk/test/NightlyRun/test1304.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1304.m (revision 6088) @@ -36,5 +36,5 @@ set(gcf,'Color','w') printmodel('thermalgeothermalflux','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); - system(['mv thermalgeothermalflux.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Thermal ']); + system(['mv thermalgeothermalflux.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Thermal ']); end Index: /issm/trunk/test/NightlyRun/test1401.m =================================================================== --- /issm/trunk/test/NightlyRun/test1401.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1401.m (revision 6088) @@ -16,5 +16,5 @@ set(gcf,'Color','w') printmodel('mesh1_yams1','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off'); - system(['mv mesh1_yams1.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']); + system(['mv mesh1_yams1.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']); end @@ -25,5 +25,5 @@ set(gcf,'Color','w') printmodel('mesh1_yams2','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off'); - system(['mv mesh1_yams2.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']); + system(['mv mesh1_yams2.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']); end @@ -34,5 +34,5 @@ set(gcf,'Color','w') printmodel('mesh1_yams3','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off'); - system(['mv mesh1_yams3.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']); + system(['mv mesh1_yams3.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']); end x1=md.x; @@ -46,5 +46,5 @@ set(gcf,'Color','w') printmodel('mesh1_bamg1','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off'); - system(['mv mesh1_bamg1.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']); + system(['mv mesh1_bamg1.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']); end @@ -56,5 +56,5 @@ set(gcf,'Color','w') printmodel('mesh1_bamg2','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off'); - system(['mv mesh1_bamg2.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']); + system(['mv mesh1_bamg2.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']); end @@ -66,5 +66,5 @@ set(gcf,'Color','w') printmodel('mesh1_bamg3','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off'); - system(['mv mesh1_bamg3.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']); + system(['mv mesh1_bamg3.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']); end x2=md.x; Index: /issm/trunk/test/NightlyRun/test1402.m =================================================================== --- /issm/trunk/test/NightlyRun/test1402.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test1402.m (revision 6088) @@ -18,5 +18,5 @@ set(gcf,'Color','w') printmodel('mesh2_yams1','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off'); - system(['mv mesh2_yams1.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']); + system(['mv mesh2_yams1.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']); end @@ -30,5 +30,5 @@ set(gcf,'Color','w') printmodel('mesh2_yams2','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off'); - system(['mv mesh2_yams2.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']); + system(['mv mesh2_yams2.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']); end @@ -42,5 +42,5 @@ set(gcf,'Color','w') printmodel('mesh2_yams3','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off'); - system(['mv mesh2_yams3.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']); + system(['mv mesh2_yams3.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']); end x1=md.x; @@ -57,5 +57,5 @@ set(gcf,'Color','w') printmodel('mesh2_bamg1','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off'); - system(['mv mesh2_bamg1.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']); + system(['mv mesh2_bamg1.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']); end @@ -70,5 +70,5 @@ set(gcf,'Color','w') printmodel('mesh2_bamg2','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off'); - system(['mv mesh2_bamg2.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']); + system(['mv mesh2_bamg2.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']); end @@ -83,5 +83,5 @@ set(gcf,'Color','w') printmodel('mesh2_bamg3','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off'); - system(['mv mesh2_bamg3.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']); + system(['mv mesh2_bamg3.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']); end @@ -96,5 +96,5 @@ set(gcf,'Color','w') printmodel('mesh2_bamgiso','png','margin','on','marginsize',25,'frame','off','resolution',1,'hardcopy','off'); - system(['mv mesh2_bamgiso.png ' ISSM_DIR '/../website/doc_pdf/validation/Images/Mesh/ ']); + system(['mv mesh2_bamgiso.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Mesh/ ']); end x2=md.x; Index: /issm/trunk/test/NightlyRun/test218.m =================================================================== --- /issm/trunk/test/NightlyRun/test218.m (revision 6087) +++ /issm/trunk/test/NightlyRun/test218.m (revision 6088) @@ -5,4 +5,5 @@ md=setelementstype(md,'macayeal','all'); md=SetParallel(md,3); + md=solve(md,'analysis_type',Transient3DSolutionEnum);