Index: /issm/trunk/configure.ac =================================================================== --- /issm/trunk/configure.ac (revision 24312) +++ /issm/trunk/configure.ac (revision 24313) @@ -2,5 +2,5 @@ #AUTOCONF -AC_INIT([Ice Sheet System Model (ISSM)],[4.15],[issm@jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure +AC_INIT([Ice Sheet System Model (ISSM)],[4.16],[issm@jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure AC_CONFIG_AUX_DIR([./aux-config]) #Put config files in aux-config AC_CONFIG_MACRO_DIR([m4]) #m4 macros are located in m4 Index: /issm/trunk/etc/environment.sh =================================================================== --- /issm/trunk/etc/environment.sh (revision 24312) +++ /issm/trunk/etc/environment.sh (revision 24313) @@ -1,4 +1,10 @@ -#ISSM_DIR and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...) - +# Modifies path-related envrionment variables based on which external packages +# have been installed. +# +# ISSM_DIR and ISSM_ARCH should have been defined already in your shell +# settings file (i.e. .bashrc, .cshrc). + +## Functions +# pathprepend(){ #{{{ if [ -d "$1" ] && [[ ":$PATH:" != *":$1:"* ]]; then @@ -22,50 +28,73 @@ } #}}} libpathprepend(){ #{{{ - if [ -d "$1" ] && [[ ":$LD_LIBRARY_PATH:" != *":$1:"* ]]; then - export LD_LIBRARY_PATH="$1:$LD_LIBRARY_PATH" - fi - if [ -d "$1" ] && [[ ":$LD_RUN_PATH:" != *":$1:"* ]]; then - export LD_RUN_PATH="$1:$LD_RUN_PATH" + if [ -d "$1" ]; then + if [ -z $LD_LIBRARY_PATH ]; then + export LD_LIBRARY_PATH="$1" + elif [[ ":$LD_LIBRARY_PATH:" != *":$1:"* ]]; then + export LD_LIBRARY_PATH="$1:$LD_LIBRARY_PATH" + fi + if [ -z $LD_RUN_PATH ]; then + export LD_RUN_PATH="$1" + elif [[ ":$LD_RUN_PATH:" != *":$1:"* ]]; then + export LD_RUN_PATH="$1:$LD_RUN_PATH" + fi fi } #}}} libpathappend(){ #{{{ - if [ -d "$1" ] && [[ ":$LD_LIBRARY_PATH:" != *":$1:"* ]]; then - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$1" - fi - if [ -d "$1" ] && [[ ":$LD_RUN_PATH:" != *":$1:"* ]]; then - export LD_RUN_PATH="$LD_RUN_PATH:$1" + if [ -d "$1" ]; then + if [ -z $LD_LIBRARY_PATH ]; then + export LD_LIBRARY_PATH=$1 + elif [[ ":$LD_LIBRARY_PATH:" != *":$1:"* ]]; then + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$1" + fi + if [ -z $LD_RUN_PATH ]; then + export LD_RUN_PATH=$1 + elif [[ ":$LD_RUN_PATH:" != *":$1:"* ]]; then + export LD_RUN_PATH="$LD_RUN_PATH:$1" + fi fi } #}}} dylibpathprepend(){ #{{{ - if [ -d "$1" ] && [[ ":$DYLD_LIBRARY_PATH:" != *":$1:"* ]]; then - export DYLD_LIBRARY_PATH="$1:$DYLD_LIBRARY_PATH" - fi - if [ -d "$1" ] && [[ ":$LD_RUN_PATH:" != *":$1:"* ]]; then - export LD_RUN_PATH="$1:$LD_RUN_PATH" + if [ -d "$1" ]; then + if [ -z $DYLD_LIBRARY_PATH ]; then + export DYLD_LIBRARY_PATH=$1 + elif [[ ":$DYLD_LIBRARY_PATH:" != *":$1:"* ]]; then + export DYLD_LIBRARY_PATH="$1:$DYLD_LIBRARY_PATH" + fi + if [ -z $LD_RUN_PATH ]; then + export LD_RUN_PATH=$1 + elif [[ ":$LD_RUN_PATH:" != *":$1:"* ]]; then + export LD_RUN_PATH="$1:$LD_RUN_PATH" + fi fi } #}}} dylibpathappend(){ #{{{ - if [ -d "$1" ] && [[ ":$DYLD_LIBRARY_PATH:" != *":$1:"* ]]; then - export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$1" - fi - if [ -d "$1" ] && [[ ":$LD_RUN_PATH:" != *":$1:"* ]]; then - export LD_RUN_PATH="$LD_RUN_PATH:$1" - fi -} #}}} - -#FIXME: during installation packages are installed one by one but environment.sh was sourced -#before so new packages are NOT in the path. -#may resource environment.sh with: -#if [ -z $(echo "$PATH" | grep "$MATLAB_DIR") ]; then export $PATH...; fi - -#Windows compilers: + if [ -d "$1" ]; then + if [ -z $DYLD_LIBRARY_PATH ]; then + export DYLD_LIBRARY_PATH=$1 + elif [[ ":$DYLD_LIBRARY_PATH:" != *":$1:"* ]]; then + export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$1" + fi + if [ -z $LD_RUN_PATH ]; then + export LD_RUN_PATH=$1 + elif [[ ":$LD_RUN_PATH:" != *":$1:"* ]]; then + export LD_RUN_PATH="$LD_RUN_PATH:$1" + fi + fi +} #}}} + +# FIXME: during installation packages are installed one by one but +# environment.sh was sourced before so new packages are NOT in the path. May +# source environment.sh again with: +# if [ -z $(echo "$PATH" | grep "$MATLAB_DIR") ]; then export $PATH...; fi + +# Windows compilers: if [[ "$ISSM_ARCH" == "cygwin-intel" ]]; then source $ISSM_DIR/externalpackages/windows/windows_environment.sh fi -#Load ISSM scripts +# Load ISSM scripts pathappend "$ISSM_DIR/scripts" -#GMT GMT_DIR="$ISSM_DIR/externalpackages/gmt/install" if [ -d "$GMT_DIR" ]; then @@ -117,4 +146,7 @@ VALGRIND_DIR="$ISSM_DIR/externalpackages/valgrind/install" pathprepend "$VALGRIND_DIR/bin" + +NCO_DIR="$ISSM_DIR/externalpackages/nco/install/bin" +pathprepend "$NCO_DIR/bin" CPPCHECK_DIR="$ISSM_DIR/externalpackages/cppcheck/install" Index: /issm/trunk/examples/LcurveAnalysis/DomainOutline.exp =================================================================== --- /issm/trunk/examples/LcurveAnalysis/DomainOutline.exp (revision 24313) +++ /issm/trunk/examples/LcurveAnalysis/DomainOutline.exp (revision 24313) @@ -0,0 +1,10 @@ +## Name:DomainOutline +## Icon:0 +# Points Count Value +5 1.000000 +# X pos Y pos +0 0 +1000000 0 +1000000 1000000 +0 1000000 +0 0 Index: /issm/trunk/examples/LcurveAnalysis/Front.exp =================================================================== --- /issm/trunk/examples/LcurveAnalysis/Front.exp (revision 24313) +++ /issm/trunk/examples/LcurveAnalysis/Front.exp (revision 24313) @@ -0,0 +1,10 @@ +## Name:icefront +## Icon:0 +# Points Count Value +5 1. +# X pos Y pos +-1000 900000 +-1000 1100000 +1100000 1100000 +1100000 900000 +-1000 900000 Index: /issm/trunk/examples/LcurveAnalysis/Square.par =================================================================== --- /issm/trunk/examples/LcurveAnalysis/Square.par (revision 24313) +++ /issm/trunk/examples/LcurveAnalysis/Square.par (revision 24313) @@ -0,0 +1,24 @@ +%Start defining model parameters here + +disp(' creating thickness'); +hmin = 300; +hmax = 1000; +ymin = min(md.mesh.y); +ymax = max(md.mesh.y); +md.geometry.thickness = hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin); +md.geometry.base = -md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; +md.geometry.surface = md.geometry.base+md.geometry.thickness; + +disp(' creating drag'); +md.friction.coefficient=200*ones(md.mesh.numberofvertices,1); +md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.; +md.friction.p = ones(md.mesh.numberofelements,1); +md.friction.q = ones(md.mesh.numberofelements,1); + +disp(' creating flow law paramter'); +md.materials.rheology_B=1.8*10^8*ones(md.mesh.numberofvertices,1); +md.materials.rheology_B(find(md.mesh.x reverse_iterator rbegin(){return boost::make_reverse_iterator(end());} Index: /issm/trunk/externalpackages/boost/install-1.49-linux.sh =================================================================== --- /issm/trunk/externalpackages/boost/install-1.49-linux.sh (revision 24312) +++ /issm/trunk/externalpackages/boost/install-1.49-linux.sh (revision 24313) @@ -13,5 +13,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/boost_1_49_0.tar.gz' 'boost_1_49_0.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/boost_1_49_0.tar.gz' 'boost_1_49_0.tar.gz' #Untar Index: /issm/trunk/externalpackages/boost/install-1.49-macosx-snowleopard.sh =================================================================== --- /issm/trunk/externalpackages/boost/install-1.49-macosx-snowleopard.sh (revision 24312) +++ /issm/trunk/externalpackages/boost/install-1.49-macosx-snowleopard.sh (revision 24313) @@ -12,5 +12,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/boost_1_49_0.tar.gz' 'boost_1_49_0.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/boost_1_49_0.tar.gz' 'boost_1_49_0.tar.gz' #Untar Index: /issm/trunk/externalpackages/boost/install-1.55-discover.sh =================================================================== --- /issm/trunk/externalpackages/boost/install-1.55-discover.sh (revision 24312) +++ /issm/trunk/externalpackages/boost/install-1.55-discover.sh (revision 24313) @@ -13,5 +13,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' #Untar Index: /issm/trunk/externalpackages/boost/install-1.55-linux.sh =================================================================== --- /issm/trunk/externalpackages/boost/install-1.55-linux.sh (revision 24312) +++ /issm/trunk/externalpackages/boost/install-1.55-linux.sh (revision 24313) @@ -14,5 +14,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' #Untar Index: /issm/trunk/externalpackages/boost/install-1.55-lonestar.sh =================================================================== --- /issm/trunk/externalpackages/boost/install-1.55-lonestar.sh (revision 24312) +++ /issm/trunk/externalpackages/boost/install-1.55-lonestar.sh (revision 24313) @@ -13,5 +13,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' #Untar @@ -37,2 +37,6 @@ mkdir ../install/bin cp bjam ../install/bin + +cd ../ + +patch install/include/boost/multi_index/ordered_index.hpp ./configs/1.55/ordered_index.hpp.patch Index: /issm/trunk/externalpackages/boost/install-1.55-macosx-el_capitan.sh =================================================================== --- /issm/trunk/externalpackages/boost/install-1.55-macosx-el_capitan.sh (revision 24312) +++ /issm/trunk/externalpackages/boost/install-1.55-macosx-el_capitan.sh (revision 24313) @@ -2,9 +2,9 @@ set -eu -#Note of caution: stop after boostrap phase, and run -#bjam --debug-configuration, to figure out which paths boost is using to include -#python. make sure everyone of these paths is covered by python. If not, just make -#symlinks in externalpackages/python to what boost is expecting. Ther is NO WAY -#to get the boost library to include python support without doing that. +#Note of caution: stop after boostrap phase, and run +#bjam --debug-configuration, to figure out which paths boost is using to include +#python. make sure everyone of these paths is covered by python. If not, just make +#symlinks in externalpackages/python to what boost is expecting. Ther is NO WAY +#to get the boost library to include python support without doing that. #Some cleanup @@ -13,7 +13,7 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' -#Untar +#Untar tar -zxvf boost_1_55_0.tar.gz @@ -29,16 +29,16 @@ #Configure and compile -cd src +cd src ./bootstrap.sh \ --prefix="$ISSM_DIR/externalpackages/boost/install" \ - --with-python=python + --with-python=python #Compile boost # Need gcc with iconv installed in a location that has been added to your path -# export CC=/usr/local/gfortan/bin/gcc +# export CC=/usr/local/gfortan/bin/gcc # export CXX=/usr/local/gfortran/bin/g++ ./bjam toolset=darwin link=static install -#put bjam into install also: +#put bjam into install also: mkdir ../install/bin cp bjam ../install/bin Index: /issm/trunk/externalpackages/boost/install-1.55-macosx-mavericks.sh =================================================================== --- /issm/trunk/externalpackages/boost/install-1.55-macosx-mavericks.sh (revision 24312) +++ /issm/trunk/externalpackages/boost/install-1.55-macosx-mavericks.sh (revision 24313) @@ -13,5 +13,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' #Untar Index: /issm/trunk/externalpackages/boost/install-1.55-macosx-snowleopard.sh =================================================================== --- /issm/trunk/externalpackages/boost/install-1.55-macosx-snowleopard.sh (revision 24312) +++ /issm/trunk/externalpackages/boost/install-1.55-macosx-snowleopard.sh (revision 24313) @@ -13,5 +13,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' #Untar Index: /issm/trunk/externalpackages/boost/install-1.55-macosx-yosemite.sh =================================================================== --- /issm/trunk/externalpackages/boost/install-1.55-macosx-yosemite.sh (revision 24312) +++ /issm/trunk/externalpackages/boost/install-1.55-macosx-yosemite.sh (revision 24313) @@ -13,5 +13,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' #Untar Index: /issm/trunk/externalpackages/boost/install-1.55-pleiades.sh =================================================================== --- /issm/trunk/externalpackages/boost/install-1.55-pleiades.sh (revision 24312) +++ /issm/trunk/externalpackages/boost/install-1.55-pleiades.sh (revision 24313) @@ -13,5 +13,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' #Untar Index: /issm/trunk/externalpackages/boost/install-1.55-stallo.sh =================================================================== --- /issm/trunk/externalpackages/boost/install-1.55-stallo.sh (revision 24313) +++ /issm/trunk/externalpackages/boost/install-1.55-stallo.sh (revision 24313) @@ -0,0 +1,45 @@ +#!/bin/bash +set -eu + +#Note of caution: stop after boostrap phase, and run +#bjam --debug-configuration, to figure out which paths boost is using to include +#python. make sure everyone of these paths is covered by python. If not, just make +#symlinks in externalpackages/python to what boost is expecting. Ther is NO WAY +#to get the boost library to include python support without doing that. + +#Some cleanup +rm -rf install boost_1_55_0 src +mkdir install src + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz' + +#Untar +tar -zxvf boost_1_55_0.tar.gz + +#Move boost into install directory +mv boost_1_55_0/* src +rm -rf boost_1_55_0 + +patch src/boost/mpl/aux_/config/adl.hpp ./configs/1.55/adl.hpp.patch + +#Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost +#export PATH="/usr/bin":$PATH +export CXXFLAGS='-std=c++98' +export CC=mpicc +export CXX=mpicxx + +#Configure and compile +cd src +./bootstrap.sh \ + --prefix="$ISSM_DIR/externalpackages/boost/install" \ + --with-python=python3.2 + +#Compile boost +#./bjam install +./bjam install + +#put bjam into install also: +mkdir ../install/bin +cp bjam ../install/bin + Index: /issm/trunk/externalpackages/bsdtar/install-win7.sh =================================================================== --- /issm/trunk/externalpackages/bsdtar/install-win7.sh (revision 24312) +++ /issm/trunk/externalpackages/bsdtar/install-win7.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/libarchive-3.0.3.tar.gz' 'libarchive-3.0.3.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/libarchive-3.0.3.tar.gz' 'libarchive-3.0.3.tar.gz' #Untar Index: /issm/trunk/externalpackages/cccl/install-win7.orig.sh =================================================================== --- /issm/trunk/externalpackages/cccl/install-win7.orig.sh (revision 24312) +++ /issm/trunk/externalpackages/cccl/install-win7.orig.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/cccl-0.03.tar.gz' 'cccl-0.03.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/cccl-0.03.tar.gz' 'cccl-0.03.tar.gz' #Untar Index: /issm/trunk/externalpackages/chaco/install-macosx64-sierra.sh =================================================================== --- /issm/trunk/externalpackages/chaco/install-macosx64-sierra.sh (revision 24312) +++ /issm/trunk/externalpackages/chaco/install-macosx64-sierra.sh (revision 24313) @@ -9,6 +9,6 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Chaco-2.2.tar.gz' 'Chaco-2.2.tar.gz' -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/docs/chaco_guide.pdf' 'chaco_guide.pdf' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Chaco-2.2.tar.gz' 'Chaco-2.2.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/docs/chaco_guide.pdf' 'chaco_guide.pdf' # Untar Index: /issm/trunk/externalpackages/chaco/install-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/chaco/install-macosx64.sh (revision 24312) +++ /issm/trunk/externalpackages/chaco/install-macosx64.sh (revision 24313) @@ -9,6 +9,6 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Chaco-2.2.tar.gz' 'Chaco-2.2.tar.gz' -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/docs/chaco_guide.pdf' 'chaco_guide.pdf' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Chaco-2.2.tar.gz' 'Chaco-2.2.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/docs/chaco_guide.pdf' 'chaco_guide.pdf' # Untar Index: /issm/trunk/externalpackages/chaco/install.sh =================================================================== --- /issm/trunk/externalpackages/chaco/install.sh (revision 24312) +++ /issm/trunk/externalpackages/chaco/install.sh (revision 24313) @@ -9,6 +9,6 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Chaco-2.2.tar.gz' 'Chaco-2.2.tar.gz' -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/docs/chaco_guide.pdf' 'chaco_guide.pdf' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Chaco-2.2.tar.gz' 'Chaco-2.2.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/docs/chaco_guide.pdf' 'chaco_guide.pdf' # Untar Index: /issm/trunk/externalpackages/cmake/configs/MacOS/High_Sierra/Source/CPack/cmCPackDragNDropGenerator.cxx.patch =================================================================== --- /issm/trunk/externalpackages/cmake/configs/MacOS/High_Sierra/Source/CPack/cmCPackDragNDropGenerator.cxx.patch (revision 24313) +++ /issm/trunk/externalpackages/cmake/configs/MacOS/High_Sierra/Source/CPack/cmCPackDragNDropGenerator.cxx.patch (revision 24313) @@ -0,0 +1,9 @@ +--- Source/CPack/cmCPackDragNDropGenerator.cxx_orig 2017-08-29 08:45:50.000000000 +0200 ++++ Source/CPack/cmCPackDragNDropGenerator.cxx 2017-08-29 08:46:04.000000000 +0200 +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + #include Index: /issm/trunk/externalpackages/cmake/configs/MacOS/High_Sierra/Utilities/cmcurl/CMakeLists.txt.patch =================================================================== --- /issm/trunk/externalpackages/cmake/configs/MacOS/High_Sierra/Utilities/cmcurl/CMakeLists.txt.patch (revision 24313) +++ /issm/trunk/externalpackages/cmake/configs/MacOS/High_Sierra/Utilities/cmcurl/CMakeLists.txt.patch (revision 24313) @@ -0,0 +1,11 @@ +--- Utilities/cmcurl/CMakeLists.txt_orig 2017-08-29 08:37:31.000000000 +0200 ++++ Utilities/cmcurl/CMakeLists.txt 2017-08-29 08:37:55.000000000 +0200 +@@ -50,7 +50,7 @@ + ) + endif() + if(NOT OSX_VERSION VERSION_LESS 10.6 AND +- CMAKE_C_COMPILER_ID MATCHES "GNU|Clang|AppleClang") ++ CMAKE_C_COMPILER_ID MATCHES "Clang|AppleClang") + set(CMAKE_USE_DARWINSSL ON CACHE INTERNAL "enable Apple OS native SSL/TLS") + else() + set(CMAKE_USE_DARWINSSL OFF CACHE INTERNAL "enable Apple OS native SSL/TLS") Index: /issm/trunk/externalpackages/cmake/install-macosx64-highsierra.sh =================================================================== --- /issm/trunk/externalpackages/cmake/install-macosx64-highsierra.sh (revision 24313) +++ /issm/trunk/externalpackages/cmake/install-macosx64-highsierra.sh (revision 24313) @@ -0,0 +1,28 @@ +#!/bin/bash +set -eu +VER="3.14.5" + +#Some cleanup +rm -rf install cmake-$VER.tar.gz +mkdir install + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/cmake-$VER.tar.gz" "cmake-$VER.tar.gz" + +#Untar +tar -zxvf cmake-$VER.tar.gz + +#Move cmake into install directory +mv cmake-$VER/* install +rm -rf cmake-$VER + +#Compile cmake +cd install +./bootstrap --prefix=$ISSM_DIR/externalpackages/cmake/install + +if [ $# -eq 0 ]; then + make +else + make -j $1; +fi +make install Index: /issm/trunk/externalpackages/cmake/install-macosx64-snowleopard.sh =================================================================== --- /issm/trunk/externalpackages/cmake/install-macosx64-snowleopard.sh (revision 24312) +++ /issm/trunk/externalpackages/cmake/install-macosx64-snowleopard.sh (revision 24313) @@ -8,5 +8,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/cmake-$VER.tar.gz" "cmake-$VER.tar.gz" +$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/cmake-$VER.tar.gz" "cmake-$VER.tar.gz" #Untar Index: /issm/trunk/externalpackages/cmake/install.sh =================================================================== --- /issm/trunk/externalpackages/cmake/install.sh (revision 24312) +++ /issm/trunk/externalpackages/cmake/install.sh (revision 24313) @@ -8,5 +8,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/cmake-$VER.tar.gz" "cmake-$VER.tar.gz" +$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/cmake-$VER.tar.gz" "cmake-$VER.tar.gz" #Untar Index: /issm/trunk/externalpackages/colpack/install.sh =================================================================== --- /issm/trunk/externalpackages/colpack/install.sh (revision 24312) +++ /issm/trunk/externalpackages/colpack/install.sh (revision 24313) @@ -6,5 +6,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/ColPack-1.0.3.tar.gz' 'ColPack-1.0.3.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/ColPack-1.0.3.tar.gz' 'ColPack-1.0.3.tar.gz' #install directory Index: /issm/trunk/externalpackages/cppcheck/install.sh =================================================================== --- /issm/trunk/externalpackages/cppcheck/install.sh (revision 24312) +++ /issm/trunk/externalpackages/cppcheck/install.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/cppcheck-1.48.tar' 'cppcheck-1.48.tar' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/cppcheck-1.48.tar' 'cppcheck-1.48.tar' tar -xvf cppcheck-1.48.tar Index: /issm/trunk/externalpackages/curl/install-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/curl/install-macosx64.sh (revision 24312) +++ /issm/trunk/externalpackages/curl/install-macosx64.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/curl-7.39.0.tar.gz' 'curl-7.39.0.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/curl-7.39.0.tar.gz' 'curl-7.39.0.tar.gz' #Untar Index: /issm/trunk/externalpackages/cvs/install.sh =================================================================== --- /issm/trunk/externalpackages/cvs/install.sh (revision 24312) +++ /issm/trunk/externalpackages/cvs/install.sh (revision 24313) @@ -9,5 +9,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/cvs-1.11.23.tar.gz' 'cvs-1.11.23.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/cvs-1.11.23.tar.gz' 'cvs-1.11.23.tar.gz' #Untar Index: /issm/trunk/externalpackages/cython/install-18.sh =================================================================== --- /issm/trunk/externalpackages/cython/install-18.sh (revision 24312) +++ /issm/trunk/externalpackages/cython/install-18.sh (revision 24313) @@ -6,5 +6,5 @@ #download numpy first -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Cython-0.18.tar.gz' 'cython.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Cython-0.18.tar.gz' 'cython.tar.gz' #install numpy Index: /issm/trunk/externalpackages/cython/install-19.2.sh =================================================================== --- /issm/trunk/externalpackages/cython/install-19.2.sh (revision 24312) +++ /issm/trunk/externalpackages/cython/install-19.2.sh (revision 24313) @@ -6,5 +6,5 @@ #download numpy first -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Cython-0.19.2.tar.gz' 'cython.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Cython-0.19.2.tar.gz' 'cython.tar.gz' #install numpy Index: /issm/trunk/externalpackages/cython/install-22.sh =================================================================== --- /issm/trunk/externalpackages/cython/install-22.sh (revision 24312) +++ /issm/trunk/externalpackages/cython/install-22.sh (revision 24313) @@ -6,5 +6,5 @@ #download numpy first -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Cython-0.22.tar.gz' 'cython.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Cython-0.22.tar.gz' 'cython.tar.gz' #install numpy Index: /issm/trunk/externalpackages/cython/install-26.sh =================================================================== --- /issm/trunk/externalpackages/cython/install-26.sh (revision 24312) +++ /issm/trunk/externalpackages/cython/install-26.sh (revision 24313) @@ -6,5 +6,5 @@ #download numpy first -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Cython-0.26.tar.gz' 'cython.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Cython-0.26.tar.gz' 'cython.tar.gz' #install numpy Index: /issm/trunk/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.aurora.patch =================================================================== --- /issm/trunk/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.aurora.patch (revision 24313) +++ /issm/trunk/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.aurora.patch (revision 24313) @@ -0,0 +1,38 @@ +54,55c54,55 +< #set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} " +< # CACHE STRING "CXX Flags for my platform" ) +--- +> set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMPICH_IGNORE_CXX_SEEK" +> CACHE STRING "CXX Flags for my platform" ) +67a68,78 +> set( DAKOTA_HAVE_MPI ON +> CACHE BOOL "Always build with MPI enabled" FORCE) +> set( MPI_INCLUDE_PATH +> "$ENV{ISSM_DIR}/externalpackages/mpich/install/include" +> CACHE FILEPATH "Use installed MPI headers" FORCE) +> set( MPI_LIBRARY +> "$ENV{ISSM_DIR}/externalpackages/mpich/install/lib/libmpich.so" +> CACHE FILEPATH "Use installed MPI library" FORCE) +> set( MPI_EXTRA_LIBRARY +> "$ENV{ISSM_DIR}/externalpackages/mpich/install/lib/libmpich.so" +> CACHE FILEPATH "Use MPI extra libraries" FORCE) +73,77c73,77 +< #set(BOOST_ROOT +< # "path/to/custom/Boost/install/directory" +< # CACHE PATH "Use non-standard Boost install" FORCE) +< #set( Boost_NO_SYSTEM_PATHS TRUE +< # CACHE BOOL "Supress search paths other than BOOST_ROOT" FORCE) +--- +> set(BOOST_ROOT +> "$ENV{ISSM_DIR}/externalpackages/boost/install" +> CACHE PATH "Use non-standard Boost install" FORCE) +> set( Boost_NO_SYSTEM_PATHS TRUE +> CACHE BOOL "Supress search paths other than BOOST_ROOT" FORCE) +91,93c91,93 +< #set( CMAKE_INSTALL_PREFIX +< # "/path/to/Dakota/installation" +< # CACHE PATH "Path to Dakota installation" ) +--- +> set( CMAKE_INSTALL_PREFIX +> "$ENV{ISSM_DIR}/externalpackages/dakota/install" +> CACHE PATH "Path to Dakota installation" ) Index: /issm/trunk/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.stallo.patch =================================================================== --- /issm/trunk/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.stallo.patch (revision 24313) +++ /issm/trunk/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.stallo.patch (revision 24313) @@ -0,0 +1,42 @@ +52,55c52,55 +< #set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} " +< # CACHE STRING "C Flags my platform" ) +< #set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} " +< # CACHE STRING "CXX Flags for my platform" ) +--- +> set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -L/lib64/libc.so.6 -L/lib64/ -lpthread -ldl -lm" +> CACHE STRING "C Flags my platform" ) +> set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -L/lib64/libc.so.6 -L/lib64/ -lpthread -ldl -lm" +> CACHE STRING "CXX Flags for my platform" ) +67a68,78 +> set( DAKOTA_HAVE_MPI ON +> CACHE BOOL "Always build with MPI enabled" FORCE) +> set( MPI_INCLUDE_PATH +> "/global/hds/software/cpu/eb3/impi/5.0.3.048-iccifort-2015.3.187-GNU-4.9.3-2.25/include64/" +> CACHE FILEPATH "Use installed MPI headers" FORCE) +> set( MPI_LIBRARY +> "/global/hds/software/cpu/eb3/impi/5.0.3.048-iccifort-2015.3.187-GNU-4.9.3-2.25/lib64/libmpi.so" +> CACHE FILEPATH "Use installed MPI library" FORCE) +> set( MPI_EXTRA_LIBRARY +> "/global/hds/software/cpu/eb3/impi/5.0.3.048-iccifort-2015.3.187-GNU-4.9.3-2.25/lib64/libmpi.so" +> CACHE FILEPATH "Use MPI extra libraries" FORCE) +73,77c84,88 +< #set(BOOST_ROOT +< # "path/to/custom/Boost/install/directory" +< # CACHE PATH "Use non-standard Boost install" FORCE) +< #set( Boost_NO_SYSTEM_PATHS TRUE +< # CACHE BOOL "Supress search paths other than BOOST_ROOT" FORCE) +--- +> set(BOOST_ROOT +> "$ENV{ISSM_DIR}/externalpackages/boost/install" +> CACHE PATH "Use non-standard Boost install" FORCE) +> set( Boost_NO_SYSTEM_PATHS TRUE +> CACHE BOOL "Supress search paths other than BOOST_ROOT" FORCE) +91,93c102,104 +< #set( CMAKE_INSTALL_PREFIX +< # "/path/to/Dakota/installation" +< # CACHE PATH "Path to Dakota installation" ) +--- +> set( CMAKE_INSTALL_PREFIX +> "$ENV{ISSM_DIR}/externalpackages/dakota/install" +> CACHE PATH "Path to Dakota installation" ) Index: /issm/trunk/externalpackages/dakota/configs/6.2/CMakeLists.txt.aurora.patch =================================================================== --- /issm/trunk/externalpackages/dakota/configs/6.2/CMakeLists.txt.aurora.patch (revision 24313) +++ /issm/trunk/externalpackages/dakota/configs/6.2/CMakeLists.txt.aurora.patch (revision 24313) @@ -0,0 +1,6 @@ +156c153,155 +< # TODO: Can't this be integrated into the following logic? +--- +> # TODO: Can't this be integrated into the following logic? +> set(BLAS_LIBS "-L/opt/intel/composer_xe_2013.5.192/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm") +> set(LAPACK_LIBS "-L/opt/intel/composer_xe_2013.5.192/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm") Index: /issm/trunk/externalpackages/dakota/configs/6.2/CMakeLists.txt.lonestar.patch =================================================================== --- /issm/trunk/externalpackages/dakota/configs/6.2/CMakeLists.txt.lonestar.patch (revision 24312) +++ /issm/trunk/externalpackages/dakota/configs/6.2/CMakeLists.txt.lonestar.patch (revision 24313) @@ -3,4 +3,4 @@ --- > # TODO: Can't this be integrated into the following logic? -> set(BLAS_LIBS "-L/opt/apps/intel/11.1/mkl/lib/em64t/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm") -> set(LAPACK_LIBS "-L/opt/apps/intel/11.1/mkl/lib/em64t/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm") +> set(BLAS_LIBS "-L$TACC_MKL_LIB -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm") +> set(LAPACK_LIBS "-L$TACC_MKL_LIB -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm") Index: /issm/trunk/externalpackages/dakota/configs/6.2/CMakeLists.txt.stallo.patch =================================================================== --- /issm/trunk/externalpackages/dakota/configs/6.2/CMakeLists.txt.stallo.patch (revision 24313) +++ /issm/trunk/externalpackages/dakota/configs/6.2/CMakeLists.txt.stallo.patch (revision 24313) @@ -0,0 +1,9 @@ +229c229,231 +< option(BUILD_SHARED_LIBS "Build shared libraries?" ON) +--- +> option(BUILD_SHARED_LIBS "Build shared libraries?" ON) +> find_package(Threads) +> +237a240,241 +> set(BLAS_LIBS "-Wl,--no-as-needed -L/global/hds/software/cpu/eb3/imkl/11.2.3.187-iimpi-7.3.5-GNU-4.9.3-2.25/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/lib64/libc.so.6 -L/lib64/ -lpthread -lm -ldl") +> set(LAPACK_LIBS "-Wl,--no-as-needed -L/global/hds/software/cpu/eb3/imkl/11.2.3.187-iimpi-7.3.5-GNU-4.9.3-2.25/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/lib64/libc.so.6 -L/lib64/ -lpthread -lm -ldl") Index: /issm/trunk/externalpackages/dakota/configs/6.2/DakotaInterface.patch =================================================================== --- /issm/trunk/externalpackages/dakota/configs/6.2/DakotaInterface.patch (revision 24313) +++ /issm/trunk/externalpackages/dakota/configs/6.2/DakotaInterface.patch (revision 24313) @@ -0,0 +1,16 @@ +112c112 +< Cerr << "\nError: failure opening " << ampl_col << std::endl; +--- +> Cerr << "\nError: failure opening " << col.c_str() << std::endl; +121c121 +< Cerr << "\nError: failure reading AMPL col file " << ampl_col +--- +> Cerr << "\nError: failure reading AMPL col file " << col.c_str() +129c129 +< Cerr << "\nError: failure opening " << ampl_row << std::endl; +--- +> Cerr << "\nError: failure opening " << row.c_str() << std::endl; +142c142 +< Cerr << "\nError: failure reading AMPL row file " << ampl_row +--- +> Cerr << "\nError: failure reading AMPL row file " << row.c_str() Index: /issm/trunk/externalpackages/dakota/configs/6.2/MainEffectsExcelOutput.patch =================================================================== --- /issm/trunk/externalpackages/dakota/configs/6.2/MainEffectsExcelOutput.patch (revision 24313) +++ /issm/trunk/externalpackages/dakota/configs/6.2/MainEffectsExcelOutput.patch (revision 24313) @@ -0,0 +1,4 @@ +276c276 +< std::cout << ss << std::endl; +--- +> std::cout << ss.str() << std::endl; Index: /issm/trunk/externalpackages/dakota/configs/6.2/NKM_KrigingModel.patch =================================================================== --- /issm/trunk/externalpackages/dakota/configs/6.2/NKM_KrigingModel.patch (revision 24313) +++ /issm/trunk/externalpackages/dakota/configs/6.2/NKM_KrigingModel.patch (revision 24313) @@ -0,0 +1,6 @@ +9d8 +< +86c85 +< << "has not been implemented." << std::cerr; +--- +> << "has not been implemented." << std::endl; Index: /issm/trunk/externalpackages/dakota/install-4.2-altix64-cosmos.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-4.2-altix64-cosmos.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-4.2-altix64-cosmos.sh (revision 24313) @@ -9,5 +9,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-4.2-discover.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-4.2-discover.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-4.2-discover.sh (revision 24313) @@ -9,5 +9,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-4.2-linux64-cloud.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-4.2-linux64-cloud.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-4.2-linux64-cloud.sh (revision 24313) @@ -9,5 +9,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-4.2-linux64-murdo.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-4.2-linux64-murdo.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-4.2-linux64-murdo.sh (revision 24313) @@ -9,5 +9,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-4.2-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-4.2-macosx64.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-4.2-macosx64.sh (revision 24313) @@ -9,5 +9,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-5.2-discover.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-5.2-discover.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-5.2-discover.sh (revision 24313) @@ -9,5 +9,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_5_2.src.tar.gz' 'Dakota_5_2.src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Dakota_5_2.src.tar.gz' 'Dakota_5_2.src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-5.2-linux64-caladan.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-5.2-linux64-caladan.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-5.2-linux64-caladan.sh (revision 24313) @@ -9,5 +9,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_5_2.src.tar.gz' 'Dakota_5_2.src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Dakota_5_2.src.tar.gz' 'Dakota_5_2.src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-5.2-linux64-larsen.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-5.2-linux64-larsen.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-5.2-linux64-larsen.sh (revision 24313) @@ -9,5 +9,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_5_2.src.tar.gz' 'Dakota_5_2.src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Dakota_5_2.src.tar.gz' 'Dakota_5_2.src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-5.2-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-5.2-macosx64.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-5.2-macosx64.sh (revision 24313) @@ -9,5 +9,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_5_2.src.tar.gz' 'Dakota_5_2.src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/Dakota_5_2.src.tar.gz' 'Dakota_5_2.src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-5.3.1-linux64-caladan.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-5.3.1-linux64-caladan.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-5.3.1-linux64-caladan.sh (revision 24313) @@ -10,5 +10,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-5.3.1-public-src.tar.gz' 'dakota-5.3.1-public-src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-5.3.1-public-src.tar.gz' 'dakota-5.3.1-public-src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-5.3.1-linux64.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-5.3.1-linux64.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-5.3.1-linux64.sh (revision 24313) @@ -10,5 +10,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-5.3.1-public-src.tar.gz' 'dakota-5.3.1-public-src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-5.3.1-public-src.tar.gz' 'dakota-5.3.1-public-src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-5.3.1-lonestar.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-5.3.1-lonestar.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-5.3.1-lonestar.sh (revision 24313) @@ -10,5 +10,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-5.3.1-public-src.tar.gz' 'dakota-5.3.1-public-src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-5.3.1-public-src.tar.gz' 'dakota-5.3.1-public-src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-5.3.1-macosx64-snowleopard.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-5.3.1-macosx64-snowleopard.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-5.3.1-macosx64-snowleopard.sh (revision 24313) @@ -10,5 +10,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-5.3.1-public-src.tar.gz' 'dakota-5.3.1-public-src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-5.3.1-public-src.tar.gz' 'dakota-5.3.1-public-src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-5.3.1-macosx64-yosemite.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-5.3.1-macosx64-yosemite.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-5.3.1-macosx64-yosemite.sh (revision 24313) @@ -10,5 +10,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-5.3.1-public-src.tar.gz' 'dakota-5.3.1-public-src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-5.3.1-public-src.tar.gz' 'dakota-5.3.1-public-src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-5.3.1-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-5.3.1-macosx64.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-5.3.1-macosx64.sh (revision 24313) @@ -10,5 +10,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-5.3.1-public-src.tar.gz' 'dakota-5.3.1-public-src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-5.3.1-public-src.tar.gz' 'dakota-5.3.1-public-src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-6.2-aurora.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-6.2-aurora.sh (revision 24313) +++ /issm/trunk/externalpackages/dakota/install-6.2-aurora.sh (revision 24313) @@ -0,0 +1,58 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf Dakota +rm -rf src +rm -rf build +rm -rf install +mkdir src build install + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' + +#Untar +tar -zxvf dakota-6.2-public-src.tar.gz + +#Move Dakota to src directory +mv dakota-6.2.0.src/* src +rm -rf dakota-6.2.0.src + +#Set up Dakota cmake variables and config +export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src +export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build +export MPIHOME=$ISSM_DIR/externalpackages/mpich/install +cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake +patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.aurora.patch +patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch +patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.aurora.patch + +#Apply patches +patch src/src/NonDSampling.cpp configs/6.2/NonDSampling.cpp.patch +patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch +patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch + +#Configure dakota +cd $DAK_BUILD + +cmake -D CMAKE_C_COMPILER=/opt/intel/impi/4.1.3/intel64/bin/mpicc \ + -D CMAKE_CXX_COMPILER=/opt/intel/impi/4.1.3/intel64/bin/mpicxx \ + -D CMAKE_Fortran_COMPILER=/usr/bin/gfortran \ + -DHAVE_ACRO=off \ + -DHAVE_JEGA=off \ + -C $DAK_SRC/cmake/BuildDakotaCustom.cmake \ + -C $DAK_SRC/cmake/DakotaDev.cmake \ + $DAK_SRC +cd .. + +#Compile and install dakota +cd $DAK_BUILD +if [ $# -eq 0 ]; +then + make + make install +else + make -j $1 + make -j $1 install +fi +cd .. Index: /issm/trunk/externalpackages/dakota/install-6.2-intel15-discover.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-6.2-intel15-discover.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-6.2-intel15-discover.sh (revision 24313) @@ -10,5 +10,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-6.2-intel16-discover.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-6.2-intel16-discover.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-6.2-intel16-discover.sh (revision 24313) @@ -10,5 +10,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-6.2-linux64.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-6.2-linux64.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-6.2-linux64.sh (revision 24313) @@ -10,5 +10,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-6.2-lonestar.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-6.2-lonestar.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-6.2-lonestar.sh (revision 24313) @@ -10,5 +10,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' #Untar @@ -22,5 +22,6 @@ export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build -export MPIHOME=/opt/cray/mpt/default/gni/mpich-intel/14.0/ +export MPIHOME=/opt/cray/pe/mpt/7.7.3/gni/mpich-intel/16.0/ + cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.patch @@ -32,11 +33,15 @@ patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch +patch src/packages/surfpack/src/surfaces/nkm/NKM_KrigingModel.cpp configs/6.2/NKM_KrigingModel.patch +patch src/packages/DDACE/src/Analyzer/MainEffectsExcelOutput.cpp configs/6.2/MainEffectsExcelOutput.patch +patch src/src/DakotaInterface.cpp configs/6.2/DakotaInterface.patch #Configure dakota cd $DAK_BUILD -cmake -D CMAKE_C_COMPILER=/opt/apps/intel16/cray_mpich/7.3.0/bin/mpicc \ - -D CMAKE_CXX_COMPILER=/opt/apps/intel16/cray_mpich/7.3.0/bin/mpicxx \ - -D CMAKE_Fortran_COMPILER=/opt/apps/intel16/cray_mpich/7.3.0/bin/mpif77 \ +cmake -D CMAKE_C_COMPILER=mpicc \ + -D CMAKE_CXX_COMPILER=mpicxx \ + -D CMAKE_Fortran_COMPILER=mpif77 \ + -D MPIEXEC_EXECUTABLE=/opt/apps/tacc/bin/ibrun \ -DHAVE_ACRO=off \ -DHAVE_JEGA=off \ Index: /issm/trunk/externalpackages/dakota/install-6.2-macosx64-highsierra.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-6.2-macosx64-highsierra.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-6.2-macosx64-highsierra.sh (revision 24313) @@ -10,5 +10,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-6.2-macosx64-snowleopard.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-6.2-macosx64-snowleopard.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-6.2-macosx64-snowleopard.sh (revision 24313) @@ -10,5 +10,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-6.2-macosx64-yosemite.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-6.2-macosx64-yosemite.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-6.2-macosx64-yosemite.sh (revision 24313) @@ -10,5 +10,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-6.2-pleiades.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-6.2-pleiades.sh (revision 24312) +++ /issm/trunk/externalpackages/dakota/install-6.2-pleiades.sh (revision 24313) @@ -10,5 +10,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' #Untar Index: /issm/trunk/externalpackages/dakota/install-6.2-stallo.sh =================================================================== --- /issm/trunk/externalpackages/dakota/install-6.2-stallo.sh (revision 24313) +++ /issm/trunk/externalpackages/dakota/install-6.2-stallo.sh (revision 24313) @@ -0,0 +1,63 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf Dakota +rm -rf src +rm -rf build +rm -rf install +mkdir src build install + +#Download from ISSM server +#$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' + +#Untar +tar -zxvf dakota-6.2-public-src.tar.gz + +#Move Dakota to src directory +mv dakota-6.2.0.src/* src +rm -rf dakota-6.2.0.src + +#Set up Dakota cmake variables and config +#export PATH="/usr/bin":$PATH +export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src +export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build +export MPIHOME=/global/hds/software/cpu/eb3/impi/5.0.3.048-iccifort-2015.3.187-GNU-4.9.3-2.25/ + +cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake +patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.stallo.patch +patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch +patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.stallo.patch + +#Apply patches +patch src/src/NonDSampling.cpp configs/6.2/NonDSampling.cpp.patch +patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch +patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch +patch src/packages/surfpack/src/surfaces/nkm/NKM_KrigingModel.cpp configs/6.2/NKM_KrigingModel.patch +patch src/packages/DDACE/src/Analyzer/MainEffectsExcelOutput.cpp configs/6.2/MainEffectsExcelOutput.patch +patch src/src/DakotaInterface.cpp configs/6.2/DakotaInterface.patch + +#Configure dakota +cd $DAK_BUILD + +cmake -D CMAKE_C_COMPILER=/global/hds/software/cpu/eb3/impi/5.0.3.048-iccifort-2015.3.187-GNU-4.9.3-2.25/bin64/mpicc \ + -D CMAKE_CXX_COMPILER=/global/hds/software/cpu/eb3/impi/5.0.3.048-iccifort-2015.3.187-GNU-4.9.3-2.25/bin64/mpicxx \ + -D CMAKE_Fortran_COMPILER=gfortran \ + -DHAVE_ACRO=off \ + -DHAVE_JEGA=off \ + -C $DAK_SRC/cmake/BuildDakotaCustom.cmake \ + -C $DAK_SRC/cmake/DakotaDev.cmake \ + $DAK_SRC +cd .. + +#Compile and install dakota +cd $DAK_BUILD +if [ $# -eq 0 ]; +then + make + make install +else + make -j $1 + make -j $1 install +fi +cd .. Index: /issm/trunk/externalpackages/dem/dem.m =================================================================== --- /issm/trunk/externalpackages/dem/dem.m (revision 24312) +++ /issm/trunk/externalpackages/dem/dem.m (revision 24313) @@ -1,75 +1,225 @@ -function [h,I]=dem(x,y,z,varargin) +function varargout=dem(x,y,z,varargin) %DEM Shaded relief image plot +% % DEM(X,Y,Z) plots the Digital Elevation Model defined by X and Y % coordinate vectors and elevation matrix Z, as a lighted image using % specific "landcolor" and "seacolor" colormaps. DEM uses IMAGESC % function which is much faster than SURFL when dealing with large -% high-resolution DEM. -% -% DEM(X,Y,Z,OPT) specifies options with OPT = [A,C,SCUT,ZMIN,ZMAX,ZCUT], -% where sorted optional scalars are: -% A = azimuth light (in degrees relative to North). Default is A = -45 -% for a natural northwestern illumination. -% C = controls contrast, as the exponent of the gradient value. Default -% is C = 1 for linear contrast; use C = 0 to remove lighting, -% C = 0.5 for moderate lighting, C = 2 or more for strong contrast. -% SCUT = controls lighting scale saturation with a median-style filter -% in % of elements. Default is SCUT = 0.2 (0.2% maximum gradient -% values is ignored). Use SCUT = 0 for full scale gradient. -% ZMIN,ZMAX = fixes min and max elevation values for colormap. Use NaN -% to keep real min and/or max data values. -% ZCUT = median-style filter to cut extremes values (in % of elements). -% Default is ZCUT = 0.5 to ignore the 0.5% of most min/max -% elevation values. Use ZCUT = 0 for full scale. -% Use OPT=[] to keep default values and define following arguments. -% -% DEM(...,CMAP) uses CMAP colormap instead of default (landcolor, if -% exists or jet). Note that defining CMAP disables the default SEACOLOR -% colormap attribution for Z<=0 elevations. -% -% DEM(...,NOVALUE) defines the values that will be replaced by NaN. This -% might be mandatory for DEM that use a value like -99999 or -32768 if -% you don't want a flat image... -% -% DEM(...,SEACOLOR) sets the colormap used for zero and negative values. -% Default is seacolor (if exists) or single color [0.7,0.9,1] (a light -% cyan) to simulate sea color. Use [] to apply colormap CMAP on the full -% elevation scale. -% -% DEM(...,'interp') interpolates linearly NaN values (fills the gaps). -% -% DEM(...,'lake') detects automaticaly flat areas different from sea -% level (non-zero elevations) and draws them as lake surfaces. -% -% DEM(...,'dec') plots classic basemap-style axis, considering -% coordinates as cartesian (decimal). -% -% DEM(...,'dms') plots geographic basemap-style axis in deg/min/sec, -% considering coordinates X as longitude and Y as latitude. Axis aspect -% ratio will be adjusted to approximatively preserve distances (this is -% not a real projection!). -% -% DEM(...,'scale') adds a legend to the right of graph, with elevation -% scale (colormap) and a distance scale if 'dms' option is used. -% -% [H,I]=DEM(...) returns graphic handle H and illuminated image as I, an -% MxNx3 matrix (if Z is MxN). -% -% Informations: -% - For optimization purpose, DEM will automatically decimate data to -% limit to a total of 1500x1500 pixels images. To avoid it, use option -% DEM(...,'nodecim') or DEM(...,'decim',N) where N is an integer, but -% be aware that large grids may require computer ressources and induce -% disk swap or memory errors. -% - Colormaps are Mx3 RGB matrix so it is easy to modify saturation -% (CMAP.^N), set darker (CMAP/N), lighter ((N - 1 + CMAP)/N), inverse -% it (flipud(CMAP)), etc... -% - To get free worldwide topographic data (SRTM), see READHGT function. +% high-resolution DEM. It produces also high-quality and moderate-size +% Postscript image adapted for publication. +% +% DEM(X,Y,Z,'Param1',Value1,'Param2',Value2,...) specifies options or +% parameter/value couple (case insensitive): +% +% [H,I] = DEM(...); returns graphic handle H and optional illuminated +% image as I, a MxNx3 matrix (if Z is MxN and DECIM is 1). +% +% I = DEM(...,'noplot') returns a structure I containing fields x, y, z, +% and illuminated image .rgb without producing a graph on current figure. +% +% +% --- Lighting options --- +% +% 'Azimuth',A +% Light azimuth in degrees clockwise relative to North. Default is +% A = -45 for a natural northwestern illumination. +% +% 'Contrast',C +% Light contrast, as the exponent of the gradient value: +% C = 1 for linear contrast (default), +% C = 0 to remove lighting, +% C = 0.5 for moderate lighting, +% C = 2 or more for strong contrast. +% +% 'LCut',LC +% Lighting scale saturation cut with a median-style filter in % of +% elements, such as LC% of maximum gradient values are ignored: +% LC = 0.2 is default, +% LC = 0 for full scale gradient. +% +% 'km' +% Stands that X and Y coordinates are in km instead of m (default). +% This allows correct lighting. Ignored if LATLON option is used. +% +% +% --- Elevation colorscale options --- +% +% 'ZLim',[ZMIN,ZMAX] +% Fixes min and max elevation values for colormap. Use NaN to keep +% real min and/or max data values. +% +% 'ZCut',ZC +% Median-style filter to cut extremes values of Z (in % of elements), +% such that ZC% of most min/max elevation values are ignored in the +% colormap application: +% ZC = 0.5 is default, +% ZC = 0 for full scale. +% +% +% --- "No Value" elevation options --- +% +% 'NoValue',NOVALUE +% Defines the values that will be replaced by NaN. Note that values +% equal to minimum of Z class are automatically detected as NaN +% (e.g., -32768 for int16 class). +% +% 'NaNColor',[R,G,B] +% Sets the RGB color for NaN/NoValue pixels (default is a dark gray). +% Note that your must specify a valid 3-scalar vector (between 0 and +% 1); color characters like 'w' or 'k' are not allowed, use [1,1,1] +% or [0,0,0] instead. +% +% 'Interp' +% Interpolates linearly all NaN values (fills the gaps using linear +% triangulation), using an optimized algorithm. +% +% +% --- Colormap options --- +% +% 'LandColor',LMAP +% Uses LMAP colormap instead of default (landcolor, if exists or +% jet) for Z > 0 elevations. +% +% 'SeaColor',SMAP +% Sets the colormap used for Z <= 0 elevations. Default is seacolor +% (if exists) or single color [0.7,0.9,1] (a light cyan) to simulate +% sea color. +% +% 'ColorMap',CMAP +% Uses CMAP colormap for full range of elevations, instead of default +% land/sea. This option overwrites LANDCOLOR/SEACOLOR options. +% +% 'Lake' +% Detects automaticaly flat areas different from sea level (non-zero +% elevations) and colors them as lake surfaces. +% +% 'Watermark',N +% Makes the whole image lighter by a factor of N. +% +% +% --- Basemap and scale options --- +% +% 'Legend' +% Adds legends to the right of graph: elevation scale (colorbar) +% and a distance scale (in km). +% +% 'Cartesian' +% Plots classic basemap-style axis, considering coordinates X and Y +% as cartesian in meters. Use parameter "km' for X/Y in km. +% +% 'LatLon' +% Plots geographic basemap-style axis in deg/min/sec, considering +% coordinates X as longitude and Y as latitude. Axis aspect ratio +% will be adjusted to approximatively preserve distances (this is +% not a real projection!). This overwrites ZRatio option. +% +% 'AxisEqual', 'auto' (default) | 'manual' | 'off' +% When 'Cartesian' or 'LatLon' option is used, automatic axes scaling +% is applied to respect data aspect ratio. Default mode is 'auto' and +% uses AXIS EQUAL and DASPECT functions. The 'manual' mode modifies +% axes width or height with respect to the paper size in order to +% produce correct data scaling at print (but not necessarily at +% screen). The 'off' mode disables any scaling. +% +% Additionnal options for basemap CARTESIAN or LATLON: +% +% 'BorderWidth',BW +% Border width of the basemap axis, in % of axis height. Default is +% BW = 1%. +% +% 'XTick',DX +% 'YTick',DY +% X and Y Tick length (same unit as X and Y). Default is automatic. +% Tick labels are every 2 ticks. +% +% 'FontSize',FS +% Font size for X and Y tick labels. Default is FS = 10. +% +% 'FontBold' +% Font weight bold for tick labels. +% +% 'Position',P +% Position of the tick labels: 'southwest' (default), 'southeast', +% 'northwest','northeast' +% +% +% --- Decimation options --- +% +% For optimization purpose, DEM will automatically decimate data to limit +% to a total of 1500x1500 pixels images. To avoid this, use following +% options, but be aware that large grids may require huge computer +% ressources or induce disk swap or memory errors. +% +% 'Decim',N +% Decimates matrix Z at 1/N times of the original sampling. +% +% 'NoDecim' +% Forces full resolution of Z, no decimation. +% +% +% +% --- Informations --- +% +% Colormaps are Mx3 RGB matrix so it is easy to modify saturation +% (CMAP.^N), set darker (CMAP/N), lighter (1 - 1/N + CMAP/N), inverse +% it (flipud(CMAP)), etc... +% +% To get free worldwide topographic data (SRTM), see READHGT function. +% +% For backward compatibility, the former syntax is still accepted: +% DEM(X,Y,Z,OPT,CMAP,NOVALUE,SEACOLOR) where OPT = [A,C,LC,ZMIN,ZMAX,ZC], +% also option aliases DEC, DMS and SCALE, but there is no argument +% checking. Please prefer the param/value syntax. % % Author: François Beauducel -% Created: 2007-05-17 -% Updated: 2013-01-05 - -% Copyright (c) 2013, François Beauducel, covered by BSD License. +% Created: 2007-05-17 in Guadeloupe, French West Indies +% Updated: 2016-01-31 + +% History: +% [2016-04-19] v2.3 +% - major update (thanks to mas Wiwit) +% [2016-01-31] v2.2 +% - adds option 'Position' for tick labels +% [2015-08-22] v2.1 +% - minor fix (former versions of Matlab compatibility) +% [2015-08-19] v2.0 +% - image is now 100% true color (including the legend colorbar), +% thus completely independent from the figure colormap +% [2014-10-14] +% - 'decim' option allows oversampling (negative value) +% [2014-06-06] +% - improves backward compatibility (adds strjoin subfunction) +% [2014-03-18] +% - adds new axisequal option +% [2013-03-11] +% - new options: 'km', 'watermark', 'fontsize', 'bordersize' +% - improve legend colorbar +% - all options now passed as param/value +% [2013-01-14] +% - improved light rendering (using surface normals instead of gradient) +% - improved 'lake' detection algorithm +% - new 'nancolor' option to set NaN color +% - adds a length scale with 'dec' option +% - minor code improvements +% [2013-01-07] +% - adds 'interp' option (fill the gaps) +% - adds 'seacolor' colormap for negative elevations (bathymetry) +% [2013-01-02] +% - adds a 'lake' option +% - minor bug correction +% [2012-09-26] +% - now accepts row/column vectors for X and/or Y. +% [2012-05-29] +% - adds basemap-style axis in decimal or lat/lon modes +% - adds elevation and distance scales +% [2012-05-18] +% - new landcolor.m colormap function +% - new arguments to control colormap scaling +% - median-style filters for light and colormap +% [2012-04-26] +% - Optimizations: adds a decimation for large DEM grids. + +% +% Copyright (c) 2016, François Beauducel, covered by BSD License. % All rights reserved. % @@ -100,80 +250,233 @@ end -% default OPT arguments -a = -45; -c = 1; -scut = 0.2; -zmin = NaN; -zmax = NaN; -zcut = 0.5; -grey = 0.2*[1,1,1]; -csea = []; -fs = 10; % tick label fontsize - -dec = 0; -dms = 0; -scale = 0; -inter = 0; -lake = 0; -decimflag = 0; -decim = 0; - -novalue_color = [0,0,0]; - -if ~isnumeric(x) | ~isnumeric(y) | ~isnumeric(z) +holdon = ishold; + +degkm = 6378*pi/180; % one latitude degree in km +sea_color = [.7,.9,1]; % default sea color (light cyan) +grey = 0.2*[1,1,1]; % a dark gray + + +% ------------------------------------------------------------------------- +% --- Manage input arguments + +% number of arguments param/value +nargs = 0; + +if ~isnumeric(x) || ~isnumeric(y) || ~isnumeric(z) error('X,Y and Z must be numeric.') end -if all(size(x) ~= 1) | all(size(y) ~= 1) +if all(size(x) ~= 1) || all(size(y) ~= 1) error('X and Y must be vectors, not matrix.') end -if length(x) ~= size(z,2) | length(y) ~= size(z,1) +if length(x) ~= size(z,2) || length(y) ~= size(z,1) error('If Z has a size of [M,N], X must have a length of N, and Y a length of M.') end -if nargin > 3 - dec = any(strcmp(varargin,'dec')); - dms = any(strcmp(varargin,'dms')); - if dms & any(abs(y) > 91) - error('With DMS option Y must be in valid latitudes interval (decimal degrees).') - end - scale = any(strcmp(varargin,'scale')); - inter = any(strcmp(varargin,'interp')); - lake = any(strcmp(varargin,'lake')); - if any(strcmp(varargin,'nodecim')) - decim = 1; - decimflag = 1; - end - kdecim = find(strcmp(varargin,'decim')); - if ~isempty(kdecim) - decimflag = 1; - if (kdecim + 1) <= nargin & isnumeric(varargin{kdecim+1}) - decim = round(varargin{kdecim+1}); - decimflag = 2; - end - end -end -nargs = decimflag + dec + dms + scale + lake + inter; - -if (nargin - nargs) > 3 +% OPTIONS and PARAM/VALUE arguments + +% AZIMUTH param/value +[s,az] = checkparam(varargin,'azimuth',@isscalar); +nargs = nargs + 2; +if s==0 + az = -45; % default +end + +% ELEVATION param/value +[s,el] = checkparam(varargin,'elevation',@isscalar); +nargs = nargs + 2; +if s==0 + el = 0; % default +end + +% CONTRAST param/value +[s,ct] = checkparam(varargin,'contrast',@isscalar); +nargs = nargs + 2; +if s + ct = abs(ct); +else + ct = 1; % default +end + +% LCUT param/value +[s,lcut] = checkparam(varargin,'lcut',@isperc); +nargs = nargs + 2; +if s==0 + lcut = .2; % default +end + +% NOVALUE param/value +[s,novalue] = checkparam(varargin,'novalue',@isscalar); +nargs = nargs + 2; +if s==0 + % default: min value for integer class / NaN for float + S = whos('z'); + if strfind(S.class,'int') + novalue = intmin(S.class); + else + novalue = NaN; + end +end + +% NANCOLOR param/value +[s,novalue_color] = checkparam(varargin,'nancolor',@isrgb); +nargs = nargs + 2; +if s==0 + novalue_color = grey; % default +end + +% LANDCOLOR param/value +[s,cland] = checkparam(varargin,'landcolor',@isrgb); +nargs = nargs + 2; +if s==0 + % default: landcolor or jet + if exist('landcolor','file') + cland = landcolor.^1.3; + else + cland = jet(256); + end +end + +% SEACOLOR param/value +[s,csea] = checkparam(varargin,'seacolor',@isrgb); +nargs = nargs + 2; +if s==0 + % default: seacolor or single color + if exist('seacolor','file') + csea = seacolor; + else + csea = sea_color; + end +end + +% COLORMAP param/value +[s,cmap] = checkparam(varargin,'colormap',@isrgb); +nargs = nargs + 2; +if s + cland = []; + csea = []; +else + % default + cmap = cland; +end + +% ZLIM param/value +[s,zmm] = checkparam(varargin,'zlim',@isvec); +nargs = nargs + 2; +if s + zmin = min(zmm); + zmax = max(zmm); +else + zmin = NaN; % default + zmax = NaN; % default +end + +% ZCUT param/value +[s,zcut] = checkparam(varargin,'zcut',@isperc); +nargs = nargs + 2; +if s==0 + zcut = .5; % default +end + +% ZRATIO param/value +[s,zratio] = checkparam(varargin,'zratio',@isscalar); +nargs = nargs + 2; +if s==0 + zratio = 1; % default +end + +% WATERMARK param/value +[s,wmark] = checkparam(varargin,'watermark',@isscalar); +nargs = nargs + 2; +if s + wmark = abs(wmark); +else + wmark = 0; % default +end + +% DECIM param/value and NODECIM option +[s,decim] = checkparam(varargin,'decim',@isscalar); +if s + decim = round(decim); + nargs = nargs + 2; +else + decim = any(strcmpi(varargin,'nodecim')); % default + nargs = nargs + 1; +end + +% FONTSIZE param/value +[s,fs] = checkparam(varargin,'fontsize',@isscalar); +nargs = nargs + 2; +if s==0 + fs = 10; % default +end + +% BORDERWIDTH param/value +[s,bw] = checkparam(varargin,'borderwidth',@isperc); +nargs = nargs + 2; +if s==0 + bw = 1; % default +end + +% XTICK param/value +[s,ddx] = checkparam(varargin,'xtick',@isscalar); +nargs = nargs + 2; +if s==0 + ddx = 0; % default (automatic) +end + +% YTICK param/value +[s,ddy] = checkparam(varargin,'ytick',@isscalar); +nargs = nargs + 2; +if s==0 + ddy = 0; % default (automatic) +end + +% POSITION param/value +[s,tpos] = checkparam(varargin,'position',@ischar,{'southwest','southeast','northwest','northeast'}); +nargs = nargs + 2; +if s==0 + tpos = 'southwest'; % default +end + +% AXISEQUAL param/value +[s,axeq] = checkparam(varargin,'axisequal',@ischar,{'auto','manual','off'}); +nargs = nargs + 2; +if s==0 || ~any(strcmpi(axeq,{'manual','off'})) + axeq = 'auto'; % default (automatic) +end + +% CROP param/value +[s,crop] = checkparam(varargin,'crop',@isvec,4); +nargs = nargs + 2; + +% options without argument value +km = any(strcmpi(varargin,'km')); +dec = any(strcmpi(varargin,'cartesian') | strcmpi(varargin,'dec')); +dms = any(strcmpi(varargin,'latlon') | strcmpi(varargin,'dms')); +scale = any(strcmpi(varargin,'legend') | strcmpi(varargin,'scale')); +inter = any(strcmpi(varargin,'interp')); +lake = any(strcmpi(varargin,'lake')); +fbold = any(strcmpi(varargin,'fontbold')); +noplot = any(strcmpi(varargin,'noplot')); + + +% for backward compatibility (former syntax)... +nargs = nargs + dec + dms + scale + lake + inter + km + fbold + noplot; + +if (nargin - nargs) > 3 && ~isempty(varargin{1}) opt = varargin{1}; if ~isnumeric(opt) - error('OPT = [A,C,S,ZMIN,ZMAX] argument must be numeric.'); + error('OPT = [A,C,S,ZMIN,ZMAX,ZCUT] argument must be numeric.'); end if ~isempty(opt) - a = opt(1); + az = opt(1); end if length(opt) > 1 - c = opt(2); - if c < 0 - error('C argument must be positive.'); - end + ct = opt(2); end if length(opt) > 2 - scut = opt(3); - if scut < 0 | scut >= 100 - error('SCUT argument must be a positive percentage.'); - end + lcut = opt(3); end if length(opt) > 4 @@ -183,54 +486,44 @@ if length(opt) > 5 zcut = opt(6); - if zcut < 0 | zcut >= 100 - error('ZCUT argument must be a positive percentage.'); - end - end -end - -if (nargin - nargs) < 5 - cmap = []; -else + end +end + +if (nargin - nargs) > 4 && ~isempty(varargin{2}) cmap = varargin{2}; - if ~isnumeric(cmap) | (~isempty(cmap) & (size(cmap,2) ~= 3 | min(cmap(:)) < 0 | max(cmap(:)) > 1)) - error('CMAP must be a valid colormap (3-column [R,G,B] matrix with 0.0 to 1.0 values).') - end -end - -if (nargin - nargs) < 6 - novalue = NaN; -else + csea = []; +end + +if (nargin - nargs) > 5 && ~isempty(varargin{3}) novalue = varargin{3}; - if ~isnumeric(novalue) | numel(novalue) > 1 - error('NOVALUE must be scalar.') - end -end - -if (nargin - nargs) < 7 - if isempty(cmap) - if exist('seacolor','file') - csea = seacolor(256); - else - csea = [.7,.9,1]; - end - end -else +end + +if (nargin - nargs) > 6 && ~isempty(varargin{4}) csea = varargin{4}; - if ~isnumeric(csea) - error('Unknown option') - elseif (~isempty(csea) & (size(csea,2) ~= 3 | min(csea) < 0 | max(csea) > 1)) - error('SEACOLOR must be a valid [R,G,B] vector with 0.0 to 1.0 values).') - end -end - -if isempty(cmap) - if exist('landcolor','file') - cmap = landcolor.^1.3; - else - cmap = jet(256); - end -end - - +end + + +% further test of input arguments +if dms && any(abs(y) > 91) + error('With LATLON option Y must be in valid latitudes interval (decimal degrees).') +end + +if km + zratio = 1000; +end + + +% ------------------------------------------------------------------------- +% --- Pre-process DEM data + +% crops data if needed +if numel(crop)==4 + fprintf('DEM: crops original data from [%g,%g,%g,%g] to [%g,%g,%g,%g]...\n', ... + min(x(:)),max(x(:)),min(y(:)),max(y(:)),crop); + kx = find(x >= crop(1) & x <= crop(2)); + ky = find(y >= crop(3) & y <= crop(4)); + x = x(kx); + y = y(ky); + z = z(ky,kx); +end % decimates data to avoid disk swap/out of memory... @@ -245,5 +538,5 @@ y = y(1:n:end); z = z(1:n:end,1:n:end); - fprintf('DEM: on the plot data has been decimated by a factor of %d...\n',n); + fprintf('DEM: data has been decimated by a factor of %d...\n',n); end @@ -251,74 +544,98 @@ z(z==novalue) = NaN; +if isempty(csea) + k = (z~=0 & ~isnan(z)); +else + k = ~isnan(z); +end + +if isnan(zmin) + zmin = nmedian(z(k),zcut/100); +end +if isnan(zmax) + zmax = nmedian(z(k),1 - zcut/100); +end +dz = zmax - zmin; + +if decim & n < 0 + xi = linspace(x(1),x(end),-n*length(x)); + yi = linspace(y(1),y(end),-n*length(y))'; + [xx,yy] = meshgrid(xi,yi); + z = interp2(x,y,z,xx,yy,'*cubic'); + x = xi; + y = yi; + fprintf('DEM: data has been oversampled by a factor of %d...\n',-n); +end + if inter z = fillgap(x,y,z); end -if isempty(csea) - k = (z~=0 & ~isnan(z)); -else - k = ~isnan(z); -end - -if isnan(zmin) - zmin = nmedian(z(k),zcut/100); -end -if isnan(zmax) - zmax = nmedian(z(k),1 - zcut/100); -end -dz = zmax - zmin; +% ------------------------------------------------------------------------- +% --- Process lighting if dz > 0 % builds the colormap: concatenates seacolor and landcolor around 0 - if ~isempty(csea) & zmin < 0 & zmax > 0 + if ~isempty(csea) l = size(csea,1); - r = size(cmap,1)*abs(zmin)/zmax/l; - cmap = cat(1,interp1(1:l,csea,linspace(1,l,round(l*r)),'*linear'),cmap); + if zmin < 0 && zmax > 0 + r = size(cland,1)*abs(zmin)/zmax/l; + cmap = cat(1,interp1(1:l,csea,linspace(1,l,ceil(l*r)),'*linear'),cland); + elseif zmax <=0 + cmap = csea; + end end % normalisation of Z using CMAP and convertion to RGB - I = ind2rgb(uint16((z - zmin)*(length(cmap)/dz)),cmap); + I = ind2rgb(uint16(round((z - zmin)*(size(cmap,1) - 1)/dz) + 1),cmap); - if c > 0 + if ct > 0 % computes lighting from elevation gradient - [fx,fy] = gradient(z,x,y); - %fx = filter([1,0,0,0,-1],1,rf(z'))'; - %fy = filter([1,0,0,0,-1],1,rf(z)); - fxy = -fx*sind(a) - fy*cosd(a); - clear fx fy % free some memory... + %[fx,fy] = gradient(z,x,y); + if dms + ryz = degkm*1000; + rxz = degkm*1000*cosd(mean(y)); + else + rxz = zratio; + ryz = zratio; + end + [xx,yy] = meshgrid(x*rxz,y*ryz); + [fx,fy,fz] = surfnorm(xx,yy,z); + [ux,uy,uz] = sph2cart((90-az)*pi/180,el*pi/180,1); + fxy = fx*ux + fy*uy + fz*uz; + clear xx yy fx fy fz % free some memory... - % lake option: zero gradient - if lake - dx = diff(z,1,2); - dy = diff(z,1,1); - u1 = ones(size(z,1),1); - u2 = ones(1,size(z,2)); - z(cat(1,u2,dy)==0 & cat(1,dy,u2)==0 & cat(2,dx,u1)==0 & cat(2,u1,dx)==0) = 0; - clear dx dy % free some memory... - end - fxy(isnan(fxy)) = 0; - % computes maximum absolute gradient (median-style), normalizes, saturates and duplicates in 3-D matrix - r = repmat(max(min(fxy/nmedian(abs(fxy),1 - scut/100),1),-1),[1,1,3]); + % computes maximum absolute gradient (median-style), normalizes, + % saturates and duplicates in 3-D matrix + li = 1 - abs(sind(el)); % light amplitude (experimental) + r = repmat(max(min(li*fxy/nmedian(abs(fxy),1 - lcut/100),1),-1),[1,1,3]); + rp = (1 - abs(r)).^ct; % applies contrast using exponent - rp = (1 - abs(r)).^c; I = I.*rp; % lighter for positive gradient - k = find(r > 0); - I(k) = I(k) + (1 - rp(k)); + I(r>0) = I(r>0) + (1 - rp(r>0)); end - - % set novalues / NaN to black color + + % set novalues / NaN to nancolor [i,j] = find(isnan(z)); if ~isempty(i) I(sub2ind(size(I),repmat(i,1,3),repmat(j,1,3),repmat(1:3,size(i,1),1))) = repmat(novalue_color,size(i,1),1); end + + % lake option + if lake + klake = islake(z); + else + klake = 0; + end + % set the seacolor for 0 values if ~isempty(csea) - [i,j] = find(z==0); + [i,j] = find(z==0 | klake); if ~isempty(i) I(sub2ind(size(I),repmat(i,1,3),repmat(j,1,3),repmat(1:3,size(i,1),1))) = repmat(csea(end,:),size(i,1),1); @@ -326,54 +643,110 @@ end - hh = imagesc(x,y,I); -else - hh = imagesc(x,y,z); - colormap(cmap); - text(mean(x),mean(y),'SPLASH!','Color','c','FontWeight','bold','HorizontalAlignment','center') -end - -orient tall -axis xy, axis equal, axis tight - + if wmark + I = watermark(I,wmark); + end + txt = ''; + +else + + I = repmat(shiftdim(sea_color,-1),size(z)); + cmap = repmat(sea_color,[256,1]); + txt = 'Mak Byur!'; % Splash ! +end + +% ------------------------------------------------------------------------- +% --- ends the function when 'noplot' option is on +if noplot + varargout{1} = struct('x',x,'y',y,'z',z,'rgb',I); + return +end + +% ------------------------------------------------------------------------- +% --- plots the RGB image +hh = imagesc(x,y,I); + +if ~isempty(txt) + text(mean(x),mean(y),txt,'Color',sea_color/4, ... + 'FontWeight','bold','HorizontalAlignment','center') +end + +orient tall; axis xy +if strcmpi(axeq,'auto') + axis equal +end +axis tight xlim = [min(x),max(x)]; ylim = [min(y),max(y)]; -zlim = [min(z(:)),max(z(:))]; - -% axis basemap style -if dec | dms +zlim = [min([z(z(:) ~= novalue);zmin]),max([z(z(:) ~= novalue);zmax])]; + +if dms + % approximates X-Y aspect ratio for this latitude (< 20-m precision for 1x1° grid) + xyr = cos(mean(y)*pi/180); +else + xyr = 1; +end + +bw0 = max(diff(xlim)*xyr,diff(ylim))/100; +bwy = bw*bw0; % Y border width = 1% +bwx = bwy/xyr; % border width (in degree of longitude) + + +% ------------------------------------------------------------------------- +% --- Axis basemap style +if dec || dms axis off - if dms - % approximates X-Y aspect ratio for this latitude (< 20-m precision for 1x1° grid) - xyr = cos(mean(y)*pi/180); - else - xyr = 1; - end - set(gca,'DataAspectRatio',[1,xyr,1]) - bwy = 0.008*diff(ylim); % Y border width = 1% - bwx = bwy/xyr; % border width (in degree of longitude) - - % transparent borders - patch([xlim(1)-bwx,xlim(2)+bwx,xlim(2)+bwx,xlim(1)-bwx],ylim(1) - bwy*[0,0,1,1],'k','FaceColor','none','clipping','off') - patch([xlim(1)-bwx,xlim(2)+bwx,xlim(2)+bwx,xlim(1)-bwx],ylim(2) + bwy*[0,0,1,1],'k','FaceColor','none','clipping','off') - patch(xlim(1) - bwx*[0,0,1,1],[ylim(1)-bwy,ylim(2)+bwy,ylim(2)+bwy,ylim(1)-bwy],'k','FaceColor','none','clipping','off') - patch(xlim(2) + bwx*[0,0,1,1],[ylim(1)-bwy,ylim(2)+bwy,ylim(2)+bwy,ylim(1)-bwy],'k','FaceColor','none','clipping','off') - + if strcmpi(axeq,'manual') + ppos = get(gcf,'PaperPosition'); + apos = get(gca,'Position'); + xyf = (xyr*diff(xlim)/apos(3)/ppos(3))/(diff(ylim)/apos(4)/ppos(4)); + if xyf >= 1 + set(gca,'Position',[apos(1),apos(2),apos(3),apos(4)/xyf]); + else + set(gca,'Position',[apos(1),apos(2),apos(3)*xyf,apos(4)]); + end + end + if strcmpi(axeq,'auto') + if diff(xlim)*xyr <= diff(ylim) + set(gca,'DataAspectRatio',[1,xyr,1]) + else + set(gca,'DataAspectRatio',[1/xyr,1,1]) + end + end + + if bw > 0 + % transparent borders + patch([xlim(1)-bwx,xlim(2)+bwx,xlim(2)+bwx,xlim(1)-bwx],ylim(1) - bwy*[0,0,1,1],'k','FaceColor','none','clipping','off') + patch([xlim(1)-bwx,xlim(2)+bwx,xlim(2)+bwx,xlim(1)-bwx],ylim(2) + bwy*[0,0,1,1],'k','FaceColor','none','clipping','off') + patch(xlim(1) - bwx*[0,0,1,1],[ylim(1)-bwy,ylim(2)+bwy,ylim(2)+bwy,ylim(1)-bwy],'k','FaceColor','none','clipping','off') + patch(xlim(2) + bwx*[0,0,1,1],[ylim(1)-bwy,ylim(2)+bwy,ylim(2)+bwy,ylim(1)-bwy],'k','FaceColor','none','clipping','off') + end dlon = {'E','W'}; dlat = {'N','S'}; - - if dec - ddx = dtick(diff(xlim)); - ddy = dtick(diff(ylim)); + if fbold + fw = 'bold'; else - ddx = dtick(diff(xlim),1); - ddy = dtick(diff(ylim),1); - end - + fw = 'normal'; + end + + if ddx == 0 + ddx = dtick(diff(xlim),dms); + end + if ddy == 0 + ddy = dtick(diff(ylim),dms); + end xtick = (ddx*ceil(xlim(1)/ddx)):ddx:xlim(2); for xt = xtick(1:2:end) dt = ddx - max(0,xt + ddx - xlim(2)); patch(repmat(xt + dt*[0,1,1,0]',[1,2]),[ylim(1) - bwy*[0,0,1,1];ylim(2) + bwy*[0,0,1,1]]','k','clipping','off') - text(xt,ylim(1) - bwy,deg2dms(xt,dlon,dec),'FontSize',fs,'HorizontalAlignment','center','VerticalAlignment','top'); + if fs > 0 + if ~isempty(regexp(tpos,'north','once')) + text(xt,ylim(2) + 1.2*bwy,deg2dms(xt,dlon,dec),'FontSize',fs,'FontWeight',fw, ... + 'HorizontalAlignment','center','VerticalAlignment','bottom'); + else + text(xt,ylim(1) - 1.2*bwy,deg2dms(xt,dlon,dec),'FontSize',fs,'FontWeight',fw, ... + 'HorizontalAlignment','center','VerticalAlignment','top'); + end + end end @@ -382,50 +755,77 @@ dt = ddy - max(0,yt + ddy - ylim(2)); patch([xlim(1) - bwx*[0,0,1,1];xlim(2) + bwx*[0,0,1,1]]',repmat(yt + dt*[0,1,1,0]',[1,2]),'k','clipping','off') - text(xlim(1) - 1.1*bwx,yt,deg2dms(yt,dlat,dec),'FontSize',fs,'HorizontalAlignment','right','VerticalAlignment','middle'); - end -end - -% scale legend + if fs > 0 + if ~isempty(regexp(tpos,'east','once')) + text(xlim(2) + 1.2*bwx,yt,deg2dms(yt,dlat,dec),'FontSize',fs,'FontWeight',fw, ... + 'HorizontalAlignment','center','VerticalAlignment','top','rotation',90); + else + text(xlim(1) - 1.2*bwx,yt,deg2dms(yt,dlat,dec),'FontSize',fs,'FontWeight',fw, ... + 'HorizontalAlignment','center','VerticalAlignment','bottom','rotation',90); + end + end + end +end + +% ------------------------------------------------------------------------- +% --- Scales legend if scale %wsc = diff(xlim)*0.01; - wsc = bwx; - xsc = xlim(2) + wsc*4; - - % elevation scale (colorbar) - zscale = linspace(zlim(1),zlim(2),length(cmap)); + wsc = bw0; + xsc = xlim(2) + wsc*2 + bwx; + + if wmark + cmap = watermark(cmap,wmark); + end + + % -- elevation scale (colorbar) + zscale = linspace(zmin,zmax,length(cmap))'; yscale = linspace(0,diff(ylim)/2,length(cmap)); + ddz = dtick(dz*max(0.5*xyr*diff(xlim)/yscale(end),1)); + ztick = (ddz*ceil(zscale(1)/ddz)):ddz:zscale(end); + rgbscale = ind2rgb(uint16(round((zscale - zmin)*(size(cmap,1) - 1)/dz) + 1),cmap); ysc = ylim(1); - ddz = dtick(dz*max(0.5*xyr*diff(xlim)/yscale(end),1)); - ztick = (ddz*ceil(zlim(1)/ddz)):ddz:zlim(2); - patch(xsc + repmat(wsc*[-1;1;1;-1],[1,length(cmap)]), ... - ysc + [repmat(yscale,[2,1]);repmat(yscale + diff(yscale(1:2)),[2,1])], ... - repmat(zscale,[4,1]), ... - 'EdgeColor','flat','LineWidth',.1,'FaceColor','flat','clipping','off') - colormap(cmap) - caxis([zmin,zmax]) + hold on + imagesc(xsc + wsc*[-1,1]/2,ysc + yscale,repmat(rgbscale,1,2),'clipping','off'); patch(xsc + wsc*[-1,1,1,-1],ysc + yscale(end)*[0,0,1,1],'k','FaceColor','none','Clipping','off') - text(xsc + 2*wsc + zeros(size(ztick)),ysc + (ztick - zlim(1))*0.5*diff(ylim)/diff(zlim),num2str(ztick'), ... - 'HorizontalAlignment','left','VerticalAlignment','middle','FontSize',8) + text(xsc + 2*wsc + zeros(size(ztick)),ysc + (ztick - zscale(1))*0.5*diff(ylim)/diff(zscale([1,end])),num2str(ztick'), ... + 'HorizontalAlignment','left','VerticalAlignment','middle','FontSize',6) + % indicates min and max Z values + text(xsc,ysc - bwy/2,sprintf('%g m',roundsd(zlim(1),3)),'FontWeight','bold', ... + 'HorizontalAlignment','left','VerticalAlignment','top','FontSize',6) + text(xsc,ysc + .5*diff(ylim) + bwy/2,sprintf('%g m',roundsd(zlim(2),3)),'FontWeight','bold', ... + 'HorizontalAlignment','left','VerticalAlignment','bottom','FontSize',6) - % distance scale (in case of DMS only) + % frees axes only if not hold on + if ~holdon + hold off + end + + % -- distance scale (in km) if dms - degkm = 6370*pi/180; - dkm = dtick(diff(ylim)*degkm); - ysc = ylim(2) - 0.5*dkm/degkm; - patch(xsc + wsc*[-1,-1,0,0],ysc + dkm*0.5*[-1,1,1,-1]/degkm,'k','FaceColor',grey,'clipping','off') - if dkm > 1 - skm = sprintf('%g km',dkm); - else - skm = sprintf('%g m',dkm*1000); - end - text(xsc,ysc,skm,'rotation',-90,'HorizontalAlignment','center','VerticalAlignment','bottom', ... - 'Color',grey,'FontWeight','bold') - end - + fsc = degkm; + else + fsc = zratio/1e3; + end + dkm = dtick(diff(ylim)*fsc); + ysc = ylim(2) - 0.5*dkm/fsc; + patch(xsc + wsc*[-1,-1,0,0],ysc + dkm*0.5*[-1,1,1,-1]/fsc,'k','FaceColor',grey,'clipping','off') + if dkm > 1 + skm = sprintf('%g km',dkm); + else + skm = sprintf('%g m',dkm*1000); + end + text(xsc,ysc,skm,'rotation',-90,'HorizontalAlignment','center','VerticalAlignment','bottom', ... + 'Color',grey,'FontWeight','bold','FontSize',6) end if nargout > 0 - h = hh; + varargout{1} = hh; +end +if nargout > 1 + varargout{2} = I; +end +if nargout > 2 + varargout{3} = z; end @@ -455,8 +855,8 @@ end -if deg & dlim <= 2/60 +if deg && dlim <= 2/60 % less than 2 minutes: base 36 m = 10^floor(log10(dlim*36))/36; -elseif deg & dlim <= 2 +elseif deg && dlim <= 2 % less than 2 degrees: base 6 m = 10^floor(log10(dlim*6))/6; @@ -485,5 +885,6 @@ else xa = abs(x) + 1/360000; - sd = sprintf('%d%c',floor(xa),176); % ASCII char 176 is the degree sign + %sd = sprintf('%d%c',floor(xa),176); % ASCII char 176 is the degree sign + sd = sprintf('%d°',floor(xa)); sm = ''; ss = ''; @@ -502,9 +903,10 @@ end + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% function z = fillgap(x,y,z) % GRIDDATA is not efficient for large arrays, but has great advantage to be -% included in Matlab core functions! To optimize interpolation, we -% reduce the number of relevant data by building a mask of surrounding +% included in Matlab's core functions! To optimize interpolation, we +% reduce the amount of relevant data by building a mask of all surrounding % pixels of novalue areas... playing with linear index! @@ -529,2 +931,151 @@ [i,j] = ind2sub(sz,k); k2 = sub2ind(fliplr(sz),j,i); % switched i and j: k2 is linear index in row order + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +function k = islake(z) +% ISLAKE mask of zero gradient on 3x3 tiles +% We use diff matrix in row and column directions, and shift it to build +% a single vectorized test of surrounding pixels. To do this we must +% concatenate unit vectors in different combinations... + +dx = diff(z,1,2); % differences in X direction +dy = diff(z,1,1); % differences in Y direction +u1 = ones(size(z,1),1); % row unit vector +u2 = ones(1,size(z,2)); % column unit vector +u2r = u2(2:end); + +% index of the tiles center pixel +k = ( ... + [u2;dy] == 0 & [dy;u2] == 0 & ... + [u1,dx] == 0 & [dx,u1] == 0 & ... + [u1,[dx(2:end,:);u2r]] == 0 & [[dx(2:end,:);u2r],u1] == 0 & ... + [u1,[u2r;dx(1:end-1,:)]] == 0 & [[u2r;dx(1:end-1,:)],u1] == 0 ... +); + +% now extends it to surrounding pixels +k(1:end-1,:) = (k(1:end-1,:) | k(2:end,:)); +k(2:end,:) = (k(2:end,:) | k(1:end-1,:)); +k(:,1:end-1) = (k(:,1:end-1) | k(:,2:end)); +k(:,2:end) = (k(:,2:end) | k(:,1:end-1)); + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +function s = isrgb(x,n) + +if nargin < 2 + n = 0; +end +if isnumeric(x) && (n == 1 && all(size(x) == [1,3]) || n == 0 && size(x,2) == 3) ... + && all(x(:) >= 0 & x(:) <= 1) + s = 1; +else + s = 0; +end + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +function s = isperc(x) + +if isnumeric(x) && isscalar(x) && x >= 0 && x <= 100 + s = 1; +else + s = 0; +end + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +function s = isvec(x,n) + +if nargin < 2 + n = 2; +end +if isnumeric(x) && numel(x) == n + s = 1; +else + s = 0; +end + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +function y=roundsd(x,n) + +og = 10.^(floor(log10(abs(x)) - n + 1)); +y = round(x./og).*og; +y(x==0) = 0; + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +function y = watermark(x,n) + +if nargin < 2 + n = 2; +end + +if n == 0 + y = x; +else + y = (x/n + 1 - 1/n); +end + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +function [s,v] = checkparam(arg,nam,func,val) + +switch func2str(func) + case 'isscalar' + num = 1; + mes = 'scalar value'; + case 'isperc' + num = 1; + mes = 'percentage scalar value'; + case 'isvec' + num = 1; + if nargin < 4 + val = 2; + end + mes = sprintf('%d-element vector',val); + case 'isrgb' + num = 1; + mes = '[R,G,B] vector with 0.0 to 1.0 values'; + case 'ischar' + num = 0; + mes = 'string'; + if nargin > 3 + mes = sprintf('%s (%s)',mes,strjoin(val,' or ')); + end + otherwise + num = 1; + mes = 'value'; +end + +s = 0; +v = []; +k = find(strcmpi(arg,nam)); +if ~isempty(k) + if (k + 1) <= length(arg) ... + && (~num || isnumeric(arg{k+1})) ... + && (nargin < 4 && func(arg{k+1}) ... + || (nargin > 3 && (strcmp(func2str(func),'ischar') && ismember(arg{k+1},val)) ... + || strcmp(func2str(func),'isvec') && func(arg{k+1},val))) + v = arg{k+1}; + s = 1; + else + error('%s option must be followed by a valid %s.',upper(nam),mes) + end +end + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +function s=strjoin(c,d) +%STRJOIN Join cell array of strings +%(this is for Matlab versions < 2013a backward compatibility) + +if nargin < 2 + d = ''; +end +n = numel(c); +ss = cell(2,n); +ss(1,:) = reshape(c,1,n); +ss(2,1:n-1) = {d}; +s = [ss{:}]; Index: /issm/trunk/externalpackages/dem/license.txt =================================================================== --- /issm/trunk/externalpackages/dem/license.txt (revision 24312) +++ /issm/trunk/externalpackages/dem/license.txt (revision 24313) @@ -1,24 +1,24 @@ -Copyright (c) 2013, François Beauducel +Copyright (c) 2016, François Beauducel All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Index: /issm/trunk/externalpackages/ec2ami/install.sh =================================================================== --- /issm/trunk/externalpackages/ec2ami/install.sh (revision 24312) +++ /issm/trunk/externalpackages/ec2ami/install.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/ec2-api-tools.zip' 'ec2-api-tools.zip' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/ec2-api-tools.zip' 'ec2-api-tools.zip' #Untar Index: /issm/trunk/externalpackages/ec2api/install.sh =================================================================== --- /issm/trunk/externalpackages/ec2api/install.sh (revision 24312) +++ /issm/trunk/externalpackages/ec2api/install.sh (revision 24313) @@ -7,6 +7,6 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/ec2-api-tools.zip' 'ec2-api-tools.zip' -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/docs/ec2-ug.pdf' 'ec2-ug.pdf' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/ec2-api-tools.zip' 'ec2-api-tools.zip' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/docs/ec2-ug.pdf' 'ec2-ug.pdf' #Untar Index: /issm/trunk/externalpackages/emscripten/install.sh =================================================================== --- /issm/trunk/externalpackages/emscripten/install.sh (revision 24312) +++ /issm/trunk/externalpackages/emscripten/install.sh (revision 24313) @@ -2,24 +2,28 @@ set -eu -export CC=gcc -export CXX=g++ -#Some cleanup -rm -rf install +# Get Emscripten SDK (emsdk) driver if we have not previously installed +# Emscripten. Otherwise, just get the latest version. +if [[ ! -d ./emsdk ]]; then + # Get the emsdk repo + git clone https://github.com/emscripten-core/emsdk.git -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/emsdk-portable.tar.gz' 'emsdk-portable.tar.gz' + # Create symbolic link + ln -s ./emsdk ./install -#Untar and move petsc to install directory -tar -zxvf emsdk-portable.tar.gz -mv emsdk_portable install + cd ./emsdk +else + # Fetch the latest version of the emsdk + cd ./emsdk + git pull +fi -cd install +# Download and install the latest SDK tools. +./emsdk install latest -./emsdk update -./emsdk install sdk-tag-1.34.12-64bit -./emsdk activate sdk-tag-1.34.12-64bit +# Make the "latest" SDK "active" for the current user. (writes ~/.emscripten +# file) +./emsdk activate latest -#Related to moving the install path after installation - However, not safe to install in dir named "install" since a failure would not be noticed by jenkins when triggering -#Not reliable - when executed in subshell without sourcing the install file, this has no effect. Safer to explicitly source for each dependent externalpackage. -source emsdk_env.sh +# Activate PATH and other environment variables in the current terminal +source ./emsdk_env.sh Index: /issm/trunk/externalpackages/esmf/install.sh =================================================================== --- /issm/trunk/externalpackages/esmf/install.sh (revision 24312) +++ /issm/trunk/externalpackages/esmf/install.sh (revision 24313) @@ -12,7 +12,7 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/esmf_6_3_0rp1_src.tar.gz' 'esmf_6_3_0rp1_src.tar.gz' -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/docs/ESMF_refdoc.pdf' 'ESMF_refdoc.pdf' -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/docs/ESMF_usrdoc.pdf' 'ESMF_usrdoc.pdf' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/esmf_6_3_0rp1_src.tar.gz' 'esmf_6_3_0rp1_src.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/docs/ESMF_refdoc.pdf' 'ESMF_refdoc.pdf' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/docs/ESMF_usrdoc.pdf' 'ESMF_usrdoc.pdf' #Untar Index: /issm/trunk/externalpackages/ffmpeg/install-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/ffmpeg/install-macosx64.sh (revision 24312) +++ /issm/trunk/externalpackages/ffmpeg/install-macosx64.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/ffmpeg-1.1.2.tar.gz' 'ffmpeg-1.1.2.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/ffmpeg-1.1.2.tar.gz' 'ffmpeg-1.1.2.tar.gz' #Untar Index: /issm/trunk/externalpackages/findbugs/install.sh =================================================================== --- /issm/trunk/externalpackages/findbugs/install.sh (revision 24312) +++ /issm/trunk/externalpackages/findbugs/install.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/findbugs-1.3.9.tar.gz' 'findbugs-1.3.9.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/findbugs-1.3.9.tar.gz' 'findbugs-1.3.9.tar.gz' tar -zxvf findbugs-1.3.9.tar.gz Index: /issm/trunk/externalpackages/freetype/install.sh =================================================================== --- /issm/trunk/externalpackages/freetype/install.sh (revision 24312) +++ /issm/trunk/externalpackages/freetype/install.sh (revision 24313) @@ -9,5 +9,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/freetype-2.5.0.tar.gz' 'freetype-2.5.0.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/freetype-2.5.0.tar.gz' 'freetype-2.5.0.tar.gz' #Untar Index: /issm/trunk/externalpackages/fti/install.sh =================================================================== --- /issm/trunk/externalpackages/fti/install.sh (revision 24312) +++ /issm/trunk/externalpackages/fti/install.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/fti-0.9.2.tgz' 'fti-0.9.2.tgz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/fti-0.9.2.tgz' 'fti-0.9.2.tgz' #Untar Index: /issm/trunk/externalpackages/gdal/install-1.10-linux64-nopython.sh =================================================================== --- /issm/trunk/externalpackages/gdal/install-1.10-linux64-nopython.sh (revision 24312) +++ /issm/trunk/externalpackages/gdal/install-1.10-linux64-nopython.sh (revision 24313) @@ -11,5 +11,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gdal-1.10.0.tar.gz' 'gdal-1.10.0.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gdal-1.10.0.tar.gz' 'gdal-1.10.0.tar.gz' #Untar Index: /issm/trunk/externalpackages/gdal/install-1.10-linux64.sh =================================================================== --- /issm/trunk/externalpackages/gdal/install-1.10-linux64.sh (revision 24312) +++ /issm/trunk/externalpackages/gdal/install-1.10-linux64.sh (revision 24313) @@ -11,5 +11,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gdal-1.10.0.tar.gz' 'gdal-1.10.0.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gdal-1.10.0.tar.gz' 'gdal-1.10.0.tar.gz' #Untar Index: /issm/trunk/externalpackages/gdal/install-1.10-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/gdal/install-1.10-macosx64.sh (revision 24312) +++ /issm/trunk/externalpackages/gdal/install-1.10-macosx64.sh (revision 24313) @@ -11,5 +11,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gdal-${GDAL_VER}.tar.gz' 'gdal-${GDAL_VER}.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/gdal-${GDAL_VER}.tar.gz" "gdal-${GDAL_VER}.tar.gz" # Untar Index: /issm/trunk/externalpackages/gdal/install-1.11.2-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/gdal/install-1.11.2-macosx64.sh (revision 24313) +++ /issm/trunk/externalpackages/gdal/install-1.11.2-macosx64.sh (revision 24313) @@ -0,0 +1,38 @@ +#!/bin/bash +set -eu + +GDAL_VER="1.11.2" + +# Some cleanup +rm -rf src +rm -rf install +rm -rf gdal-${GDAL_VER} +mkdir src install + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/gdal-${GDAL_VER}.tar.gz" "gdal-${GDAL_VER}.tar.gz" + +# Untar +tar -zxvf gdal-${GDAL_VER}.tar.gz + +# Move gdal into src directory +mv gdal-${GDAL_VER}/* src +rm -rf gdal-${GDAL_VER} + +# Configure gdal +# NOTE: Look for libiconv in /usr/lib/ because there seemed to be a conflict with port's library +cd src +./configure \ + --prefix="$ISSM_DIR/externalpackages/gdal/install" \ + --with-python \ + --with-netcdf=no \ + --with-libiconv-prefix="/usr/lib/" \ + --without-hdf5 + +#Compile and install gdal +if [ $# -eq 0 ]; then + make +else + make -j $1 +fi +make install Index: /issm/trunk/externalpackages/git/install-macosx64-sierra.sh =================================================================== --- /issm/trunk/externalpackages/git/install-macosx64-sierra.sh (revision 24312) +++ /issm/trunk/externalpackages/git/install-macosx64-sierra.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/git-1.7.10.2.tar.gz' 'git-1.7.10.2.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/git-1.7.10.2.tar.gz' 'git-1.7.10.2.tar.gz' #Untar Index: /issm/trunk/externalpackages/git/install.sh =================================================================== --- /issm/trunk/externalpackages/git/install.sh (revision 24312) +++ /issm/trunk/externalpackages/git/install.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/git-1.7.10.2.tar.gz' 'git-1.7.10.2.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/git-1.7.10.2.tar.gz' 'git-1.7.10.2.tar.gz' #Untar Index: /issm/trunk/externalpackages/gmake/install.sh =================================================================== --- /issm/trunk/externalpackages/gmake/install.sh (revision 24312) +++ /issm/trunk/externalpackages/gmake/install.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/make-3.82.tar.gz' 'make-3.82.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/make-3.82.tar.gz' 'make-3.82.tar.gz' #Untar Index: /issm/trunk/externalpackages/gmp/install-linux64.sh =================================================================== --- /issm/trunk/externalpackages/gmp/install-linux64.sh (revision 24312) +++ /issm/trunk/externalpackages/gmp/install-linux64.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gmp-5.0.5.tar.bz2' 'gmp-5.0.5.tar.bz2' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gmp-5.0.5.tar.bz2' 'gmp-5.0.5.tar.bz2' #Untar Index: /issm/trunk/externalpackages/gmsh/install-mac-precompiled.sh =================================================================== --- /issm/trunk/externalpackages/gmsh/install-mac-precompiled.sh (revision 24312) +++ /issm/trunk/externalpackages/gmsh/install-mac-precompiled.sh (revision 24313) @@ -13,5 +13,5 @@ # Download Mac precompiled gmsh from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/${GMSH_TARBALL_NAME}.tar.gz" "${GMSH_TARBALL_NAME}.tar.gz" +$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${GMSH_TARBALL_NAME}.tar.gz" "${GMSH_TARBALL_NAME}.tar.gz" # Untar gmsh Index: /issm/trunk/externalpackages/gmsh/install-win64-precompiled.sh =================================================================== --- /issm/trunk/externalpackages/gmsh/install-win64-precompiled.sh (revision 24312) +++ /issm/trunk/externalpackages/gmsh/install-win64-precompiled.sh (revision 24313) @@ -13,5 +13,5 @@ # Download Windows 64-bit precompiled gmsh from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/${TARBALL}" "${TARBALL}" +$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${TARBALL}" "${TARBALL}" # Untar gmsh Index: /issm/trunk/externalpackages/gmsh/install.sh =================================================================== --- /issm/trunk/externalpackages/gmsh/install.sh (revision 24312) +++ /issm/trunk/externalpackages/gmsh/install.sh (revision 24313) @@ -2,32 +2,27 @@ set -eu -#Some cleanup +VER="3.0.5" + +# Cleanup rm -rf install src -mkdir install +mkdir install src -#Download latest version -#svn co --username gmsh --password gmsh https://geuz.org/svn/gmsh/trunk src -#git clone http://gitlab.onelab.info/gmsh/gmsh.git src +# Download source +$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gmsh-${VER}-source.tgz" "gmsh-${VER}-source.tgz" -#Set gmsh version -GMSH_VER="3.0.5" +# Untar source +tar -xvzf gmsh-$VER-source.tgz -#Remove tarball if it exists -rm -f gmsh-$GMSH_VER-source.tgz +# Move source to src directory +mv gmsh-$VER-source/* src +rm -rf gmsh-$VER-source -#Download last stable version that we know works -wget http://gmsh.info/src/gmsh-$GMSH_VER-source.tgz +# Configure +cd install +cmake ../src \ + -DCMAKE_INSTALL_PREFIX="$ISSM_DIR/externalpackages/gmsh/install" \ + -DENABLE_MPI=1 -#Untar gmsh -tar -xvzf gmsh-$GMSH_VER-source.tgz - -#Rename gmsh source directory -mv gmsh-$GMSH_VER-source src - -#Configure -cd install -cmake ../src -DCMAKE_INSTALL_PREFIX="$ISSM_DIR/externalpackages/gmsh/install" -DENABLE_MPI=1 - -#Compile and install +# Compile if [ $# -eq 0 ]; then make @@ -35,3 +30,5 @@ make -j $1 fi + +# Install make install Index: /issm/trunk/externalpackages/gmt/install-jenkins.sh =================================================================== --- /issm/trunk/externalpackages/gmt/install-jenkins.sh (revision 24312) +++ /issm/trunk/externalpackages/gmt/install-jenkins.sh (revision 24313) @@ -6,5 +6,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gmt-5.1.1.tar.gz' 'gmt-5.1.1.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gmt-5.1.1.tar.gz' 'gmt-5.1.1.tar.gz' #install directory Index: /issm/trunk/externalpackages/gmt/install-mac-precompiled.sh =================================================================== --- /issm/trunk/externalpackages/gmt/install-mac-precompiled.sh (revision 24312) +++ /issm/trunk/externalpackages/gmt/install-mac-precompiled.sh (revision 24313) @@ -13,5 +13,5 @@ # Download Mac precompiled gmsh from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/${TARBALL}" "${TARBALL}" +$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${TARBALL}" "${TARBALL}" # Untar gmt Index: /issm/trunk/externalpackages/gmt/install-static.sh =================================================================== --- /issm/trunk/externalpackages/gmt/install-static.sh (revision 24312) +++ /issm/trunk/externalpackages/gmt/install-static.sh (revision 24313) @@ -6,5 +6,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gmt-5.1.1.tar.gz' 'gmt-5.1.1.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gmt-5.1.1.tar.gz' 'gmt-5.1.1.tar.gz' #install directory Index: /issm/trunk/externalpackages/gmt/install-win64-precompiled.sh =================================================================== --- /issm/trunk/externalpackages/gmt/install-win64-precompiled.sh (revision 24312) +++ /issm/trunk/externalpackages/gmt/install-win64-precompiled.sh (revision 24313) @@ -13,5 +13,5 @@ # Download Windows 64-bit precompiled gmsh from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/${TARBALL}" "${TARBALL}" +$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${TARBALL}" "${TARBALL}" # Untar gmt Index: /issm/trunk/externalpackages/gmt/install.sh =================================================================== --- /issm/trunk/externalpackages/gmt/install.sh (revision 24312) +++ /issm/trunk/externalpackages/gmt/install.sh (revision 24313) @@ -6,5 +6,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gmt-5.1.1.tar.gz' 'gmt-5.1.1.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gmt-5.1.1.tar.gz' 'gmt-5.1.1.tar.gz' #install directory Index: /issm/trunk/externalpackages/gshhg/install.sh =================================================================== --- /issm/trunk/externalpackages/gshhg/install.sh (revision 24312) +++ /issm/trunk/externalpackages/gshhg/install.sh (revision 24313) @@ -8,5 +8,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gshhg-gmt-2.3.4.tar.gz' 'gshhg-gmt-2.3.4.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gshhg-gmt-2.3.4.tar.gz' 'gshhg-gmt-2.3.4.tar.gz' #untar: Index: /issm/trunk/externalpackages/gsl/install-android.sh =================================================================== --- /issm/trunk/externalpackages/gsl/install-android.sh (revision 24312) +++ /issm/trunk/externalpackages/gsl/install-android.sh (revision 24313) @@ -11,5 +11,5 @@ #Download from ISSM server - $ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gsl-1.' 'gsl-1.15.tar.gz' + $ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gsl-1.' 'gsl-1.15.tar.gz' #Untar Index: /issm/trunk/externalpackages/gsl/install-greenplanet.sh =================================================================== --- /issm/trunk/externalpackages/gsl/install-greenplanet.sh (revision 24312) +++ /issm/trunk/externalpackages/gsl/install-greenplanet.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz' #Untar Index: /issm/trunk/externalpackages/gsl/install-ios.sh =================================================================== --- /issm/trunk/externalpackages/gsl/install-ios.sh (revision 24312) +++ /issm/trunk/externalpackages/gsl/install-ios.sh (revision 24313) @@ -25,5 +25,5 @@ #Download from ISSM server - $ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gsl-1.' 'gsl-1.15.tar.gz' + $ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gsl-1.' 'gsl-1.15.tar.gz' #Untar Index: /issm/trunk/externalpackages/gsl/install-javascript.sh =================================================================== --- /issm/trunk/externalpackages/gsl/install-javascript.sh (revision 24312) +++ /issm/trunk/externalpackages/gsl/install-javascript.sh (revision 24313) @@ -15,5 +15,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz' #Untar Index: /issm/trunk/externalpackages/gsl/install-linux64.sh =================================================================== --- /issm/trunk/externalpackages/gsl/install-linux64.sh (revision 24312) +++ /issm/trunk/externalpackages/gsl/install-linux64.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz' #Untar Index: /issm/trunk/externalpackages/gsl/install-macosx64.sh =================================================================== --- /issm/trunk/externalpackages/gsl/install-macosx64.sh (revision 24312) +++ /issm/trunk/externalpackages/gsl/install-macosx64.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz' #Untar Index: /issm/trunk/externalpackages/gsl/install-pleiades.sh =================================================================== --- /issm/trunk/externalpackages/gsl/install-pleiades.sh (revision 24312) +++ /issm/trunk/externalpackages/gsl/install-pleiades.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz' #Untar Index: /issm/trunk/externalpackages/gsl/install-walgreen.sh =================================================================== --- /issm/trunk/externalpackages/gsl/install-walgreen.sh (revision 24312) +++ /issm/trunk/externalpackages/gsl/install-walgreen.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz' #Untar Index: /issm/trunk/externalpackages/gslib/install.sh =================================================================== --- /issm/trunk/externalpackages/gslib/install.sh (revision 24312) +++ /issm/trunk/externalpackages/gslib/install.sh (revision 24313) @@ -7,5 +7,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/gslib90_ls.tar.gz' 'gslib90_ls.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/gslib90_ls.tar.gz' 'gslib90_ls.tar.gz' #Untar Index: /issm/trunk/externalpackages/h5py/install.sh =================================================================== --- /issm/trunk/externalpackages/h5py/install.sh (revision 24312) +++ /issm/trunk/externalpackages/h5py/install.sh (revision 24313) @@ -10,5 +10,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/h5py-2.0.1.tar.gz' 'h5py-2.0.1.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/h5py-2.0.1.tar.gz' 'h5py-2.0.1.tar.gz' #Untar Index: /issm/trunk/externalpackages/hdf5/install.sh =================================================================== --- /issm/trunk/externalpackages/hdf5/install.sh (revision 24312) +++ /issm/trunk/externalpackages/hdf5/install.sh (revision 24313) @@ -2,27 +2,30 @@ set -eu -#Some cleanup -rm -rf src install hdf5-1.8.9 +VER="1.8.9" + +# Cleanup +rm -rf src install hdf5-${VER} mkdir src install -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/hdf5-1.8.9.tar.gz' 'hdf5-1.8.9.tar.gz' +# Download source +$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/hdf5-${VER}.tar.gz" "hdf5-${VER}.tar.gz" -#Untar -tar -zxvf hdf5-1.8.9.tar.gz +# Untar source +tar -zxvf hdf5-${VER}.tar.gz -#Move hdf5 to src directory +# Move source to src directory rm -rf src/* -mv hdf5-1.8.9/* src/ -rm -rf hdf5-1.8.9 +mv hdf5-${VER}/* src/ +rm -rf hdf5-${VER} -# This project uses C code with C++ style comment default C standard used by -# GNU's C compiler's default C standard does not support C++ style comments. -# As such, we need to specify a standard that does. +# This project uses C code with C++-style comments. As such, we need to specify +# a C standard that supports them. export CFLAGS='-std=c99' -#Configure and compile +# Configure, compile, and install cd src -./configure --prefix="$ISSM_DIR/externalpackages/hdf5/install" +./configure \ + --prefix="$ISSM_DIR/externalpackages/hdf5/install" + if [ $# -eq 0 ]; then make Index: /issm/trunk/externalpackages/ipython/install.sh =================================================================== --- /issm/trunk/externalpackages/ipython/install.sh (revision 24312) +++ /issm/trunk/externalpackages/ipython/install.sh (revision 24313) @@ -8,5 +8,5 @@ #Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/ipython-1.0.0.tar.gz' 'ipython-1.0.0.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/ipython-1.0.0.tar.gz' 'ipython-1.0.0.tar.gz' #Untar Index: /issm/trunk/externalpackages/javascript/README =================================================================== --- /issm/trunk/externalpackages/javascript/README (revision 24313) +++ /issm/trunk/externalpackages/javascript/README (revision 24313) @@ -0,0 +1,3 @@ +This directory contains, at the time of this writing, JavaScript modules used +on the VESL Web site. Arguably, they should just be kept in that project's SVN +repository if no one is pulling them from here. Index: /issm/trunk/externalpackages/javascript/gauge.min.js =================================================================== --- /issm/trunk/externalpackages/javascript/gauge.min.js (revision 24313) +++ /issm/trunk/externalpackages/javascript/gauge.min.js (revision 24313) @@ -0,0 +1,1 @@ +(function(){var a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q={}.hasOwnProperty,r=function(a,b){function c(){this.constructor=a}for(var d in b)q.call(b,d)&&(a[d]=b[d]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a};!function(){var a,b,c,d,e,f,g;for(g=["ms","moz","webkit","o"],c=0,e=g.length;e>c&&(f=g[c],!window.requestAnimationFrame);c++)window.requestAnimationFrame=window[f+"RequestAnimationFrame"],window.cancelAnimationFrame=window[f+"CancelAnimationFrame"]||window[f+"CancelRequestAnimationFrame"];return a=null,d=0,b={},requestAnimationFrame?window.cancelAnimationFrame?void 0:(a=window.requestAnimationFrame,window.requestAnimationFrame=function(c,e){var f;return f=++d,a(function(){return b[f]?void 0:c()},e),f},window.cancelAnimationFrame=function(a){return b[a]=!0}):(window.requestAnimationFrame=function(a,b){var c,d,e,f;return c=(new Date).getTime(),f=Math.max(0,16-(c-e)),d=window.setTimeout(function(){return a(c+f)},f),e=c+f,d},window.cancelAnimationFrame=function(a){return clearTimeout(a)})}(),String.prototype.hashCode=function(){var a,b,c,d,e;if(b=0,0===this.length)return b;for(c=d=0,e=this.length;e>=0?e>d:d>e;c=e>=0?++d:--d)a=this.charCodeAt(c),b=(b<<5)-b+a,b&=b;return b},o=function(a){var b,c;for(b=Math.floor(a/3600),c=Math.floor((a-3600*b)/60),a-=3600*b+60*c,a+="",c+="";c.length<2;)c="0"+c;for(;a.length<2;)a="0"+a;return b=b?b+":":"",b+c+":"+a},m=function(a){return k(a.toFixed(0))},p=function(a,b){var c,d;for(c in b)q.call(b,c)&&(d=b[c],a[c]=d);return a},n=function(a,b){var c,d,e;d={};for(c in a)q.call(a,c)&&(e=a[c],d[c]=e);for(c in b)q.call(b,c)&&(e=b[c],d[c]=e);return d},k=function(a){var b,c,d,e;for(a+="",c=a.split("."),d=c[0],e="",c.length>1&&(e="."+c[1]),b=/(\d+)(\d{3})/;b.test(d);)d=d.replace(b,"$1,$2");return d+e},l=function(a){return"#"===a.charAt(0)?a.substring(1,7):a},j=function(){function a(a,b){null==a&&(a=!0),this.clear=null!=b?b:!0,a&&AnimationUpdater.add(this)}return a.prototype.animationSpeed=32,a.prototype.update=function(a){var b;return null==a&&(a=!1),a||this.displayedValue!==this.value?(this.ctx&&this.clear&&this.ctx.clearRect(0,0,this.canvas.width,this.canvas.height),b=this.value-this.displayedValue,Math.abs(b/this.animationSpeed)<=.001?this.displayedValue=this.value:this.displayedValue=this.displayedValue+b/this.animationSpeed,this.render(),!0):!1},a}(),e=function(a){function b(){return b.__super__.constructor.apply(this,arguments)}return r(b,a),b.prototype.displayScale=1,b.prototype.setTextField=function(a){return this.textField=a instanceof i?a:new i(a)},b.prototype.setMinValue=function(a,b){var c,d,e,f,g;if(this.minValue=a,null==b&&(b=!0),b){for(this.displayedValue=this.minValue,f=this.gp||[],g=[],d=0,e=f.length;e>d;d++)c=f[d],g.push(c.displayedValue=this.minValue);return g}},b.prototype.setOptions=function(a){return null==a&&(a=null),this.options=n(this.options,a),this.textField&&(this.textField.el.style.fontSize=a.fontSize+"px"),this.options.angle>.5&&(this.gauge.options.angle=.5),this.configDisplayScale(),this},b.prototype.configDisplayScale=function(){var a,b,c,d,e;return d=this.displayScale,this.options.highDpiSupport===!1?delete this.displayScale:(b=window.devicePixelRatio||1,a=this.ctx.webkitBackingStorePixelRatio||this.ctx.mozBackingStorePixelRatio||this.ctx.msBackingStorePixelRatio||this.ctx.oBackingStorePixelRatio||this.ctx.backingStorePixelRatio||1,this.displayScale=b/a),this.displayScale!==d&&(e=this.canvas.G__width||this.canvas.width,c=this.canvas.G__height||this.canvas.height,this.canvas.width=e*this.displayScale,this.canvas.height=c*this.displayScale,this.canvas.style.width=e+"px",this.canvas.style.height=c+"px",this.canvas.G__width=e,this.canvas.G__height=c),this},b}(j),i=function(){function a(a){this.el=a}return a.prototype.render=function(a){return this.el.innerHTML=m(a.displayedValue)},a}(),a=function(a){function b(a,b){this.elem=a,this.text=null!=b?b:!1,this.value=1*this.elem.innerHTML,this.text&&(this.value=0)}return r(b,a),b.prototype.displayedValue=0,b.prototype.value=0,b.prototype.setVal=function(a){return this.value=1*a},b.prototype.render=function(){var a;return a=this.text?o(this.displayedValue.toFixed(0)):k(m(this.displayedValue)),this.elem.innerHTML=a},b}(j),b={create:function(b){var c,d,e,f;for(f=[],d=0,e=b.length;e>d;d++)c=b[d],f.push(new a(c));return f}},h=function(a){function b(a){this.gauge=a,this.ctx=this.gauge.ctx,this.canvas=this.gauge.canvas,b.__super__.constructor.call(this,!1,!1),this.setOptions()}return r(b,a),b.prototype.displayedValue=0,b.prototype.value=0,b.prototype.options={strokeWidth:.035,length:.1,color:"#000000"},b.prototype.setOptions=function(a){return null==a&&(a=null),p(this.options,a),this.length=this.canvas.height*this.options.length,this.strokeWidth=this.canvas.height*this.options.strokeWidth,this.maxValue=this.gauge.maxValue,this.minValue=this.gauge.minValue,this.animationSpeed=this.gauge.animationSpeed,this.options.angle=this.gauge.options.angle},b.prototype.render=function(){var a,b,c,d,e,f,g,h,i;return a=this.gauge.getAngle.call(this,this.displayedValue),b=this.canvas.width/2,c=.9*this.canvas.height,h=Math.round(b+this.length*Math.cos(a)),i=Math.round(c+this.length*Math.sin(a)),f=Math.round(b+this.strokeWidth*Math.cos(a-Math.PI/2)),g=Math.round(c+this.strokeWidth*Math.sin(a-Math.PI/2)),d=Math.round(b+this.strokeWidth*Math.cos(a+Math.PI/2)),e=Math.round(c+this.strokeWidth*Math.sin(a+Math.PI/2)),this.ctx.fillStyle=this.options.color,this.ctx.beginPath(),this.ctx.arc(b,c,this.strokeWidth,0,2*Math.PI,!0),this.ctx.fill(),this.ctx.beginPath(),this.ctx.moveTo(f,g),this.ctx.lineTo(h,i),this.ctx.lineTo(d,e),this.ctx.fill()},b}(j),c=function(){function a(a){this.elem=a}return a.prototype.updateValues=function(a){return this.value=a[0],this.maxValue=a[1],this.avgValue=a[2],this.render()},a.prototype.render=function(){var a,b;return this.textField&&this.textField.text(m(this.value)),0===this.maxValue&&(this.maxValue=2*this.avgValue),b=this.value/this.maxValue*100,a=this.avgValue/this.maxValue*100,$(".bar-value",this.elem).css({width:b+"%"}),$(".typical-value",this.elem).css({width:a+"%"})},a}(),g=function(a){function b(a){this.canvas=a,b.__super__.constructor.call(this),this.percentColors=null,"undefined"!=typeof G_vmlCanvasManager&&(this.canvas=window.G_vmlCanvasManager.initElement(this.canvas)),this.ctx=this.canvas.getContext("2d"),this.gp=[new h(this)],this.setOptions(),this.render()}return r(b,a),b.prototype.elem=null,b.prototype.value=[20],b.prototype.maxValue=80,b.prototype.minValue=0,b.prototype.displayedAngle=0,b.prototype.displayedValue=0,b.prototype.lineWidth=40,b.prototype.paddingBottom=.1,b.prototype.percentColors=null,b.prototype.options={colorStart:"#6fadcf",colorStop:void 0,gradientType:0,strokeColor:"#e0e0e0",pointer:{length:.8,strokeWidth:.035},angle:.15,lineWidth:.44,fontSize:40,limitMax:!1},b.prototype.setOptions=function(a){var c,d,e,f;for(null==a&&(a=null),b.__super__.setOptions.call(this,a),this.configPercentColors(),this.lineWidth=this.canvas.height*(1-this.paddingBottom)*this.options.lineWidth,this.radius=this.canvas.height*(1-this.paddingBottom)-this.lineWidth,this.ctx.clearRect(0,0,this.canvas.width,this.canvas.height),this.render(),f=this.gp,d=0,e=f.length;e>d;d++)c=f[d],c.setOptions(this.options.pointer),c.render();return this},b.prototype.configPercentColors=function(){var a,b,c,d,e,f,g;if(this.percentColors=null,void 0!==this.options.percentColors){for(this.percentColors=new Array,f=[],c=d=0,e=this.options.percentColors.length-1;e>=0?e>=d:d>=e;c=e>=0?++d:--d)g=parseInt(l(this.options.percentColors[c][1]).substring(0,2),16),b=parseInt(l(this.options.percentColors[c][1]).substring(2,4),16),a=parseInt(l(this.options.percentColors[c][1]).substring(4,6),16),f.push(this.percentColors[c]={pct:this.options.percentColors[c][0],color:{r:g,g:b,b:a}});return f}},b.prototype.set=function(a){var b,c,d,e,f,g,i;if(a instanceof Array||(a=[a]),a.length>this.gp.length)for(b=c=0,g=a.length-this.gp.length;g>=0?g>c:c>g;b=g>=0?++c:--c)this.gp.push(new h(this));for(b=0,f=!1,d=0,e=a.length;e>d;d++)i=a[d],i>this.maxValue&&(this.maxValue=1.1*this.value,f=!0),this.gp[b].value=i,this.gp[b++].setOptions({maxValue:this.maxValue,angle:this.options.angle});return this.value=a[a.length-1],f&&this.options.limitMax?void 0:AnimationUpdater.run()},b.prototype.getAngle=function(a){return(1+this.options.angle)*Math.PI+(a-this.minValue)/(this.maxValue-this.minValue)*(1-2*this.options.angle)*Math.PI},b.prototype.getColorForPercentage=function(a,b){var c,d,e,f,g,h,i;if(0===a)c=this.percentColors[0].color;else for(c=this.percentColors[this.percentColors.length-1].color,e=f=0,h=this.percentColors.length-1;h>=0?h>=f:f>=h;e=h>=0?++f:--f)if(a<=this.percentColors[e].pct){b===!0?(i=this.percentColors[e-1],d=this.percentColors[e],g=(a-i.pct)/(d.pct-i.pct),c={r:Math.floor(i.color.r*(1-g)+d.color.r*g),g:Math.floor(i.color.g*(1-g)+d.color.g*g),b:Math.floor(i.color.b*(1-g)+d.color.b*g)}):c=this.percentColors[e].color;break}return"rgb("+[c.r,c.g,c.b].join(",")+")"},b.prototype.getColorForValue=function(a,b){var c;return c=(a-this.minValue)/(this.maxValue-this.minValue),this.getColorForPercentage(c,b)},b.prototype.render=function(){var a,b,c,d,e,f,g,h,i;for(i=this.canvas.width/2,d=this.canvas.height*(1-this.paddingBottom),a=this.getAngle(this.displayedValue),this.textField&&this.textField.render(this),this.ctx.lineCap="butt",void 0!==this.options.customFillStyle?b=this.options.customFillStyle(this):null!==this.percentColors?b=this.getColorForValue(this.displayedValue,!0):void 0!==this.options.colorStop?(b=0===this.options.gradientType?this.ctx.createRadialGradient(i,d,9,i,d,70):this.ctx.createLinearGradient(0,0,i,0),b.addColorStop(0,this.options.colorStart),b.addColorStop(1,this.options.colorStop)):b=this.options.colorStart,this.ctx.strokeStyle=b,this.ctx.beginPath(),this.ctx.arc(i,d,this.radius,(1+this.options.angle)*Math.PI,a,!1),this.ctx.lineWidth=this.lineWidth,this.ctx.stroke(),this.ctx.strokeStyle=this.options.strokeColor,this.ctx.beginPath(),this.ctx.arc(i,d,this.radius,a,(2-this.options.angle)*Math.PI,!1),this.ctx.stroke(),g=this.gp,h=[],e=0,f=g.length;f>e;e++)c=g[e],h.push(c.update(!0));return h},b}(e),d=function(a){function b(a){this.canvas=a,b.__super__.constructor.call(this),"undefined"!=typeof G_vmlCanvasManager&&(this.canvas=window.G_vmlCanvasManager.initElement(this.canvas)),this.ctx=this.canvas.getContext("2d"),this.setOptions(),this.render()}return r(b,a),b.prototype.lineWidth=15,b.prototype.displayedValue=0,b.prototype.value=33,b.prototype.maxValue=80,b.prototype.minValue=0,b.prototype.options={lineWidth:.1,colorStart:"#6f6ea0",colorStop:"#c0c0db",strokeColor:"#eeeeee",shadowColor:"#d5d5d5",angle:.35},b.prototype.getAngle=function(a){return(1-this.options.angle)*Math.PI+(a-this.minValue)/(this.maxValue-this.minValue)*(2+this.options.angle-(1-this.options.angle))*Math.PI},b.prototype.setOptions=function(a){return null==a&&(a=null),b.__super__.setOptions.call(this,a),this.lineWidth=this.canvas.height*this.options.lineWidth,this.radius=this.canvas.height/2-this.lineWidth/2,this},b.prototype.set=function(a){return this.value=a,this.value>this.maxValue&&(this.maxValue=1.1*this.value),AnimationUpdater.run()},b.prototype.render=function(){var a,b,c,d,e,f;return a=this.getAngle(this.displayedValue),f=this.canvas.width/2,c=this.canvas.height/2,this.textField&&this.textField.render(this),b=this.ctx.createRadialGradient(f,c,39,f,c,70),b.addColorStop(0,this.options.colorStart),b.addColorStop(1,this.options.colorStop),d=this.radius-this.lineWidth/2,e=this.radius+this.lineWidth/2,this.ctx.strokeStyle=this.options.strokeColor,this.ctx.beginPath(),this.ctx.arc(f,c,this.radius,(1-this.options.angle)*Math.PI,(2+this.options.angle)*Math.PI,!1),this.ctx.lineWidth=this.lineWidth,this.ctx.lineCap="round",this.ctx.stroke(),this.ctx.strokeStyle=b,this.ctx.beginPath(),this.ctx.arc(f,c,this.radius,(1-this.options.angle)*Math.PI,a,!1),this.ctx.stroke()},b}(e),f=function(a){function b(){return b.__super__.constructor.apply(this,arguments)}return r(b,a),b.prototype.strokeGradient=function(a,b,c,d){var e;return e=this.ctx.createRadialGradient(a,b,c,a,b,d),e.addColorStop(0,this.options.shadowColor),e.addColorStop(.12,this.options._orgStrokeColor),e.addColorStop(.88,this.options._orgStrokeColor),e.addColorStop(1,this.options.shadowColor),e},b.prototype.setOptions=function(a){var c,d,e,f;return null==a&&(a=null),b.__super__.setOptions.call(this,a),f=this.canvas.width/2,c=this.canvas.height/2,d=this.radius-this.lineWidth/2,e=this.radius+this.lineWidth/2,this.options._orgStrokeColor=this.options.strokeColor,this.options.strokeColor=this.strokeGradient(f,c,d,e),this},b}(d),window.AnimationUpdater={elements:[],animId:null,addAll:function(a){var b,c,d,e;for(e=[],c=0,d=a.length;d>c;c++)b=a[c],e.push(AnimationUpdater.elements.push(b));return e},add:function(a){return AnimationUpdater.elements.push(a)},run:function(){var a,b,c,d,e;for(a=!0,e=AnimationUpdater.elements,c=0,d=e.length;d>c;c++)b=e[c],b.update()&&(a=!1);return a?cancelAnimationFrame(AnimationUpdater.animId):AnimationUpdater.animId=requestAnimationFrame(AnimationUpdater.run)}},"function"==typeof window.define&&null!=window.define.amd?define(function(){return{Gauge:g,Donut:f,BaseDonut:d,TextRenderer:i}}):"undefined"!=typeof module&&null!=module.exports?module.exports={Gauge:g,Donut:f,BaseDonut:d,TextRenderer:i}:(window.Gauge=g,window.Donut=f,window.BaseDonut=d,window.TextRenderer=i)}).call(this); Index: /issm/trunk/externalpackages/javascript/gl-matrix-min.js =================================================================== --- /issm/trunk/externalpackages/javascript/gl-matrix-min.js (revision 24313) +++ /issm/trunk/externalpackages/javascript/gl-matrix-min.js (revision 24313) @@ -0,0 +1,29 @@ +/** + * @fileoverview gl-matrix - High performance matrix and vector operations + * @author Brandon Jones + * @author Colin MacKenzie IV + * @version 2.3.2 + */ + +/* Copyright (c) 2015, Brandon Jones, Colin MacKenzie IV. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. */ + +!function(t,a){if("object"==typeof exports&&"object"==typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define(a);else{var n=a();for(var r in n)("object"==typeof exports?exports:t)[r]=n[r]}}(this,function(){return function(t){function a(r){if(n[r])return n[r].exports;var o=n[r]={exports:{},id:r,loaded:!1};return t[r].call(o.exports,o,o.exports,a),o.loaded=!0,o.exports}var n={};return a.m=t,a.c=n,a.p="",a(0)}([function(t,a,n){a.glMatrix=n(1),a.mat2=n(2),a.mat2d=n(3),a.mat3=n(4),a.mat4=n(5),a.quat=n(6),a.vec2=n(9),a.vec3=n(7),a.vec4=n(8)},function(t,a){var n={};n.EPSILON=1e-6,n.ARRAY_TYPE="undefined"!=typeof Float32Array?Float32Array:Array,n.RANDOM=Math.random,n.ENABLE_SIMD=!1,n.SIMD_AVAILABLE=n.ARRAY_TYPE===Float32Array&&"SIMD"in this,n.USE_SIMD=n.ENABLE_SIMD&&n.SIMD_AVAILABLE,n.setMatrixArrayType=function(t){n.ARRAY_TYPE=t};var r=Math.PI/180;n.toRadian=function(t){return t*r},t.exports=n},function(t,a,n){var r=n(1),o={};o.create=function(){var t=new r.ARRAY_TYPE(4);return t[0]=1,t[1]=0,t[2]=0,t[3]=1,t},o.clone=function(t){var a=new r.ARRAY_TYPE(4);return a[0]=t[0],a[1]=t[1],a[2]=t[2],a[3]=t[3],a},o.copy=function(t,a){return t[0]=a[0],t[1]=a[1],t[2]=a[2],t[3]=a[3],t},o.identity=function(t){return t[0]=1,t[1]=0,t[2]=0,t[3]=1,t},o.transpose=function(t,a){if(t===a){var n=a[1];t[1]=a[2],t[2]=n}else t[0]=a[0],t[1]=a[2],t[2]=a[1],t[3]=a[3];return t},o.invert=function(t,a){var n=a[0],r=a[1],o=a[2],l=a[3],u=n*l-o*r;return u?(u=1/u,t[0]=l*u,t[1]=-r*u,t[2]=-o*u,t[3]=n*u,t):null},o.adjoint=function(t,a){var n=a[0];return t[0]=a[3],t[1]=-a[1],t[2]=-a[2],t[3]=n,t},o.determinant=function(t){return t[0]*t[3]-t[2]*t[1]},o.multiply=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=a[3],e=n[0],M=n[1],i=n[2],s=n[3];return t[0]=r*e+l*M,t[1]=o*e+u*M,t[2]=r*i+l*s,t[3]=o*i+u*s,t},o.mul=o.multiply,o.rotate=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=a[3],e=Math.sin(n),M=Math.cos(n);return t[0]=r*M+l*e,t[1]=o*M+u*e,t[2]=r*-e+l*M,t[3]=o*-e+u*M,t},o.scale=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=a[3],e=n[0],M=n[1];return t[0]=r*e,t[1]=o*e,t[2]=l*M,t[3]=u*M,t},o.fromRotation=function(t,a){var n=Math.sin(a),r=Math.cos(a);return t[0]=r,t[1]=n,t[2]=-n,t[3]=r,t},o.fromScaling=function(t,a){return t[0]=a[0],t[1]=0,t[2]=0,t[3]=a[1],t},o.str=function(t){return"mat2("+t[0]+", "+t[1]+", "+t[2]+", "+t[3]+")"},o.frob=function(t){return Math.sqrt(Math.pow(t[0],2)+Math.pow(t[1],2)+Math.pow(t[2],2)+Math.pow(t[3],2))},o.LDU=function(t,a,n,r){return t[2]=r[2]/r[0],n[0]=r[0],n[1]=r[1],n[3]=r[3]-t[2]*n[1],[t,a,n]},t.exports=o},function(t,a,n){var r=n(1),o={};o.create=function(){var t=new r.ARRAY_TYPE(6);return t[0]=1,t[1]=0,t[2]=0,t[3]=1,t[4]=0,t[5]=0,t},o.clone=function(t){var a=new r.ARRAY_TYPE(6);return a[0]=t[0],a[1]=t[1],a[2]=t[2],a[3]=t[3],a[4]=t[4],a[5]=t[5],a},o.copy=function(t,a){return t[0]=a[0],t[1]=a[1],t[2]=a[2],t[3]=a[3],t[4]=a[4],t[5]=a[5],t},o.identity=function(t){return t[0]=1,t[1]=0,t[2]=0,t[3]=1,t[4]=0,t[5]=0,t},o.invert=function(t,a){var n=a[0],r=a[1],o=a[2],l=a[3],u=a[4],e=a[5],M=n*l-r*o;return M?(M=1/M,t[0]=l*M,t[1]=-r*M,t[2]=-o*M,t[3]=n*M,t[4]=(o*e-l*u)*M,t[5]=(r*u-n*e)*M,t):null},o.determinant=function(t){return t[0]*t[3]-t[1]*t[2]},o.multiply=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=a[3],e=a[4],M=a[5],i=n[0],s=n[1],c=n[2],D=n[3],S=n[4],I=n[5];return t[0]=r*i+l*s,t[1]=o*i+u*s,t[2]=r*c+l*D,t[3]=o*c+u*D,t[4]=r*S+l*I+e,t[5]=o*S+u*I+M,t},o.mul=o.multiply,o.rotate=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=a[3],e=a[4],M=a[5],i=Math.sin(n),s=Math.cos(n);return t[0]=r*s+l*i,t[1]=o*s+u*i,t[2]=r*-i+l*s,t[3]=o*-i+u*s,t[4]=e,t[5]=M,t},o.scale=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=a[3],e=a[4],M=a[5],i=n[0],s=n[1];return t[0]=r*i,t[1]=o*i,t[2]=l*s,t[3]=u*s,t[4]=e,t[5]=M,t},o.translate=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=a[3],e=a[4],M=a[5],i=n[0],s=n[1];return t[0]=r,t[1]=o,t[2]=l,t[3]=u,t[4]=r*i+l*s+e,t[5]=o*i+u*s+M,t},o.fromRotation=function(t,a){var n=Math.sin(a),r=Math.cos(a);return t[0]=r,t[1]=n,t[2]=-n,t[3]=r,t[4]=0,t[5]=0,t},o.fromScaling=function(t,a){return t[0]=a[0],t[1]=0,t[2]=0,t[3]=a[1],t[4]=0,t[5]=0,t},o.fromTranslation=function(t,a){return t[0]=1,t[1]=0,t[2]=0,t[3]=1,t[4]=a[0],t[5]=a[1],t},o.str=function(t){return"mat2d("+t[0]+", "+t[1]+", "+t[2]+", "+t[3]+", "+t[4]+", "+t[5]+")"},o.frob=function(t){return Math.sqrt(Math.pow(t[0],2)+Math.pow(t[1],2)+Math.pow(t[2],2)+Math.pow(t[3],2)+Math.pow(t[4],2)+Math.pow(t[5],2)+1)},t.exports=o},function(t,a,n){var r=n(1),o={};o.create=function(){var t=new r.ARRAY_TYPE(9);return t[0]=1,t[1]=0,t[2]=0,t[3]=0,t[4]=1,t[5]=0,t[6]=0,t[7]=0,t[8]=1,t},o.fromMat4=function(t,a){return t[0]=a[0],t[1]=a[1],t[2]=a[2],t[3]=a[4],t[4]=a[5],t[5]=a[6],t[6]=a[8],t[7]=a[9],t[8]=a[10],t},o.clone=function(t){var a=new r.ARRAY_TYPE(9);return a[0]=t[0],a[1]=t[1],a[2]=t[2],a[3]=t[3],a[4]=t[4],a[5]=t[5],a[6]=t[6],a[7]=t[7],a[8]=t[8],a},o.copy=function(t,a){return t[0]=a[0],t[1]=a[1],t[2]=a[2],t[3]=a[3],t[4]=a[4],t[5]=a[5],t[6]=a[6],t[7]=a[7],t[8]=a[8],t},o.identity=function(t){return t[0]=1,t[1]=0,t[2]=0,t[3]=0,t[4]=1,t[5]=0,t[6]=0,t[7]=0,t[8]=1,t},o.transpose=function(t,a){if(t===a){var n=a[1],r=a[2],o=a[5];t[1]=a[3],t[2]=a[6],t[3]=n,t[5]=a[7],t[6]=r,t[7]=o}else t[0]=a[0],t[1]=a[3],t[2]=a[6],t[3]=a[1],t[4]=a[4],t[5]=a[7],t[6]=a[2],t[7]=a[5],t[8]=a[8];return t},o.invert=function(t,a){var n=a[0],r=a[1],o=a[2],l=a[3],u=a[4],e=a[5],M=a[6],i=a[7],s=a[8],c=s*u-e*i,D=-s*l+e*M,S=i*l-u*M,I=n*c+r*D+o*S;return I?(I=1/I,t[0]=c*I,t[1]=(-s*r+o*i)*I,t[2]=(e*r-o*u)*I,t[3]=D*I,t[4]=(s*n-o*M)*I,t[5]=(-e*n+o*l)*I,t[6]=S*I,t[7]=(-i*n+r*M)*I,t[8]=(u*n-r*l)*I,t):null},o.adjoint=function(t,a){var n=a[0],r=a[1],o=a[2],l=a[3],u=a[4],e=a[5],M=a[6],i=a[7],s=a[8];return t[0]=u*s-e*i,t[1]=o*i-r*s,t[2]=r*e-o*u,t[3]=e*M-l*s,t[4]=n*s-o*M,t[5]=o*l-n*e,t[6]=l*i-u*M,t[7]=r*M-n*i,t[8]=n*u-r*l,t},o.determinant=function(t){var a=t[0],n=t[1],r=t[2],o=t[3],l=t[4],u=t[5],e=t[6],M=t[7],i=t[8];return a*(i*l-u*M)+n*(-i*o+u*e)+r*(M*o-l*e)},o.multiply=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=a[3],e=a[4],M=a[5],i=a[6],s=a[7],c=a[8],D=n[0],S=n[1],I=n[2],x=n[3],f=n[4],F=n[5],m=n[6],h=n[7],d=n[8];return t[0]=D*r+S*u+I*i,t[1]=D*o+S*e+I*s,t[2]=D*l+S*M+I*c,t[3]=x*r+f*u+F*i,t[4]=x*o+f*e+F*s,t[5]=x*l+f*M+F*c,t[6]=m*r+h*u+d*i,t[7]=m*o+h*e+d*s,t[8]=m*l+h*M+d*c,t},o.mul=o.multiply,o.translate=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=a[3],e=a[4],M=a[5],i=a[6],s=a[7],c=a[8],D=n[0],S=n[1];return t[0]=r,t[1]=o,t[2]=l,t[3]=u,t[4]=e,t[5]=M,t[6]=D*r+S*u+i,t[7]=D*o+S*e+s,t[8]=D*l+S*M+c,t},o.rotate=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=a[3],e=a[4],M=a[5],i=a[6],s=a[7],c=a[8],D=Math.sin(n),S=Math.cos(n);return t[0]=S*r+D*u,t[1]=S*o+D*e,t[2]=S*l+D*M,t[3]=S*u-D*r,t[4]=S*e-D*o,t[5]=S*M-D*l,t[6]=i,t[7]=s,t[8]=c,t},o.scale=function(t,a,n){var r=n[0],o=n[1];return t[0]=r*a[0],t[1]=r*a[1],t[2]=r*a[2],t[3]=o*a[3],t[4]=o*a[4],t[5]=o*a[5],t[6]=a[6],t[7]=a[7],t[8]=a[8],t},o.fromTranslation=function(t,a){return t[0]=1,t[1]=0,t[2]=0,t[3]=0,t[4]=1,t[5]=0,t[6]=a[0],t[7]=a[1],t[8]=1,t},o.fromRotation=function(t,a){var n=Math.sin(a),r=Math.cos(a);return t[0]=r,t[1]=n,t[2]=0,t[3]=-n,t[4]=r,t[5]=0,t[6]=0,t[7]=0,t[8]=1,t},o.fromScaling=function(t,a){return t[0]=a[0],t[1]=0,t[2]=0,t[3]=0,t[4]=a[1],t[5]=0,t[6]=0,t[7]=0,t[8]=1,t},o.fromMat2d=function(t,a){return t[0]=a[0],t[1]=a[1],t[2]=0,t[3]=a[2],t[4]=a[3],t[5]=0,t[6]=a[4],t[7]=a[5],t[8]=1,t},o.fromQuat=function(t,a){var n=a[0],r=a[1],o=a[2],l=a[3],u=n+n,e=r+r,M=o+o,i=n*u,s=r*u,c=r*e,D=o*u,S=o*e,I=o*M,x=l*u,f=l*e,F=l*M;return t[0]=1-c-I,t[3]=s-F,t[6]=D+f,t[1]=s+F,t[4]=1-i-I,t[7]=S-x,t[2]=D-f,t[5]=S+x,t[8]=1-i-c,t},o.normalFromMat4=function(t,a){var n=a[0],r=a[1],o=a[2],l=a[3],u=a[4],e=a[5],M=a[6],i=a[7],s=a[8],c=a[9],D=a[10],S=a[11],I=a[12],x=a[13],f=a[14],F=a[15],m=n*e-r*u,h=n*M-o*u,d=n*i-l*u,v=r*M-o*e,z=r*i-l*e,p=o*i-l*M,w=s*x-c*I,A=s*f-D*I,R=s*F-S*I,b=c*f-D*x,Y=c*F-S*x,q=D*F-S*f,y=m*q-h*Y+d*b+v*R-z*A+p*w;return y?(y=1/y,t[0]=(e*q-M*Y+i*b)*y,t[1]=(M*R-u*q-i*A)*y,t[2]=(u*Y-e*R+i*w)*y,t[3]=(o*Y-r*q-l*b)*y,t[4]=(n*q-o*R+l*A)*y,t[5]=(r*R-n*Y-l*w)*y,t[6]=(x*p-f*z+F*v)*y,t[7]=(f*d-I*p-F*h)*y,t[8]=(I*z-x*d+F*m)*y,t):null},o.str=function(t){return"mat3("+t[0]+", "+t[1]+", "+t[2]+", "+t[3]+", "+t[4]+", "+t[5]+", "+t[6]+", "+t[7]+", "+t[8]+")"},o.frob=function(t){return Math.sqrt(Math.pow(t[0],2)+Math.pow(t[1],2)+Math.pow(t[2],2)+Math.pow(t[3],2)+Math.pow(t[4],2)+Math.pow(t[5],2)+Math.pow(t[6],2)+Math.pow(t[7],2)+Math.pow(t[8],2))},t.exports=o},function(t,a,n){var r=n(1),o={scalar:{},SIMD:{}};o.create=function(){var t=new r.ARRAY_TYPE(16);return t[0]=1,t[1]=0,t[2]=0,t[3]=0,t[4]=0,t[5]=1,t[6]=0,t[7]=0,t[8]=0,t[9]=0,t[10]=1,t[11]=0,t[12]=0,t[13]=0,t[14]=0,t[15]=1,t},o.clone=function(t){var a=new r.ARRAY_TYPE(16);return a[0]=t[0],a[1]=t[1],a[2]=t[2],a[3]=t[3],a[4]=t[4],a[5]=t[5],a[6]=t[6],a[7]=t[7],a[8]=t[8],a[9]=t[9],a[10]=t[10],a[11]=t[11],a[12]=t[12],a[13]=t[13],a[14]=t[14],a[15]=t[15],a},o.copy=function(t,a){return t[0]=a[0],t[1]=a[1],t[2]=a[2],t[3]=a[3],t[4]=a[4],t[5]=a[5],t[6]=a[6],t[7]=a[7],t[8]=a[8],t[9]=a[9],t[10]=a[10],t[11]=a[11],t[12]=a[12],t[13]=a[13],t[14]=a[14],t[15]=a[15],t},o.identity=function(t){return t[0]=1,t[1]=0,t[2]=0,t[3]=0,t[4]=0,t[5]=1,t[6]=0,t[7]=0,t[8]=0,t[9]=0,t[10]=1,t[11]=0,t[12]=0,t[13]=0,t[14]=0,t[15]=1,t},o.scalar.transpose=function(t,a){if(t===a){var n=a[1],r=a[2],o=a[3],l=a[6],u=a[7],e=a[11];t[1]=a[4],t[2]=a[8],t[3]=a[12],t[4]=n,t[6]=a[9],t[7]=a[13],t[8]=r,t[9]=l,t[11]=a[14],t[12]=o,t[13]=u,t[14]=e}else t[0]=a[0],t[1]=a[4],t[2]=a[8],t[3]=a[12],t[4]=a[1],t[5]=a[5],t[6]=a[9],t[7]=a[13],t[8]=a[2],t[9]=a[6],t[10]=a[10],t[11]=a[14],t[12]=a[3],t[13]=a[7],t[14]=a[11],t[15]=a[15];return t},o.SIMD.transpose=function(t,a){var n,r,o,l,u,e,M,i,s,c;return n=SIMD.Float32x4.load(a,0),r=SIMD.Float32x4.load(a,4),o=SIMD.Float32x4.load(a,8),l=SIMD.Float32x4.load(a,12),u=SIMD.Float32x4.shuffle(n,r,0,1,4,5),e=SIMD.Float32x4.shuffle(o,l,0,1,4,5),M=SIMD.Float32x4.shuffle(u,e,0,2,4,6),i=SIMD.Float32x4.shuffle(u,e,1,3,5,7),SIMD.Float32x4.store(t,0,M),SIMD.Float32x4.store(t,4,i),u=SIMD.Float32x4.shuffle(n,r,2,3,6,7),e=SIMD.Float32x4.shuffle(o,l,2,3,6,7),s=SIMD.Float32x4.shuffle(u,e,0,2,4,6),c=SIMD.Float32x4.shuffle(u,e,1,3,5,7),SIMD.Float32x4.store(t,8,s),SIMD.Float32x4.store(t,12,c),t},o.transpose=r.USE_SIMD?o.SIMD.transpose:o.scalar.transpose,o.scalar.invert=function(t,a){var n=a[0],r=a[1],o=a[2],l=a[3],u=a[4],e=a[5],M=a[6],i=a[7],s=a[8],c=a[9],D=a[10],S=a[11],I=a[12],x=a[13],f=a[14],F=a[15],m=n*e-r*u,h=n*M-o*u,d=n*i-l*u,v=r*M-o*e,z=r*i-l*e,p=o*i-l*M,w=s*x-c*I,A=s*f-D*I,R=s*F-S*I,b=c*f-D*x,Y=c*F-S*x,q=D*F-S*f,y=m*q-h*Y+d*b+v*R-z*A+p*w;return y?(y=1/y,t[0]=(e*q-M*Y+i*b)*y,t[1]=(o*Y-r*q-l*b)*y,t[2]=(x*p-f*z+F*v)*y,t[3]=(D*z-c*p-S*v)*y,t[4]=(M*R-u*q-i*A)*y,t[5]=(n*q-o*R+l*A)*y,t[6]=(f*d-I*p-F*h)*y,t[7]=(s*p-D*d+S*h)*y,t[8]=(u*Y-e*R+i*w)*y,t[9]=(r*R-n*Y-l*w)*y,t[10]=(I*z-x*d+F*m)*y,t[11]=(c*d-s*z-S*m)*y,t[12]=(e*A-u*b-M*w)*y,t[13]=(n*b-r*A+o*w)*y,t[14]=(x*h-I*v-f*m)*y,t[15]=(s*v-c*h+D*m)*y,t):null},o.SIMD.invert=function(t,a){var n,r,o,l,u,e,M,i,s,c,D=SIMD.Float32x4.load(a,0),S=SIMD.Float32x4.load(a,4),I=SIMD.Float32x4.load(a,8),x=SIMD.Float32x4.load(a,12);return u=SIMD.Float32x4.shuffle(D,S,0,1,4,5),r=SIMD.Float32x4.shuffle(I,x,0,1,4,5),n=SIMD.Float32x4.shuffle(u,r,0,2,4,6),r=SIMD.Float32x4.shuffle(r,u,1,3,5,7),u=SIMD.Float32x4.shuffle(D,S,2,3,6,7),l=SIMD.Float32x4.shuffle(I,x,2,3,6,7),o=SIMD.Float32x4.shuffle(u,l,0,2,4,6),l=SIMD.Float32x4.shuffle(l,u,1,3,5,7),u=SIMD.Float32x4.mul(o,l),u=SIMD.Float32x4.swizzle(u,1,0,3,2),e=SIMD.Float32x4.mul(r,u),M=SIMD.Float32x4.mul(n,u),u=SIMD.Float32x4.swizzle(u,2,3,0,1),e=SIMD.Float32x4.sub(SIMD.Float32x4.mul(r,u),e),M=SIMD.Float32x4.sub(SIMD.Float32x4.mul(n,u),M),M=SIMD.Float32x4.swizzle(M,2,3,0,1),u=SIMD.Float32x4.mul(r,o),u=SIMD.Float32x4.swizzle(u,1,0,3,2),e=SIMD.Float32x4.add(SIMD.Float32x4.mul(l,u),e),s=SIMD.Float32x4.mul(n,u),u=SIMD.Float32x4.swizzle(u,2,3,0,1),e=SIMD.Float32x4.sub(e,SIMD.Float32x4.mul(l,u)),s=SIMD.Float32x4.sub(SIMD.Float32x4.mul(n,u),s),s=SIMD.Float32x4.swizzle(s,2,3,0,1),u=SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(r,2,3,0,1),l),u=SIMD.Float32x4.swizzle(u,1,0,3,2),o=SIMD.Float32x4.swizzle(o,2,3,0,1),e=SIMD.Float32x4.add(SIMD.Float32x4.mul(o,u),e),i=SIMD.Float32x4.mul(n,u),u=SIMD.Float32x4.swizzle(u,2,3,0,1),e=SIMD.Float32x4.sub(e,SIMD.Float32x4.mul(o,u)),i=SIMD.Float32x4.sub(SIMD.Float32x4.mul(n,u),i),i=SIMD.Float32x4.swizzle(i,2,3,0,1),u=SIMD.Float32x4.mul(n,r),u=SIMD.Float32x4.swizzle(u,1,0,3,2),i=SIMD.Float32x4.add(SIMD.Float32x4.mul(l,u),i),s=SIMD.Float32x4.sub(SIMD.Float32x4.mul(o,u),s),u=SIMD.Float32x4.swizzle(u,2,3,0,1),i=SIMD.Float32x4.sub(SIMD.Float32x4.mul(l,u),i),s=SIMD.Float32x4.sub(s,SIMD.Float32x4.mul(o,u)),u=SIMD.Float32x4.mul(n,l),u=SIMD.Float32x4.swizzle(u,1,0,3,2),M=SIMD.Float32x4.sub(M,SIMD.Float32x4.mul(o,u)),i=SIMD.Float32x4.add(SIMD.Float32x4.mul(r,u),i),u=SIMD.Float32x4.swizzle(u,2,3,0,1),M=SIMD.Float32x4.add(SIMD.Float32x4.mul(o,u),M),i=SIMD.Float32x4.sub(i,SIMD.Float32x4.mul(r,u)),u=SIMD.Float32x4.mul(n,o),u=SIMD.Float32x4.swizzle(u,1,0,3,2),M=SIMD.Float32x4.add(SIMD.Float32x4.mul(l,u),M),s=SIMD.Float32x4.sub(s,SIMD.Float32x4.mul(r,u)),u=SIMD.Float32x4.swizzle(u,2,3,0,1),M=SIMD.Float32x4.sub(M,SIMD.Float32x4.mul(l,u)),s=SIMD.Float32x4.add(SIMD.Float32x4.mul(r,u),s),c=SIMD.Float32x4.mul(n,e),c=SIMD.Float32x4.add(SIMD.Float32x4.swizzle(c,2,3,0,1),c),c=SIMD.Float32x4.add(SIMD.Float32x4.swizzle(c,1,0,3,2),c),u=SIMD.Float32x4.reciprocalApproximation(c),c=SIMD.Float32x4.sub(SIMD.Float32x4.add(u,u),SIMD.Float32x4.mul(c,SIMD.Float32x4.mul(u,u))),(c=SIMD.Float32x4.swizzle(c,0,0,0,0))?(SIMD.Float32x4.store(t,0,SIMD.Float32x4.mul(c,e)),SIMD.Float32x4.store(t,4,SIMD.Float32x4.mul(c,M)),SIMD.Float32x4.store(t,8,SIMD.Float32x4.mul(c,i)),SIMD.Float32x4.store(t,12,SIMD.Float32x4.mul(c,s)),t):null},o.invert=r.USE_SIMD?o.SIMD.invert:o.scalar.invert,o.scalar.adjoint=function(t,a){var n=a[0],r=a[1],o=a[2],l=a[3],u=a[4],e=a[5],M=a[6],i=a[7],s=a[8],c=a[9],D=a[10],S=a[11],I=a[12],x=a[13],f=a[14],F=a[15];return t[0]=e*(D*F-S*f)-c*(M*F-i*f)+x*(M*S-i*D),t[1]=-(r*(D*F-S*f)-c*(o*F-l*f)+x*(o*S-l*D)),t[2]=r*(M*F-i*f)-e*(o*F-l*f)+x*(o*i-l*M),t[3]=-(r*(M*S-i*D)-e*(o*S-l*D)+c*(o*i-l*M)),t[4]=-(u*(D*F-S*f)-s*(M*F-i*f)+I*(M*S-i*D)),t[5]=n*(D*F-S*f)-s*(o*F-l*f)+I*(o*S-l*D),t[6]=-(n*(M*F-i*f)-u*(o*F-l*f)+I*(o*i-l*M)),t[7]=n*(M*S-i*D)-u*(o*S-l*D)+s*(o*i-l*M),t[8]=u*(c*F-S*x)-s*(e*F-i*x)+I*(e*S-i*c),t[9]=-(n*(c*F-S*x)-s*(r*F-l*x)+I*(r*S-l*c)),t[10]=n*(e*F-i*x)-u*(r*F-l*x)+I*(r*i-l*e),t[11]=-(n*(e*S-i*c)-u*(r*S-l*c)+s*(r*i-l*e)),t[12]=-(u*(c*f-D*x)-s*(e*f-M*x)+I*(e*D-M*c)),t[13]=n*(c*f-D*x)-s*(r*f-o*x)+I*(r*D-o*c),t[14]=-(n*(e*f-M*x)-u*(r*f-o*x)+I*(r*M-o*e)),t[15]=n*(e*D-M*c)-u*(r*D-o*c)+s*(r*M-o*e),t},o.SIMD.adjoint=function(t,a){var n,r,o,l,u,e,M,i,s,c,D,S,I,n=SIMD.Float32x4.load(a,0),r=SIMD.Float32x4.load(a,4),o=SIMD.Float32x4.load(a,8),l=SIMD.Float32x4.load(a,12);return s=SIMD.Float32x4.shuffle(n,r,0,1,4,5),e=SIMD.Float32x4.shuffle(o,l,0,1,4,5),u=SIMD.Float32x4.shuffle(s,e,0,2,4,6),e=SIMD.Float32x4.shuffle(e,s,1,3,5,7),s=SIMD.Float32x4.shuffle(n,r,2,3,6,7),i=SIMD.Float32x4.shuffle(o,l,2,3,6,7),M=SIMD.Float32x4.shuffle(s,i,0,2,4,6),i=SIMD.Float32x4.shuffle(i,s,1,3,5,7),s=SIMD.Float32x4.mul(M,i),s=SIMD.Float32x4.swizzle(s,1,0,3,2),c=SIMD.Float32x4.mul(e,s),D=SIMD.Float32x4.mul(u,s),s=SIMD.Float32x4.swizzle(s,2,3,0,1),c=SIMD.Float32x4.sub(SIMD.Float32x4.mul(e,s),c),D=SIMD.Float32x4.sub(SIMD.Float32x4.mul(u,s),D),D=SIMD.Float32x4.swizzle(D,2,3,0,1),s=SIMD.Float32x4.mul(e,M),s=SIMD.Float32x4.swizzle(s,1,0,3,2),c=SIMD.Float32x4.add(SIMD.Float32x4.mul(i,s),c),I=SIMD.Float32x4.mul(u,s),s=SIMD.Float32x4.swizzle(s,2,3,0,1),c=SIMD.Float32x4.sub(c,SIMD.Float32x4.mul(i,s)),I=SIMD.Float32x4.sub(SIMD.Float32x4.mul(u,s),I),I=SIMD.Float32x4.swizzle(I,2,3,0,1),s=SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(e,2,3,0,1),i),s=SIMD.Float32x4.swizzle(s,1,0,3,2),M=SIMD.Float32x4.swizzle(M,2,3,0,1),c=SIMD.Float32x4.add(SIMD.Float32x4.mul(M,s),c),S=SIMD.Float32x4.mul(u,s),s=SIMD.Float32x4.swizzle(s,2,3,0,1),c=SIMD.Float32x4.sub(c,SIMD.Float32x4.mul(M,s)),S=SIMD.Float32x4.sub(SIMD.Float32x4.mul(u,s),S),S=SIMD.Float32x4.swizzle(S,2,3,0,1),s=SIMD.Float32x4.mul(u,e),s=SIMD.Float32x4.swizzle(s,1,0,3,2),S=SIMD.Float32x4.add(SIMD.Float32x4.mul(i,s),S),I=SIMD.Float32x4.sub(SIMD.Float32x4.mul(M,s),I),s=SIMD.Float32x4.swizzle(s,2,3,0,1),S=SIMD.Float32x4.sub(SIMD.Float32x4.mul(i,s),S),I=SIMD.Float32x4.sub(I,SIMD.Float32x4.mul(M,s)),s=SIMD.Float32x4.mul(u,i),s=SIMD.Float32x4.swizzle(s,1,0,3,2),D=SIMD.Float32x4.sub(D,SIMD.Float32x4.mul(M,s)),S=SIMD.Float32x4.add(SIMD.Float32x4.mul(e,s),S),s=SIMD.Float32x4.swizzle(s,2,3,0,1),D=SIMD.Float32x4.add(SIMD.Float32x4.mul(M,s),D),S=SIMD.Float32x4.sub(S,SIMD.Float32x4.mul(e,s)),s=SIMD.Float32x4.mul(u,M),s=SIMD.Float32x4.swizzle(s,1,0,3,2),D=SIMD.Float32x4.add(SIMD.Float32x4.mul(i,s),D),I=SIMD.Float32x4.sub(I,SIMD.Float32x4.mul(e,s)),s=SIMD.Float32x4.swizzle(s,2,3,0,1),D=SIMD.Float32x4.sub(D,SIMD.Float32x4.mul(i,s)),I=SIMD.Float32x4.add(SIMD.Float32x4.mul(e,s),I),SIMD.Float32x4.store(t,0,c),SIMD.Float32x4.store(t,4,D),SIMD.Float32x4.store(t,8,S),SIMD.Float32x4.store(t,12,I),t},o.adjoint=r.USE_SIMD?o.SIMD.adjoint:o.scalar.adjoint,o.determinant=function(t){var a=t[0],n=t[1],r=t[2],o=t[3],l=t[4],u=t[5],e=t[6],M=t[7],i=t[8],s=t[9],c=t[10],D=t[11],S=t[12],I=t[13],x=t[14],f=t[15],F=a*u-n*l,m=a*e-r*l,h=a*M-o*l,d=n*e-r*u,v=n*M-o*u,z=r*M-o*e,p=i*I-s*S,w=i*x-c*S,A=i*f-D*S,R=s*x-c*I,b=s*f-D*I,Y=c*f-D*x;return F*Y-m*b+h*R+d*A-v*w+z*p},o.SIMD.multiply=function(t,a,n){var r=SIMD.Float32x4.load(a,0),o=SIMD.Float32x4.load(a,4),l=SIMD.Float32x4.load(a,8),u=SIMD.Float32x4.load(a,12),e=SIMD.Float32x4.load(n,0),M=SIMD.Float32x4.add(SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(e,0,0,0,0),r),SIMD.Float32x4.add(SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(e,1,1,1,1),o),SIMD.Float32x4.add(SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(e,2,2,2,2),l),SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(e,3,3,3,3),u))));SIMD.Float32x4.store(t,0,M);var i=SIMD.Float32x4.load(n,4),s=SIMD.Float32x4.add(SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(i,0,0,0,0),r),SIMD.Float32x4.add(SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(i,1,1,1,1),o),SIMD.Float32x4.add(SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(i,2,2,2,2),l),SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(i,3,3,3,3),u))));SIMD.Float32x4.store(t,4,s);var c=SIMD.Float32x4.load(n,8),D=SIMD.Float32x4.add(SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(c,0,0,0,0),r),SIMD.Float32x4.add(SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(c,1,1,1,1),o),SIMD.Float32x4.add(SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(c,2,2,2,2),l),SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(c,3,3,3,3),u))));SIMD.Float32x4.store(t,8,D);var S=SIMD.Float32x4.load(n,12),I=SIMD.Float32x4.add(SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(S,0,0,0,0),r),SIMD.Float32x4.add(SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(S,1,1,1,1),o),SIMD.Float32x4.add(SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(S,2,2,2,2),l),SIMD.Float32x4.mul(SIMD.Float32x4.swizzle(S,3,3,3,3),u))));return SIMD.Float32x4.store(t,12,I),t},o.scalar.multiply=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=a[3],e=a[4],M=a[5],i=a[6],s=a[7],c=a[8],D=a[9],S=a[10],I=a[11],x=a[12],f=a[13],F=a[14],m=a[15],h=n[0],d=n[1],v=n[2],z=n[3];return t[0]=h*r+d*e+v*c+z*x,t[1]=h*o+d*M+v*D+z*f,t[2]=h*l+d*i+v*S+z*F,t[3]=h*u+d*s+v*I+z*m,h=n[4],d=n[5],v=n[6],z=n[7],t[4]=h*r+d*e+v*c+z*x,t[5]=h*o+d*M+v*D+z*f,t[6]=h*l+d*i+v*S+z*F,t[7]=h*u+d*s+v*I+z*m,h=n[8],d=n[9],v=n[10],z=n[11],t[8]=h*r+d*e+v*c+z*x,t[9]=h*o+d*M+v*D+z*f,t[10]=h*l+d*i+v*S+z*F,t[11]=h*u+d*s+v*I+z*m,h=n[12],d=n[13],v=n[14],z=n[15],t[12]=h*r+d*e+v*c+z*x,t[13]=h*o+d*M+v*D+z*f,t[14]=h*l+d*i+v*S+z*F,t[15]=h*u+d*s+v*I+z*m,t},o.multiply=r.USE_SIMD?o.SIMD.multiply:o.scalar.multiply,o.mul=o.multiply,o.scalar.translate=function(t,a,n){var r,o,l,u,e,M,i,s,c,D,S,I,x=n[0],f=n[1],F=n[2];return a===t?(t[12]=a[0]*x+a[4]*f+a[8]*F+a[12],t[13]=a[1]*x+a[5]*f+a[9]*F+a[13],t[14]=a[2]*x+a[6]*f+a[10]*F+a[14],t[15]=a[3]*x+a[7]*f+a[11]*F+a[15]):(r=a[0],o=a[1],l=a[2],u=a[3],e=a[4],M=a[5],i=a[6],s=a[7],c=a[8],D=a[9],S=a[10],I=a[11],t[0]=r,t[1]=o,t[2]=l,t[3]=u,t[4]=e,t[5]=M,t[6]=i,t[7]=s,t[8]=c,t[9]=D,t[10]=S,t[11]=I,t[12]=r*x+e*f+c*F+a[12],t[13]=o*x+M*f+D*F+a[13],t[14]=l*x+i*f+S*F+a[14],t[15]=u*x+s*f+I*F+a[15]),t},o.SIMD.translate=function(t,a,n){var r=SIMD.Float32x4.load(a,0),o=SIMD.Float32x4.load(a,4),l=SIMD.Float32x4.load(a,8),u=SIMD.Float32x4.load(a,12),e=SIMD.Float32x4(n[0],n[1],n[2],0);a!==t&&(t[0]=a[0],t[1]=a[1],t[2]=a[2],t[3]=a[3],t[4]=a[4],t[5]=a[5],t[6]=a[6],t[7]=a[7],t[8]=a[8],t[9]=a[9],t[10]=a[10],t[11]=a[11]),r=SIMD.Float32x4.mul(r,SIMD.Float32x4.swizzle(e,0,0,0,0)),o=SIMD.Float32x4.mul(o,SIMD.Float32x4.swizzle(e,1,1,1,1)),l=SIMD.Float32x4.mul(l,SIMD.Float32x4.swizzle(e,2,2,2,2));var M=SIMD.Float32x4.add(r,SIMD.Float32x4.add(o,SIMD.Float32x4.add(l,u)));return SIMD.Float32x4.store(t,12,M),t},o.translate=r.USE_SIMD?o.SIMD.translate:o.scalar.translate,o.scalar.scale=function(t,a,n){var r=n[0],o=n[1],l=n[2];return t[0]=a[0]*r,t[1]=a[1]*r,t[2]=a[2]*r,t[3]=a[3]*r,t[4]=a[4]*o,t[5]=a[5]*o,t[6]=a[6]*o,t[7]=a[7]*o,t[8]=a[8]*l,t[9]=a[9]*l,t[10]=a[10]*l,t[11]=a[11]*l,t[12]=a[12],t[13]=a[13],t[14]=a[14],t[15]=a[15],t},o.SIMD.scale=function(t,a,n){var r,o,l,u=SIMD.Float32x4(n[0],n[1],n[2],0);return r=SIMD.Float32x4.load(a,0),SIMD.Float32x4.store(t,0,SIMD.Float32x4.mul(r,SIMD.Float32x4.swizzle(u,0,0,0,0))),o=SIMD.Float32x4.load(a,4),SIMD.Float32x4.store(t,4,SIMD.Float32x4.mul(o,SIMD.Float32x4.swizzle(u,1,1,1,1))),l=SIMD.Float32x4.load(a,8),SIMD.Float32x4.store(t,8,SIMD.Float32x4.mul(l,SIMD.Float32x4.swizzle(u,2,2,2,2))),t[12]=a[12],t[13]=a[13],t[14]=a[14],t[15]=a[15],t},o.scale=r.USE_SIMD?o.SIMD.scale:o.scalar.scale,o.rotate=function(t,a,n,o){var l,u,e,M,i,s,c,D,S,I,x,f,F,m,h,d,v,z,p,w,A,R,b,Y,q=o[0],y=o[1],E=o[2],g=Math.sqrt(q*q+y*y+E*E);return Math.abs(g)M?(l.cross(t,a,o),l.length(t)<1e-6&&l.cross(t,n,o),l.normalize(t,t),e.setAxisAngle(r,t,Math.PI),r):M>.999999?(r[0]=0,r[1]=0,r[2]=0,r[3]=1,r):(l.cross(t,o,u),r[0]=t[0],r[1]=t[1],r[2]=t[2],r[3]=1+M,e.normalize(r,r))}}(),e.setAxes=function(){var t=o.create();return function(a,n,r,o){return t[0]=r[0],t[3]=r[1],t[6]=r[2],t[1]=o[0],t[4]=o[1],t[7]=o[2],t[2]=-n[0],t[5]=-n[1],t[8]=-n[2],e.normalize(a,e.fromMat3(a,t))}}(),e.clone=u.clone,e.fromValues=u.fromValues,e.copy=u.copy,e.set=u.set,e.identity=function(t){return t[0]=0,t[1]=0,t[2]=0,t[3]=1,t},e.setAxisAngle=function(t,a,n){n=.5*n;var r=Math.sin(n);return t[0]=r*a[0],t[1]=r*a[1],t[2]=r*a[2],t[3]=Math.cos(n),t},e.add=u.add,e.multiply=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=a[3],e=n[0],M=n[1],i=n[2],s=n[3];return t[0]=r*s+u*e+o*i-l*M,t[1]=o*s+u*M+l*e-r*i,t[2]=l*s+u*i+r*M-o*e,t[3]=u*s-r*e-o*M-l*i,t},e.mul=e.multiply,e.scale=u.scale,e.rotateX=function(t,a,n){n*=.5;var r=a[0],o=a[1],l=a[2],u=a[3],e=Math.sin(n),M=Math.cos(n);return t[0]=r*M+u*e,t[1]=o*M+l*e,t[2]=l*M-o*e,t[3]=u*M-r*e,t},e.rotateY=function(t,a,n){n*=.5;var r=a[0],o=a[1],l=a[2],u=a[3],e=Math.sin(n),M=Math.cos(n);return t[0]=r*M-l*e,t[1]=o*M+u*e,t[2]=l*M+r*e,t[3]=u*M-o*e,t},e.rotateZ=function(t,a,n){n*=.5;var r=a[0],o=a[1],l=a[2],u=a[3],e=Math.sin(n),M=Math.cos(n);return t[0]=r*M+o*e,t[1]=o*M-r*e,t[2]=l*M+u*e,t[3]=u*M-l*e,t},e.calculateW=function(t,a){var n=a[0],r=a[1],o=a[2];return t[0]=n,t[1]=r,t[2]=o,t[3]=Math.sqrt(Math.abs(1-n*n-r*r-o*o)),t},e.dot=u.dot,e.lerp=u.lerp,e.slerp=function(t,a,n,r){var o,l,u,e,M,i=a[0],s=a[1],c=a[2],D=a[3],S=n[0],I=n[1],x=n[2],f=n[3];return l=i*S+s*I+c*x+D*f,0>l&&(l=-l,S=-S,I=-I,x=-x,f=-f),1-l>1e-6?(o=Math.acos(l),u=Math.sin(o),e=Math.sin((1-r)*o)/u,M=Math.sin(r*o)/u):(e=1-r,M=r),t[0]=e*i+M*S,t[1]=e*s+M*I,t[2]=e*c+M*x,t[3]=e*D+M*f,t},e.sqlerp=function(){var t=e.create(),a=e.create();return function(n,r,o,l,u,M){return e.slerp(t,r,u,M),e.slerp(a,o,l,M),e.slerp(n,t,a,2*M*(1-M)),n}}(),e.invert=function(t,a){var n=a[0],r=a[1],o=a[2],l=a[3],u=n*n+r*r+o*o+l*l,e=u?1/u:0; +return t[0]=-n*e,t[1]=-r*e,t[2]=-o*e,t[3]=l*e,t},e.conjugate=function(t,a){return t[0]=-a[0],t[1]=-a[1],t[2]=-a[2],t[3]=a[3],t},e.length=u.length,e.len=e.length,e.squaredLength=u.squaredLength,e.sqrLen=e.squaredLength,e.normalize=u.normalize,e.fromMat3=function(t,a){var n,r=a[0]+a[4]+a[8];if(r>0)n=Math.sqrt(r+1),t[3]=.5*n,n=.5/n,t[0]=(a[5]-a[7])*n,t[1]=(a[6]-a[2])*n,t[2]=(a[1]-a[3])*n;else{var o=0;a[4]>a[0]&&(o=1),a[8]>a[3*o+o]&&(o=2);var l=(o+1)%3,u=(o+2)%3;n=Math.sqrt(a[3*o+o]-a[3*l+l]-a[3*u+u]+1),t[o]=.5*n,n=.5/n,t[3]=(a[3*l+u]-a[3*u+l])*n,t[l]=(a[3*l+o]+a[3*o+l])*n,t[u]=(a[3*u+o]+a[3*o+u])*n}return t},e.str=function(t){return"quat("+t[0]+", "+t[1]+", "+t[2]+", "+t[3]+")"},t.exports=e},function(t,a,n){var r=n(1),o={};o.create=function(){var t=new r.ARRAY_TYPE(3);return t[0]=0,t[1]=0,t[2]=0,t},o.clone=function(t){var a=new r.ARRAY_TYPE(3);return a[0]=t[0],a[1]=t[1],a[2]=t[2],a},o.fromValues=function(t,a,n){var o=new r.ARRAY_TYPE(3);return o[0]=t,o[1]=a,o[2]=n,o},o.copy=function(t,a){return t[0]=a[0],t[1]=a[1],t[2]=a[2],t},o.set=function(t,a,n,r){return t[0]=a,t[1]=n,t[2]=r,t},o.add=function(t,a,n){return t[0]=a[0]+n[0],t[1]=a[1]+n[1],t[2]=a[2]+n[2],t},o.subtract=function(t,a,n){return t[0]=a[0]-n[0],t[1]=a[1]-n[1],t[2]=a[2]-n[2],t},o.sub=o.subtract,o.multiply=function(t,a,n){return t[0]=a[0]*n[0],t[1]=a[1]*n[1],t[2]=a[2]*n[2],t},o.mul=o.multiply,o.divide=function(t,a,n){return t[0]=a[0]/n[0],t[1]=a[1]/n[1],t[2]=a[2]/n[2],t},o.div=o.divide,o.min=function(t,a,n){return t[0]=Math.min(a[0],n[0]),t[1]=Math.min(a[1],n[1]),t[2]=Math.min(a[2],n[2]),t},o.max=function(t,a,n){return t[0]=Math.max(a[0],n[0]),t[1]=Math.max(a[1],n[1]),t[2]=Math.max(a[2],n[2]),t},o.scale=function(t,a,n){return t[0]=a[0]*n,t[1]=a[1]*n,t[2]=a[2]*n,t},o.scaleAndAdd=function(t,a,n,r){return t[0]=a[0]+n[0]*r,t[1]=a[1]+n[1]*r,t[2]=a[2]+n[2]*r,t},o.distance=function(t,a){var n=a[0]-t[0],r=a[1]-t[1],o=a[2]-t[2];return Math.sqrt(n*n+r*r+o*o)},o.dist=o.distance,o.squaredDistance=function(t,a){var n=a[0]-t[0],r=a[1]-t[1],o=a[2]-t[2];return n*n+r*r+o*o},o.sqrDist=o.squaredDistance,o.length=function(t){var a=t[0],n=t[1],r=t[2];return Math.sqrt(a*a+n*n+r*r)},o.len=o.length,o.squaredLength=function(t){var a=t[0],n=t[1],r=t[2];return a*a+n*n+r*r},o.sqrLen=o.squaredLength,o.negate=function(t,a){return t[0]=-a[0],t[1]=-a[1],t[2]=-a[2],t},o.inverse=function(t,a){return t[0]=1/a[0],t[1]=1/a[1],t[2]=1/a[2],t},o.normalize=function(t,a){var n=a[0],r=a[1],o=a[2],l=n*n+r*r+o*o;return l>0&&(l=1/Math.sqrt(l),t[0]=a[0]*l,t[1]=a[1]*l,t[2]=a[2]*l),t},o.dot=function(t,a){return t[0]*a[0]+t[1]*a[1]+t[2]*a[2]},o.cross=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=n[0],e=n[1],M=n[2];return t[0]=o*M-l*e,t[1]=l*u-r*M,t[2]=r*e-o*u,t},o.lerp=function(t,a,n,r){var o=a[0],l=a[1],u=a[2];return t[0]=o+r*(n[0]-o),t[1]=l+r*(n[1]-l),t[2]=u+r*(n[2]-u),t},o.hermite=function(t,a,n,r,o,l){var u=l*l,e=u*(2*l-3)+1,M=u*(l-2)+l,i=u*(l-1),s=u*(3-2*l);return t[0]=a[0]*e+n[0]*M+r[0]*i+o[0]*s,t[1]=a[1]*e+n[1]*M+r[1]*i+o[1]*s,t[2]=a[2]*e+n[2]*M+r[2]*i+o[2]*s,t},o.bezier=function(t,a,n,r,o,l){var u=1-l,e=u*u,M=l*l,i=e*u,s=3*l*e,c=3*M*u,D=M*l;return t[0]=a[0]*i+n[0]*s+r[0]*c+o[0]*D,t[1]=a[1]*i+n[1]*s+r[1]*c+o[1]*D,t[2]=a[2]*i+n[2]*s+r[2]*c+o[2]*D,t},o.random=function(t,a){a=a||1;var n=2*r.RANDOM()*Math.PI,o=2*r.RANDOM()-1,l=Math.sqrt(1-o*o)*a;return t[0]=Math.cos(n)*l,t[1]=Math.sin(n)*l,t[2]=o*a,t},o.transformMat4=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=n[3]*r+n[7]*o+n[11]*l+n[15];return u=u||1,t[0]=(n[0]*r+n[4]*o+n[8]*l+n[12])/u,t[1]=(n[1]*r+n[5]*o+n[9]*l+n[13])/u,t[2]=(n[2]*r+n[6]*o+n[10]*l+n[14])/u,t},o.transformMat3=function(t,a,n){var r=a[0],o=a[1],l=a[2];return t[0]=r*n[0]+o*n[3]+l*n[6],t[1]=r*n[1]+o*n[4]+l*n[7],t[2]=r*n[2]+o*n[5]+l*n[8],t},o.transformQuat=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=n[0],e=n[1],M=n[2],i=n[3],s=i*r+e*l-M*o,c=i*o+M*r-u*l,D=i*l+u*o-e*r,S=-u*r-e*o-M*l;return t[0]=s*i+S*-u+c*-M-D*-e,t[1]=c*i+S*-e+D*-u-s*-M,t[2]=D*i+S*-M+s*-e-c*-u,t},o.rotateX=function(t,a,n,r){var o=[],l=[];return o[0]=a[0]-n[0],o[1]=a[1]-n[1],o[2]=a[2]-n[2],l[0]=o[0],l[1]=o[1]*Math.cos(r)-o[2]*Math.sin(r),l[2]=o[1]*Math.sin(r)+o[2]*Math.cos(r),t[0]=l[0]+n[0],t[1]=l[1]+n[1],t[2]=l[2]+n[2],t},o.rotateY=function(t,a,n,r){var o=[],l=[];return o[0]=a[0]-n[0],o[1]=a[1]-n[1],o[2]=a[2]-n[2],l[0]=o[2]*Math.sin(r)+o[0]*Math.cos(r),l[1]=o[1],l[2]=o[2]*Math.cos(r)-o[0]*Math.sin(r),t[0]=l[0]+n[0],t[1]=l[1]+n[1],t[2]=l[2]+n[2],t},o.rotateZ=function(t,a,n,r){var o=[],l=[];return o[0]=a[0]-n[0],o[1]=a[1]-n[1],o[2]=a[2]-n[2],l[0]=o[0]*Math.cos(r)-o[1]*Math.sin(r),l[1]=o[0]*Math.sin(r)+o[1]*Math.cos(r),l[2]=o[2],t[0]=l[0]+n[0],t[1]=l[1]+n[1],t[2]=l[2]+n[2],t},o.forEach=function(){var t=o.create();return function(a,n,r,o,l,u){var e,M;for(n||(n=3),r||(r=0),M=o?Math.min(o*n+r,a.length):a.length,e=r;M>e;e+=n)t[0]=a[e],t[1]=a[e+1],t[2]=a[e+2],l(t,t,u),a[e]=t[0],a[e+1]=t[1],a[e+2]=t[2];return a}}(),o.angle=function(t,a){var n=o.fromValues(t[0],t[1],t[2]),r=o.fromValues(a[0],a[1],a[2]);o.normalize(n,n),o.normalize(r,r);var l=o.dot(n,r);return l>1?0:Math.acos(l)},o.str=function(t){return"vec3("+t[0]+", "+t[1]+", "+t[2]+")"},t.exports=o},function(t,a,n){var r=n(1),o={};o.create=function(){var t=new r.ARRAY_TYPE(4);return t[0]=0,t[1]=0,t[2]=0,t[3]=0,t},o.clone=function(t){var a=new r.ARRAY_TYPE(4);return a[0]=t[0],a[1]=t[1],a[2]=t[2],a[3]=t[3],a},o.fromValues=function(t,a,n,o){var l=new r.ARRAY_TYPE(4);return l[0]=t,l[1]=a,l[2]=n,l[3]=o,l},o.copy=function(t,a){return t[0]=a[0],t[1]=a[1],t[2]=a[2],t[3]=a[3],t},o.set=function(t,a,n,r,o){return t[0]=a,t[1]=n,t[2]=r,t[3]=o,t},o.add=function(t,a,n){return t[0]=a[0]+n[0],t[1]=a[1]+n[1],t[2]=a[2]+n[2],t[3]=a[3]+n[3],t},o.subtract=function(t,a,n){return t[0]=a[0]-n[0],t[1]=a[1]-n[1],t[2]=a[2]-n[2],t[3]=a[3]-n[3],t},o.sub=o.subtract,o.multiply=function(t,a,n){return t[0]=a[0]*n[0],t[1]=a[1]*n[1],t[2]=a[2]*n[2],t[3]=a[3]*n[3],t},o.mul=o.multiply,o.divide=function(t,a,n){return t[0]=a[0]/n[0],t[1]=a[1]/n[1],t[2]=a[2]/n[2],t[3]=a[3]/n[3],t},o.div=o.divide,o.min=function(t,a,n){return t[0]=Math.min(a[0],n[0]),t[1]=Math.min(a[1],n[1]),t[2]=Math.min(a[2],n[2]),t[3]=Math.min(a[3],n[3]),t},o.max=function(t,a,n){return t[0]=Math.max(a[0],n[0]),t[1]=Math.max(a[1],n[1]),t[2]=Math.max(a[2],n[2]),t[3]=Math.max(a[3],n[3]),t},o.scale=function(t,a,n){return t[0]=a[0]*n,t[1]=a[1]*n,t[2]=a[2]*n,t[3]=a[3]*n,t},o.scaleAndAdd=function(t,a,n,r){return t[0]=a[0]+n[0]*r,t[1]=a[1]+n[1]*r,t[2]=a[2]+n[2]*r,t[3]=a[3]+n[3]*r,t},o.distance=function(t,a){var n=a[0]-t[0],r=a[1]-t[1],o=a[2]-t[2],l=a[3]-t[3];return Math.sqrt(n*n+r*r+o*o+l*l)},o.dist=o.distance,o.squaredDistance=function(t,a){var n=a[0]-t[0],r=a[1]-t[1],o=a[2]-t[2],l=a[3]-t[3];return n*n+r*r+o*o+l*l},o.sqrDist=o.squaredDistance,o.length=function(t){var a=t[0],n=t[1],r=t[2],o=t[3];return Math.sqrt(a*a+n*n+r*r+o*o)},o.len=o.length,o.squaredLength=function(t){var a=t[0],n=t[1],r=t[2],o=t[3];return a*a+n*n+r*r+o*o},o.sqrLen=o.squaredLength,o.negate=function(t,a){return t[0]=-a[0],t[1]=-a[1],t[2]=-a[2],t[3]=-a[3],t},o.inverse=function(t,a){return t[0]=1/a[0],t[1]=1/a[1],t[2]=1/a[2],t[3]=1/a[3],t},o.normalize=function(t,a){var n=a[0],r=a[1],o=a[2],l=a[3],u=n*n+r*r+o*o+l*l;return u>0&&(u=1/Math.sqrt(u),t[0]=n*u,t[1]=r*u,t[2]=o*u,t[3]=l*u),t},o.dot=function(t,a){return t[0]*a[0]+t[1]*a[1]+t[2]*a[2]+t[3]*a[3]},o.lerp=function(t,a,n,r){var o=a[0],l=a[1],u=a[2],e=a[3];return t[0]=o+r*(n[0]-o),t[1]=l+r*(n[1]-l),t[2]=u+r*(n[2]-u),t[3]=e+r*(n[3]-e),t},o.random=function(t,a){return a=a||1,t[0]=r.RANDOM(),t[1]=r.RANDOM(),t[2]=r.RANDOM(),t[3]=r.RANDOM(),o.normalize(t,t),o.scale(t,t,a),t},o.transformMat4=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=a[3];return t[0]=n[0]*r+n[4]*o+n[8]*l+n[12]*u,t[1]=n[1]*r+n[5]*o+n[9]*l+n[13]*u,t[2]=n[2]*r+n[6]*o+n[10]*l+n[14]*u,t[3]=n[3]*r+n[7]*o+n[11]*l+n[15]*u,t},o.transformQuat=function(t,a,n){var r=a[0],o=a[1],l=a[2],u=n[0],e=n[1],M=n[2],i=n[3],s=i*r+e*l-M*o,c=i*o+M*r-u*l,D=i*l+u*o-e*r,S=-u*r-e*o-M*l;return t[0]=s*i+S*-u+c*-M-D*-e,t[1]=c*i+S*-e+D*-u-s*-M,t[2]=D*i+S*-M+s*-e-c*-u,t[3]=a[3],t},o.forEach=function(){var t=o.create();return function(a,n,r,o,l,u){var e,M;for(n||(n=4),r||(r=0),M=o?Math.min(o*n+r,a.length):a.length,e=r;M>e;e+=n)t[0]=a[e],t[1]=a[e+1],t[2]=a[e+2],t[3]=a[e+3],l(t,t,u),a[e]=t[0],a[e+1]=t[1],a[e+2]=t[2],a[e+3]=t[3];return a}}(),o.str=function(t){return"vec4("+t[0]+", "+t[1]+", "+t[2]+", "+t[3]+")"},t.exports=o},function(t,a,n){var r=n(1),o={};o.create=function(){var t=new r.ARRAY_TYPE(2);return t[0]=0,t[1]=0,t},o.clone=function(t){var a=new r.ARRAY_TYPE(2);return a[0]=t[0],a[1]=t[1],a},o.fromValues=function(t,a){var n=new r.ARRAY_TYPE(2);return n[0]=t,n[1]=a,n},o.copy=function(t,a){return t[0]=a[0],t[1]=a[1],t},o.set=function(t,a,n){return t[0]=a,t[1]=n,t},o.add=function(t,a,n){return t[0]=a[0]+n[0],t[1]=a[1]+n[1],t},o.subtract=function(t,a,n){return t[0]=a[0]-n[0],t[1]=a[1]-n[1],t},o.sub=o.subtract,o.multiply=function(t,a,n){return t[0]=a[0]*n[0],t[1]=a[1]*n[1],t},o.mul=o.multiply,o.divide=function(t,a,n){return t[0]=a[0]/n[0],t[1]=a[1]/n[1],t},o.div=o.divide,o.min=function(t,a,n){return t[0]=Math.min(a[0],n[0]),t[1]=Math.min(a[1],n[1]),t},o.max=function(t,a,n){return t[0]=Math.max(a[0],n[0]),t[1]=Math.max(a[1],n[1]),t},o.scale=function(t,a,n){return t[0]=a[0]*n,t[1]=a[1]*n,t},o.scaleAndAdd=function(t,a,n,r){return t[0]=a[0]+n[0]*r,t[1]=a[1]+n[1]*r,t},o.distance=function(t,a){var n=a[0]-t[0],r=a[1]-t[1];return Math.sqrt(n*n+r*r)},o.dist=o.distance,o.squaredDistance=function(t,a){var n=a[0]-t[0],r=a[1]-t[1];return n*n+r*r},o.sqrDist=o.squaredDistance,o.length=function(t){var a=t[0],n=t[1];return Math.sqrt(a*a+n*n)},o.len=o.length,o.squaredLength=function(t){var a=t[0],n=t[1];return a*a+n*n},o.sqrLen=o.squaredLength,o.negate=function(t,a){return t[0]=-a[0],t[1]=-a[1],t},o.inverse=function(t,a){return t[0]=1/a[0],t[1]=1/a[1],t},o.normalize=function(t,a){var n=a[0],r=a[1],o=n*n+r*r;return o>0&&(o=1/Math.sqrt(o),t[0]=a[0]*o,t[1]=a[1]*o),t},o.dot=function(t,a){return t[0]*a[0]+t[1]*a[1]},o.cross=function(t,a,n){var r=a[0]*n[1]-a[1]*n[0];return t[0]=t[1]=0,t[2]=r,t},o.lerp=function(t,a,n,r){var o=a[0],l=a[1];return t[0]=o+r*(n[0]-o),t[1]=l+r*(n[1]-l),t},o.random=function(t,a){a=a||1;var n=2*r.RANDOM()*Math.PI;return t[0]=Math.cos(n)*a,t[1]=Math.sin(n)*a,t},o.transformMat2=function(t,a,n){var r=a[0],o=a[1];return t[0]=n[0]*r+n[2]*o,t[1]=n[1]*r+n[3]*o,t},o.transformMat2d=function(t,a,n){var r=a[0],o=a[1];return t[0]=n[0]*r+n[2]*o+n[4],t[1]=n[1]*r+n[3]*o+n[5],t},o.transformMat3=function(t,a,n){var r=a[0],o=a[1];return t[0]=n[0]*r+n[3]*o+n[6],t[1]=n[1]*r+n[4]*o+n[7],t},o.transformMat4=function(t,a,n){var r=a[0],o=a[1];return t[0]=n[0]*r+n[4]*o+n[12],t[1]=n[1]*r+n[5]*o+n[13],t},o.forEach=function(){var t=o.create();return function(a,n,r,o,l,u){var e,M;for(n||(n=2),r||(r=0),M=o?Math.min(o*n+r,a.length):a.length,e=r;M>e;e+=n)t[0]=a[e],t[1]=a[e+1],l(t,t,u),a[e]=t[0],a[e+1]=t[1];return a}}(),o.str=function(t){return"vec2("+t[0]+", "+t[1]+")"},t.exports=o}])}); Index: /issm/trunk/externalpackages/javascript/hammer.min.js =================================================================== --- /issm/trunk/externalpackages/javascript/hammer.min.js (revision 24313) +++ /issm/trunk/externalpackages/javascript/hammer.min.js (revision 24313) @@ -0,0 +1,6 @@ +/*! Hammer.JS - v2.0.4 - 2014-09-28 + * http://hammerjs.github.io/ + * + * Copyright (c) 2014 Jorik Tangelder; + * Licensed under the MIT license */ +!function(a,b,c,d){"use strict";function e(a,b,c){return setTimeout(k(a,c),b)}function f(a,b,c){return Array.isArray(a)?(g(a,c[b],c),!0):!1}function g(a,b,c){var e;if(a)if(a.forEach)a.forEach(b,c);else if(a.length!==d)for(e=0;e-1}function r(a){return a.trim().split(/\s+/g)}function s(a,b,c){if(a.indexOf&&!c)return a.indexOf(b);for(var d=0;dc[b]}):d.sort()),d}function v(a,b){for(var c,e,f=b[0].toUpperCase()+b.slice(1),g=0;g1&&!c.firstMultiple?c.firstMultiple=E(b):1===e&&(c.firstMultiple=!1);var f=c.firstInput,g=c.firstMultiple,h=g?g.center:f.center,i=b.center=F(d);b.timeStamp=nb(),b.deltaTime=b.timeStamp-f.timeStamp,b.angle=J(h,i),b.distance=I(h,i),C(c,b),b.offsetDirection=H(b.deltaX,b.deltaY),b.scale=g?L(g.pointers,d):1,b.rotation=g?K(g.pointers,d):0,D(c,b);var j=a.element;p(b.srcEvent.target,j)&&(j=b.srcEvent.target),b.target=j}function C(a,b){var c=b.center,d=a.offsetDelta||{},e=a.prevDelta||{},f=a.prevInput||{};(b.eventType===yb||f.eventType===Ab)&&(e=a.prevDelta={x:f.deltaX||0,y:f.deltaY||0},d=a.offsetDelta={x:c.x,y:c.y}),b.deltaX=e.x+(c.x-d.x),b.deltaY=e.y+(c.y-d.y)}function D(a,b){var c,e,f,g,h=a.lastInterval||b,i=b.timeStamp-h.timeStamp;if(b.eventType!=Bb&&(i>xb||h.velocity===d)){var j=h.deltaX-b.deltaX,k=h.deltaY-b.deltaY,l=G(i,j,k);e=l.x,f=l.y,c=mb(l.x)>mb(l.y)?l.x:l.y,g=H(j,k),a.lastInterval=b}else c=h.velocity,e=h.velocityX,f=h.velocityY,g=h.direction;b.velocity=c,b.velocityX=e,b.velocityY=f,b.direction=g}function E(a){for(var b=[],c=0;ce;)c+=a[e].clientX,d+=a[e].clientY,e++;return{x:lb(c/b),y:lb(d/b)}}function G(a,b,c){return{x:b/a||0,y:c/a||0}}function H(a,b){return a===b?Cb:mb(a)>=mb(b)?a>0?Db:Eb:b>0?Fb:Gb}function I(a,b,c){c||(c=Kb);var d=b[c[0]]-a[c[0]],e=b[c[1]]-a[c[1]];return Math.sqrt(d*d+e*e)}function J(a,b,c){c||(c=Kb);var d=b[c[0]]-a[c[0]],e=b[c[1]]-a[c[1]];return 180*Math.atan2(e,d)/Math.PI}function K(a,b){return J(b[1],b[0],Lb)-J(a[1],a[0],Lb)}function L(a,b){return I(b[0],b[1],Lb)/I(a[0],a[1],Lb)}function M(){this.evEl=Nb,this.evWin=Ob,this.allow=!0,this.pressed=!1,y.apply(this,arguments)}function N(){this.evEl=Rb,this.evWin=Sb,y.apply(this,arguments),this.store=this.manager.session.pointerEvents=[]}function O(){this.evTarget=Ub,this.evWin=Vb,this.started=!1,y.apply(this,arguments)}function P(a,b){var c=t(a.touches),d=t(a.changedTouches);return b&(Ab|Bb)&&(c=u(c.concat(d),"identifier",!0)),[c,d]}function Q(){this.evTarget=Xb,this.targetIds={},y.apply(this,arguments)}function R(a,b){var c=t(a.touches),d=this.targetIds;if(b&(yb|zb)&&1===c.length)return d[c[0].identifier]=!0,[c,c];var e,f,g=t(a.changedTouches),h=[],i=this.target;if(f=c.filter(function(a){return p(a.target,i)}),b===yb)for(e=0;eh&&(b.push(a),h=b.length-1):e&(Ab|Bb)&&(c=!0),0>h||(b[h]=a,this.callback(this.manager,e,{pointers:b,changedPointers:[a],pointerType:f,srcEvent:a}),c&&b.splice(h,1))}});var Tb={touchstart:yb,touchmove:zb,touchend:Ab,touchcancel:Bb},Ub="touchstart",Vb="touchstart touchmove touchend touchcancel";j(O,y,{handler:function(a){var b=Tb[a.type];if(b===yb&&(this.started=!0),this.started){var c=P.call(this,a,b);b&(Ab|Bb)&&c[0].length-c[1].length===0&&(this.started=!1),this.callback(this.manager,b,{pointers:c[0],changedPointers:c[1],pointerType:tb,srcEvent:a})}}});var Wb={touchstart:yb,touchmove:zb,touchend:Ab,touchcancel:Bb},Xb="touchstart touchmove touchend touchcancel";j(Q,y,{handler:function(a){var b=Wb[a.type],c=R.call(this,a,b);c&&this.callback(this.manager,b,{pointers:c[0],changedPointers:c[1],pointerType:tb,srcEvent:a})}}),j(S,y,{handler:function(a,b,c){var d=c.pointerType==tb,e=c.pointerType==vb;if(d)this.mouse.allow=!1;else if(e&&!this.mouse.allow)return;b&(Ab|Bb)&&(this.mouse.allow=!0),this.callback(a,b,c)},destroy:function(){this.touch.destroy(),this.mouse.destroy()}});var Yb=v(jb.style,"touchAction"),Zb=Yb!==d,$b="compute",_b="auto",ac="manipulation",bc="none",cc="pan-x",dc="pan-y";T.prototype={set:function(a){a==$b&&(a=this.compute()),Zb&&(this.manager.element.style[Yb]=a),this.actions=a.toLowerCase().trim()},update:function(){this.set(this.manager.options.touchAction)},compute:function(){var a=[];return g(this.manager.recognizers,function(b){l(b.options.enable,[b])&&(a=a.concat(b.getTouchAction()))}),U(a.join(" "))},preventDefaults:function(a){if(!Zb){var b=a.srcEvent,c=a.offsetDirection;if(this.manager.session.prevented)return void b.preventDefault();var d=this.actions,e=q(d,bc),f=q(d,dc),g=q(d,cc);return e||f&&c&Hb||g&&c&Ib?this.preventSrc(b):void 0}},preventSrc:function(a){this.manager.session.prevented=!0,a.preventDefault()}};var ec=1,fc=2,gc=4,hc=8,ic=hc,jc=16,kc=32;V.prototype={defaults:{},set:function(a){return h(this.options,a),this.manager&&this.manager.touchAction.update(),this},recognizeWith:function(a){if(f(a,"recognizeWith",this))return this;var b=this.simultaneous;return a=Y(a,this),b[a.id]||(b[a.id]=a,a.recognizeWith(this)),this},dropRecognizeWith:function(a){return f(a,"dropRecognizeWith",this)?this:(a=Y(a,this),delete this.simultaneous[a.id],this)},requireFailure:function(a){if(f(a,"requireFailure",this))return this;var b=this.requireFail;return a=Y(a,this),-1===s(b,a)&&(b.push(a),a.requireFailure(this)),this},dropRequireFailure:function(a){if(f(a,"dropRequireFailure",this))return this;a=Y(a,this);var b=s(this.requireFail,a);return b>-1&&this.requireFail.splice(b,1),this},hasRequireFailures:function(){return this.requireFail.length>0},canRecognizeWith:function(a){return!!this.simultaneous[a.id]},emit:function(a){function b(b){c.manager.emit(c.options.event+(b?W(d):""),a)}var c=this,d=this.state;hc>d&&b(!0),b(),d>=hc&&b(!0)},tryEmit:function(a){return this.canEmit()?this.emit(a):void(this.state=kc)},canEmit:function(){for(var a=0;af?Db:Eb,c=f!=this.pX,d=Math.abs(a.deltaX)):(e=0===g?Cb:0>g?Fb:Gb,c=g!=this.pY,d=Math.abs(a.deltaY))),a.direction=e,c&&d>b.threshold&&e&b.direction},attrTest:function(a){return Z.prototype.attrTest.call(this,a)&&(this.state&fc||!(this.state&fc)&&this.directionTest(a))},emit:function(a){this.pX=a.deltaX,this.pY=a.deltaY;var b=X(a.direction);b&&this.manager.emit(this.options.event+b,a),this._super.emit.call(this,a)}}),j(_,Z,{defaults:{event:"pinch",threshold:0,pointers:2},getTouchAction:function(){return[bc]},attrTest:function(a){return this._super.attrTest.call(this,a)&&(Math.abs(a.scale-1)>this.options.threshold||this.state&fc)},emit:function(a){if(this._super.emit.call(this,a),1!==a.scale){var b=a.scale<1?"in":"out";this.manager.emit(this.options.event+b,a)}}}),j(ab,V,{defaults:{event:"press",pointers:1,time:500,threshold:5},getTouchAction:function(){return[_b]},process:function(a){var b=this.options,c=a.pointers.length===b.pointers,d=a.distanceb.time;if(this._input=a,!d||!c||a.eventType&(Ab|Bb)&&!f)this.reset();else if(a.eventType&yb)this.reset(),this._timer=e(function(){this.state=ic,this.tryEmit()},b.time,this);else if(a.eventType&Ab)return ic;return kc},reset:function(){clearTimeout(this._timer)},emit:function(a){this.state===ic&&(a&&a.eventType&Ab?this.manager.emit(this.options.event+"up",a):(this._input.timeStamp=nb(),this.manager.emit(this.options.event,this._input)))}}),j(bb,Z,{defaults:{event:"rotate",threshold:0,pointers:2},getTouchAction:function(){return[bc]},attrTest:function(a){return this._super.attrTest.call(this,a)&&(Math.abs(a.rotation)>this.options.threshold||this.state&fc)}}),j(cb,Z,{defaults:{event:"swipe",threshold:10,velocity:.65,direction:Hb|Ib,pointers:1},getTouchAction:function(){return $.prototype.getTouchAction.call(this)},attrTest:function(a){var b,c=this.options.direction;return c&(Hb|Ib)?b=a.velocity:c&Hb?b=a.velocityX:c&Ib&&(b=a.velocityY),this._super.attrTest.call(this,a)&&c&a.direction&&a.distance>this.options.threshold&&mb(b)>this.options.velocity&&a.eventType&Ab},emit:function(a){var b=X(a.direction);b&&this.manager.emit(this.options.event+b,a),this.manager.emit(this.options.event,a)}}),j(db,V,{defaults:{event:"tap",pointers:1,taps:1,interval:300,time:250,threshold:2,posThreshold:10},getTouchAction:function(){return[ac]},process:function(a){var b=this.options,c=a.pointers.length===b.pointers,d=a.distancea?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="
",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h; +if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="
a",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/\s*$/g,rb={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:k.htmlSerialize?[0,"",""]:[1,"X
","
"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?""!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("