Changeset 12258


Ignore:
Timestamp:
05/16/12 13:51:50 (13 years ago)
Author:
cborstad
Message:

merged trunk-jpl into branches/trunk-jpl-damage through revision 12254

Location:
issm/branches/trunk-jpl-damage
Files:
80 deleted
145 edited
25 copied

Legend:

Unmodified
Added
Removed
  • issm/branches/trunk-jpl-damage

  • issm/branches/trunk-jpl-damage/configs/config-arm-linux.sh

    r12168 r12258  
    11#!/bin/sh
    2 
    3 pythonversion=2.7
    42
    53./configure \
    64        --prefix=$ISSM_DIR \
    7         --with-python-dir=$ISSM_DIR/externalpackages/python/install\
    8         --with-python-version=$pythonversion \
    9         --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/Python.framework/Versions/$pythonversion/lib/python$pythonversion/site-packages/numpy/core/include/numpy\
     5    --host="arm-linux" \
     6        --without-modules \
     7    CC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc \
     8    GCC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc \
     9    CXX=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-g++ \
    1010        --with-vendor=arm-linux \
    1111        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
    12         --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install
     12        --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install\
     13    --without-fortran-lib
  • issm/branches/trunk-jpl-damage/configs/config-linux64-astrid.sh

    r12168 r12258  
    1515 --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
    1616 --with-petsc-arch=$ISSM_ARCH \
     17 --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
    1718 --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
    1819 --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
     
    3031 --with-numthreads=32 \
    3132 --enable-debugging
     33 #--with-serial=no \
  • issm/branches/trunk-jpl-damage/configure.ac

    r12168 r12258  
    1010AC_PROG_CPP
    1111AC_PROG_CXX([cccl cl icl g++])
    12 AC_PROG_F77([ifort g77 gfortran])
     12#AC_PROG_F77([ifort g77 gfortran])
    1313#Libraries and linking
    1414AC_PROG_RANLIB
  • issm/branches/trunk-jpl-damage/cron/nightlyrun.sh

    r12004 r12258  
    6565#Export ISSM_* variables{{{1
    6666export ISSM_DIR
    67 export ISSM_TIER
    6867export ISSM_ARCH
    6968#}}}
     
    9089
    9190        #only update ISSM
    92         cd $ISSM_TIER
     91        cd $ISSM_DIR
    9392        svn update
    9493
     
    109108#Create cluster's settings{{{1
    110109#create simpler  cluster.rc file, with only the cluster we are interested in.
    111 cd $ISSM_TIER/test/NightlyRun/
     110cd $ISSM_DIR/test/NightlyRun/
    112111if [ "$MACHINE" = "win7" ]; then
    113112        cat << END > $HOST_NAME"_settings.m"
    114113cluster.login='$USER';
    115 cluster.codepath='`cygpath -m $ISSM_TIER/bin`';
     114cluster.codepath='`cygpath -m $ISSM_DIR/bin`';
    116115cluster.executionpath='`cygpath -m $EXECUTION_PATH`';
    117116END
     
    119118        cat << END > $HOST_NAME"_settings.m"
    120119cluster.login='$USER';
    121 cluster.codepath='$ISSM_TIER/bin';
     120cluster.codepath='$ISSM_DIR/bin';
    122121cluster.executionpath='$EXECUTION_PATH';
    123122END
    124    cat << END > $ISSM_TIER/externalpackages/matlab/install.sh
     123   cat << END > $ISSM_DIR/externalpackages/matlab/install.sh
    125124#!/bin/bash
    126125rm -rf install
     
    131130#}}}
    132131#Source environment variables with new matlab path {{{1
    133 cd $ISSM_TIER/etc
     132cd $ISSM_DIR/etc
    134133source environment.sh MATLAB_DIR=$MATLAB_PATH
    135134#}}}
     
    138137then
    139138       
    140         cd $ISSM_TIER/externalpackages
     139        cd $ISSM_DIR/externalpackages
    141140        #number of packages:
    142141        numpackages=`echo $EXTERNALPACKAGES | wc -w`
     
    156155
    157156        #erase externapackages, and link with externalpackages_dir
    158         cd $ISSM_TIER
     157        cd $ISSM_DIR
    159158        rm -rf externalpackages
    160159        cp -Rf $EXTERNALPACKAGESDIR ./
     
    164163
    165164        #erase externapackages, and link with externalpackages_dir
    166         cd $ISSM_TIER
     165        cd $ISSM_DIR
    167166        rm -rf externalpackages
    168167        ln -s  $EXTERNALPACKAGESDIR  .
     
    186185then
    187186
    188         cd $ISSM_TIER
     187        cd $ISSM_DIR
    189188        make clean
    190189        make distclean
     
    214213#Prepare run
    215214#create softlink to startup {{{1
    216 cd $ISSM_TIER/test/NightlyRun/
     215cd $ISSM_DIR/test/NightlyRun/
    217216rm startup.m #in case it alreade exists
    218 cp $ISSM_TIER/startup.m .
     217cp $ISSM_DIR/startup.m .
    219218#}}}
    220219#Create nightlylog directory and info.log {{{1
     
    222221INSTALL_TIME=$(timer)
    223222ELAPSED_INSTALL=$(timer $START_TIME)
    224 rm -rf $ISSM_TIER/nightlylog
    225 mkdir  $ISSM_TIER/nightlylog
    226 cat << END > $ISSM_TIER/nightlylog/info.log
     223rm -rf $ISSM_DIR/nightlylog
     224mkdir  $ISSM_DIR/nightlylog
     225cat << END > $ISSM_DIR/nightlylog/info.log
    227226today:     $(echo $TODAY)
    228227user:      $(echo $USER)
     
    245244#on Matlab and windows machines, we'll need a windows style path:  {{{
    246245if [ "$MACHINE" = "win7" ]; then
    247         MATLAB_TIER=`cygpath -m $ISSM_TIER`
     246        MATLAB_TIER=`cygpath -m $ISSM_DIR`
    248247else
    249         MATLAB_TIER=$ISSM_TIER
     248        MATLAB_TIER=$ISSM_DIR
    250249fi
    251250#}}}
     
    254253do
    255254        #Launch matlab and the nightly run script
    256         cat > $ISSM_TIER/nightlylog/matlab_run$i.m << EOF
     255        cat > $ISSM_DIR/nightlylog/matlab_run$i.m << EOF
    257256        warning off %necessary to avoid a info.log of several Go for parallel runs
    258257        try,
     
    263262                echo "runme('output','nightly','rank',$i,'numprocs',$NUMCPUS_RUN);"
    264263        else
    265                 #echo "runme('id',[101 102]);"
    266264                echo "runme($NROPTIONS,'output','nightly','rank',$i,'numprocs',$NUMCPUS_RUN);"
    267265        fi
     
    271269                message=getReport(me)
    272270                directory=strsplit(pwd,'/');
    273                 fid=fopen([ISSM_TIER '/nightlylog/matlaberror.log'], 'at');
     271                fid=fopen([issmdir '/nightlylog/matlaberror.log'], 'at');
    274272                fprintf(fid,'\nMatlab error occured in: %s\n\n',directory{end});
    275273                fprintf(fid,'%s',message);
     
    281279
    282280        #Start run from nightlylog directory
    283         cd $ISSM_TIER/nightlylog/
     281        cd $ISSM_DIR/nightlylog/
    284282
    285283        MATLABBIN=$MATLAB_PATH/bin/matlab
     
    298296#}}}
    299297#concatenate all reports {{{1
    300 cd $ISSM_TIER/nightlylog/
     298cd $ISSM_DIR/nightlylog/
    301299cp matlab_log1.log  matlab_log.log
    302300for (( i=2;i<=$NUMCPUS_RUN;i++ ))
     
    315313ELAPSED_RUN=$(timer $INSTALL_TIME)
    316314ELAPSED_TOTAL=$(timer $START_TIME)
    317 cat << END >>  $ISSM_TIER/nightlylog/info.log
     315cat << END >>  $ISSM_DIR/nightlylog/info.log
    318316elapsed_run:   $(echo $ELAPSED_RUN)
    319317elapsed_total: $(echo $ELAPSED_TOTAL)
     
    324322#Send Report
    325323#Build html report {{{1
    326 cd $ISSM_TIER/nightlylog/
     324cd $ISSM_DIR/nightlylog/
    327325sh ../scripts/report.sh
    328 echo "html report located in $ISSM_TIER/nightlylog/report.html"
     326echo "html report located in $ISSM_DIR/nightlylog/report.html"
    329327#}}}
    330328#send mail if requested                  (SKIPMAIL) {{{1
     
    332330then
    333331        echo "sending report..."
    334         source $ISSM_TIER/cron/mailinglist
     332        source $ISSM_DIR/cron/mailinglist
    335333        for i in `echo $MAILINGLIST`; do
    336334
    337335                if [ "$MACHINE" = "win7" ]
    338336                then
    339                         email -html -s "Nightly runs on $HOST_NAME (version: $ISSM_RELEASE)" -n "ISSM Nightly run" -f echo $EMAIL_ADRESS $i < $ISSM_TIER/nightlylog/report.html
     337                        email -html -s "Nightly runs on $HOST_NAME (version: $ISSM_RELEASE)" -n "ISSM Nightly run" -f echo $EMAIL_ADRESS $i < $ISSM_DIR/nightlylog/report.html
    340338                else
    341339                        if [ "$MACHINE" = "astrid" ]
    342340                        then
    343 cat - $ISSM_TIER/nightlylog/report.html <<HERE | /usr/lib/sendmail  -oi -t
     341cat - $ISSM_DIR/nightlylog/report.html <<HERE | /usr/lib/sendmail  -oi -t
    344342From: "ISSM Nightly run" <$EMAIL_ADRESS>
    345343To: $i
     
    349347HERE
    350348                else
    351 cat - $ISSM_TIER/nightlylog/report.html <<HERE | /usr/sbin/sendmail  -oi -t
     349cat - $ISSM_DIR/nightlylog/report.html <<HERE | /usr/sbin/sendmail  -oi -t
    352350From: "ISSM Nightly run" <$EMAIL_ADRESS>
    353351To: $i
  • issm/branches/trunk-jpl-damage/etc/environment.sh

    r12168 r12258  
    215215#APPSCAN
    216216export PATH="$PATH:$APPSCAN_DIR/install/bin"
    217 export PATH="$PATH:$APPSCAN_DIR/bin"]
     217export PATH="$PATH:$APPSCAN_DIR/bin"
    218218
    219219#CPPCHECK
     
    253253#GSL
    254254export PATH="$PATH:$GSL_DIR/bin"
     255export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$GSL_DIR/lib"
     256export LD_RUN_PATH="$LD_RUN_PATH:$GSL_DIR/lib"
    255257
    256258#GMAKE
     
    261263export PYTHONPATH="$PYTHONPATH:$ISSM_DIR/src/modules/python"
    262264export LD_LIBRARY_PATH=$ISSM_DIR/src/modules/python:$LD_LIBRARY_PATH
     265export PYTHONSTARTUP
    263266
    264267#MODELE
    265268export PATH="$MODELE_DIR/src/exec:$PATH"
     269
     270#GIT
     271export PATH="$PATH:$GIT_DIR/install/bin"
  • issm/branches/trunk-jpl-damage/etc/environment_variables.sh

    r12168 r12258  
    193193#PYTHON
    194194PYTHON_DIR="$ISSM_DIR/externalpackages/python/install"
     195PYTHONSTARTUP="$ISSM_DIR/startup.py"
    195196
    196197#MODELE
    197198MODELE_DIR="$ISSM_DIR/externalpackages/modelE"
     199
     200
     201#GIT
     202GIT_DIR="$ISSM_DIR/externalpackages/git"
  • issm/branches/trunk-jpl-damage/externalpackages/adolc/install.sh

    r12168 r12258  
    55#Some cleanup
    66rm -rf install ADOL-C-2.2.0 src
     7
     8#Download from ISSM server
     9$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/ADOL-C-2.2.0.tar.gz' 'ADOL-C-2.2.0.tar.gz'
    710
    811#Create install directories
  • issm/branches/trunk-jpl-damage/externalpackages/autoconf/install.sh

    r12168 r12258  
    44rm -rf install autoconf-2.68 src
    55
     6#Download from ISSM server
     7$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/autoconf-2.68.tar.gz' 'autoconf-2.68.tar.gz'
     8
    69#Create install directories
    710mkdir install
    811
    912#Untar
    10 tar -zxvf  autoconf-2.68.tar.gz
     13tar -zxvf autoconf-2.68.tar.gz
    1114
    1215#Move autoconf into src directory
  • issm/branches/trunk-jpl-damage/externalpackages/automake/install.sh

    r12168 r12258  
    33#Some cleanup
    44rm -rf install automake-1.11.3 src
     5
     6#Download from ISSM server
     7$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/automake-1.11.3.tar.gz' 'automake-1.11.3.tar.gz'
    58
    69#Create install directories
  • issm/branches/trunk-jpl-damage/externalpackages/bbftp/install.sh

    r12168 r12258  
    33#Some cleanup
    44rm -rf src install bbftp-client-3.2.0
     5
     6#Download from ISSM server
     7$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/bbftp-client-3.2.0.tar.gz' 'bbftp-client-3.2.0.tar.gz'
    58
    69#Create install directories
  • issm/branches/trunk-jpl-damage/externalpackages/boost/install.sh

    r12168 r12258  
    77#to get the boost library to include python support without doing that.
    88
    9 
    10 
    119#Some cleanup
    1210rm -rf install boost_1_49_0 src
    1311mkdir install src
     12
     13#Download from ISSM server
     14$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/boost_1_49_0.tar.gz' 'boost_1_49_0.tar.gz'
    1415
    1516#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/bsdtar/install-win7.sh

    r12168 r12258  
    44rm -rf install src libarchive-3.0.3
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/libarchive-3.0.3.tar.gz' 'libarchive-3.0.3.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/cccl/install-win7.orig.sh

    r12168 r12258  
    44rm -rf src install cccl-0.03
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/cccl-0.03.tar.gz' 'cccl-0.03.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/cccl/issm/cccl

    r11577 r12258  
    7474    esac
    7575        ;;
     76        -fPIC)
     77        #do nothing
     78        ;;
     79        -g)
     80        #do nothing
     81        ;;
     82        -pthread)
     83        #do nothing
     84        ;;
     85        -fno-omit-frame-pointer)
     86        #do nothing
     87        ;;
     88
    7689        *)
    7790                #do nothing
     
    8396    shift
    8497done
     98                       
     99#Some default options:
     100opts="$opts /nologo"
    85101
    86102#echo "$prog $opts"
  • issm/branches/trunk-jpl-damage/externalpackages/chaco/install.sh

    r11128 r12258  
    66rm -rf install
    77mkdir src install
     8
     9#Download from ISSM server
     10$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Chaco-2.2.tar.gz' 'Chaco-2.2.tar.gz'
    811
    912# Untar
  • issm/branches/trunk-jpl-damage/externalpackages/cmake/install.sh

    r12168 r12258  
    44rm -rf install cmake-2.8.5
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/cmake-2.8.5.tar.gz' 'cmake-2.8.5.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/colpack/install.sh

    r11128 r12258  
    33#Erase install
    44rm -rf install  src ColPack
     5
     6#Download from ISSM server
     7$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/ColPack-1.0.3.tar.gz' 'ColPack-1.0.3.tar.gz'
    58
    69#install directory
  • issm/branches/trunk-jpl-damage/externalpackages/cppcheck/install.sh

    r12168 r12258  
    55mkdir src
    66
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/cppcheck-1.48.tar' 'cppcheck-1.48.tar'
    79tar -xvf cppcheck-1.48.tar
    810
  • issm/branches/trunk-jpl-damage/externalpackages/dace/install.sh

    r11101 r12258  
    44rm -rf install dace
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/dace.zip' 'dace.zip'
    69
    710#uncompress
  • issm/branches/trunk-jpl-damage/externalpackages/dakota/install-altix64-cosmos.sh

    r12168 r12258  
    99rm -rf install
    1010mkdir src install
     11
     12#Download from ISSM server
     13$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz'
    1114
    1215#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/dakota/install-linux64-astrid.sh

    r12168 r12258  
    99rm -rf install
    1010mkdir src install
     11
     12#Download from ISSM server
     13$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz'
    1114
    1215#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/dakota/install-linux64-murdo.sh

    r12168 r12258  
    99rm -rf install
    1010mkdir src install
     11
     12#Download from ISSM server
     13$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz'
    1114
    1215#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/dakota/install-macosx64.sh

    r12168 r12258  
    99rm -rf install
    1010mkdir src install
     11
     12#Download from ISSM server
     13$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz'
    1114
    1215#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/dakota/install-pleiades.sh

    r12168 r12258  
    99rm -rf install
    1010mkdir src install
     11
     12#Download from ISSM server
     13$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_4_3.src.tar.gz' 'Dakota_4_3.src.tar.gz'
    1114
    1215#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/distribute/install.sh

    r12135 r12258  
    11#!/bin/bash
    22
    3 curl -O http://python-distribute.org/distribute_setup.py
     3#Download from ISSM server
     4$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://python-distribute.org/distribute_setup.py' 'distribute_setup.py'
    45python distribute_setup.py
  • issm/branches/trunk-jpl-damage/externalpackages/findbugs/install.sh

    r11101 r12258  
    55mkdir install
    66
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/findbugs-1.3.9.tar.gz' 'findbugs-1.3.9.tar.gz'
    79tar -zxvf findbugs-1.3.9.tar.gz
    810
  • issm/branches/trunk-jpl-damage/externalpackages/freetype/install.sh

    r12131 r12258  
    66rm -rf freetype-2.4.9
    77mkdir src install
     8
     9#Download from ISSM server
     10$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/freetype-2.4.9.tar.gz' 'freetype-2.4.9.tar.gz'
    811
    912#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/gdal/install.sh

    r12168 r12258  
    66rm -rf gdal-1.6.0
    77mkdir src install
     8
     9#Download from ISSM server
     10$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/gdal-1.6.0.tar.gz' 'gdal-1.6.0.tar.gz'
    811
    912#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/gmake/install.sh

    r12168 r12258  
    44rm -rf install src make-3.82
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/make-3.82.tar.gz' 'make-3.82.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/graphviz/install.sh

    r12168 r12258  
    44rm -rf install src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/graphviz-2.24.0.tar.gz' 'graphviz-2.24.0.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/gsl/install-android-4.0.sh

    r12168 r12258  
    44rm -rf src install gsl-1.15
    55mkdir src install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/gsl/install-macosx64.sh

    r12168 r12258  
    44rm -rf src install gsl-1.15
    55mkdir src install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/ipython/install.sh

    r12136 r12258  
    66rm -rf ipython-0.12
    77mkdir src install
     8
     9#Download from ISSM server
     10$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/ipython-0.12.tar.gz' 'ipython-0.12.tar.gz'
    811
    912#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/latex2rtf/install.sh

    r12168 r12258  
    33#Some cleanup
    44rm -rf latex2rtf-2.0.0 cfg install
     5
     6#Download from ISSM server
     7$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/latex2rtf-2.0.0.tar.gz' 'latex2rtf-2.0.0.tar.gz'
    58
    69#untar
  • issm/branches/trunk-jpl-damage/externalpackages/libermate/install.sh

    r12137 r12258  
    66mkdir install
    77
     8#Download from ISSM server
     9$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/libermate-0.4.tgz' 'libermate-0.4.tgz'
     10
    811#Untar
    912tar -zxvf  libermate-0.4.tgz
  • issm/branches/trunk-jpl-damage/externalpackages/libpng/install.sh

    r12144 r12258  
    66rm -rf libpng-1.5.10
    77mkdir src install
     8
     9#Download from ISSM server
     10$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/libpng-1.5.10.tar.gz' 'libpng-1.5.10.tar.gz'
    811
    912#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/libtool/install.sh

    r12168 r12258  
    44rm -rf install libtool-2.2.6b src
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/libtool-2.2.6b.tar.gz' 'libtool-2.2.6b.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/m2html/install.sh

    r11101 r12258  
    44rm -rf install m2html
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/m2html.zip' 'm2html.zip'
    69
    710#uncompress
  • issm/branches/trunk-jpl-damage/externalpackages/matplotlib

    • Property svn:ignore
      •  

        old new  
        22src
        33install
         4matplotlib
         5deps
  • issm/branches/trunk-jpl-damage/externalpackages/mercurial/install.sh

    r11128 r12258  
    44rm -rf install mercurial-1.7.3
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mercurial-1.7.3.tar.gz' 'mercurial-1.7.3.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/metis/install-4.0-altix64.sh

    r11101 r12258  
    44rm -rf install metis-4.0
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/metis-4.0.tar.gz' 'metis-4.0.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/metis/install-4.0-cosmos.sh

    r11101 r12258  
    44rm -rf install metis-4.0
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/metis-4.0.tar.gz' 'metis-4.0.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/metis/install-4.0-greenplanet.sh

    r11367 r12258  
    44rm -rf install metis-4.0
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/metis-4.0.tar.gz' 'metis-4.0.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/metis/install-4.0-linux64.sh

    r11101 r12258  
    44rm -rf install metis-4.0
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/metis-4.0.tar.gz' 'metis-4.0.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/metis/install-4.0-macosx32.sh

    r11101 r12258  
    44rm -rf install metis-4.0
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/metis-4.0.tar.gz' 'metis-4.0.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/metis/install-4.0-macosx64.sh

    r11101 r12258  
    44rm -rf install metis-4.0
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/metis-4.0.tar.gz' 'metis-4.0.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/metis/install-4.0-pleiades.sh

    r11101 r12258  
    44rm -rf install metis-4.0
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/metis-4.0.tar.gz' 'metis-4.0.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/metis/install-4.0-win32.sh

    r11101 r12258  
    44rm -rf install metis-4.0
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/metis-4.0.tar.gz' 'metis-4.0.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/metis/install-4.0-win7.sh

    r12004 r12258  
    44rm -rf install metis-4.0
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/metis-4.0.tar.gz' 'metis-4.0.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/metis/install-5.0.1-linux64.sh

    r12168 r12258  
    55rm -rf install metis-5.0.1
    66mkdir install
     7
     8#Download from ISSM server
     9$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/metis-5.0.1.tar.gz' 'metis-5.0.1.tar.gz'
    710
    811#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/modelE/install.sh

    r11749 r12258  
    66rm -rf src install  modelE_AR5_branch
    77mkdir src
     8
     9#Download from ISSM server
     10$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/modelE_AR5_branch.2012.03.13_10.12.21.tgz' 'modelE_AR5_branch.2012.03.13_10.12.21.tgz'
    811
    912#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/mpich2/install-1.0.2-altix64.sh

    r12168 r12258  
    44rm -rf src install mpich2-1.0.2p1
    55mkdir src install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich2-1.0.2p1.tar.gz' 'mpich2-1.0.2p1.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/mpich2/install-1.0.2-linux64.sh

    r12168 r12258  
    44rm -rf src install mpich2-1.0.2p1
    55mkdir src install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich2-1.0.2p1.tar.gz' 'mpich2-1.0.2p1.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/mpich2/install-1.0.2-macosx32.sh

    r12168 r12258  
    44rm -rf src install mpich2-1.0.2p1
    55mkdir src install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich2-1.0.2p1.tar.gz' 'mpich2-1.0.2p1.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/mpich2/install-1.0.2-win32.sh

    r12168 r12258  
    44rm -rf src install mpich2-1.0.2p1
    55mkdir src install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich2-1.0.2p1.tar.gz' 'mpich2-1.0.2p1.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/mpich2/install-1.4-linux64.sh

    r12168 r12258  
    44rm -rf src install mpich2-1.4
    55mkdir src install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich2-1.4.tar.gz' 'mpich2-1.4.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/mpich2/install-1.4-macosx32.sh

    r12168 r12258  
    44rm -rf src install mpich2-1.4
    55mkdir src install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich2-1.4.tar.gz' 'mpich2-1.4.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/mpich2/install-1.4-macosx64.sh

    r12168 r12258  
    44rm -rf src install mpich2-1.4
    55mkdir src install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich2-1.4.tar.gz' 'mpich2-1.4.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/ncview/install.sh

    r12168 r12258  
    44rm -rf install
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/ncview-1.93g.tar.gz' 'ncview-1.93g.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/netcdf/install.sh

    r12168 r12258  
    44rm -rf install netcdf-4.0.1
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/netcdf-4.0.1.tar.gz' 'netcdf-4.0.1.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/nose/install-macosx64sh

    r12168 r12258  
    1 #/bin/bash
     1#!/bin/bash
    22#Install Python nose module
    33
     
    1818if [[ $pythonversion == "2" ]];then
    1919
     20        #Download from ISSM server
     21        $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/nose-1.1.2.tar.gz' 'nose-1.1.2.tar.gz'
    2022        tar -zxvf  nose-1.1.2.tar.gz
    2123        mv nose-1.1.2 src
  • issm/branches/trunk-jpl-damage/externalpackages/oofem/install.sh

    r11128 r12258  
    55rm -rf oofem-2.0
    66mkdir src
     7
     8#Download from ISSM server
     9$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/oofem-2.0.tar.gz' 'oofem-2.0.tar.gz'
    710
    811#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/pcre/install.sh

    r12168 r12258  
    55rm -rf pcre-8.21
    66mkdir install
     7
     8#Download from ISSM server
     9$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/pcre-8.21.tar.gz' 'pcre-8.21.tar.gz'
    710
    811#Untar and move python into install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-2.3.2-altix64-castor.sh

    r12168 r12258  
    88        rm -rf install petsc-2.3.2-p3 src
    99        mkdir install src
     10
     11        #Download from ISSM server
     12        $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
    1013
    1114        #Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-2.3.2-cosmos.sh

    r12168 r12258  
    44rm -rf install petsc-2.3.2-p3 src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
    69
    710#Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-2.3.2-linux64-astrid.sh

    r12168 r12258  
    44rm -rf install petsc-2.3.2-p3 src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
    69
    710#Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-2.3.2-macosx32-eric.sh

    r12168 r12258  
    88        rm -rf install petsc-2.3.2-p3 src
    99        mkdir install src
     10
     11        #Download from ISSM server
     12        $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
    1013
    1114        #Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-2.3.2-macosx32-ogive.sh

    r12168 r12258  
    44rm -rf install petsc-2.3.2-p3 src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
    69
    710#Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-2.3.2-macosx64.sh

    r12168 r12258  
    44rm -rf install petsc-2.3.2-p3 src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
    69
    710#Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-2.3.2-pleiades.sh

    r12168 r12258  
    88        rm -rf install petsc-2.3.2-p3 src
    99        mkdir install src
     10
     11        #Download from ISSM server
     12        $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
    1013
    1114        #Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-2.3.2-win32-eric.sh

    r12168 r12258  
    44rm -rf install petsc-2.3.2-p3 src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
    69
    710#Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-2.3.2-win7.sh

    r12168 r12258  
    44rm -rf install petsc-2.3.2-p3 src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-2.3.2-p3.tar.gz' 'petsc-2.3.2-p3.tar.gz'
    69
    710#Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-3.1-altix64-castor.sh

    r12168 r12258  
    88        rm -rf install petsc-3.1-p7 src
    99        mkdir install src
     10
     11        #Download from ISSM server
     12        $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.1-p7.tar.gz' 'petsc-3.1-p7.tar.gz'
    1013
    1114        #Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-3.1-cosmos.sh

    r12168 r12258  
    44rm -rf install petsc-3.1-p7 src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.1-p7.tar.gz' 'petsc-3.1-p7.tar.gz'
    69
    710#Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-3.1-linux64-astrid.sh

    r12168 r12258  
    44rm -rf install petsc-3.1-p7 src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.1-p7.tar.gz' 'petsc-3.1-p7.tar.gz'
    69
    710#Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-3.1-macosx32-mathieu.sh

    r12168 r12258  
    44rm -rf install petsc-3.1-p7 src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.1-p7.tar.gz' 'petsc-3.1-p7.tar.gz'
    69
    710#Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-3.1-macosx32-ogive.sh

    r12168 r12258  
    44rm -rf install petsc-3.1-p7 src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.1-p7.tar.gz' 'petsc-3.1-p7.tar.gz'
    69
    710#Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-3.1-pleiades.sh

    r12168 r12258  
    88        rm -rf install petsc-3.1-p7 src
    99        mkdir install src
     10
     11        #Download from ISSM server
     12        $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.1-p7.tar.gz' 'petsc-3.1-p7.tar.gz'
    1013
    1114        #Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-3.1-win7.sh

    r12168 r12258  
    44rm -rf install petsc-3.1-p7 src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.1-p7.tar.gz' 'petsc-3.1-p7.tar.gz'
    69
    710#Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-3.2-greenplanet.sh

    r12168 r12258  
    44rm -rf install petsc-3.2-p3 src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.2-p3.tar.gz' 'petsc-3.2-p3.tar.gz'
    69
    710#Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-3.2-linux64.sh

    r12168 r12258  
    44rm -rf install petsc-3.2-p3 src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.2-p3.tar.gz' 'petsc-3.2-p3.tar.gz'
    69
    710#Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-3.2-macosx64.sh

    r12168 r12258  
    44rm -rf install petsc-3.2-p3 src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.2-p3.tar.gz' 'petsc-3.2-p3.tar.gz'
    69
    710#Untar and move petsc to install directory
  • issm/branches/trunk-jpl-damage/externalpackages/petsc/install-3.2-pleiades.sh

    r12168 r12258  
    22#Step 1: unzip and install
    33#Step 2: After Plapack implodes
    4 STEP=2
     4STEP=1
    55
    66if [ $STEP -eq 1 ]; then
     
    88        rm -rf install petsc-3.2-p3 src
    99        mkdir install src
     10
     11        #Download from ISSM server
     12        $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-3.2-p3.tar.gz' 'petsc-3.2-p3.tar.gz'
    1013
    1114        #Untar and move petsc to install directory
     
    3841                --CXXOPTFLAGS=" -O3 -xS" \
    3942                --with-pic=1
    40         echo "== Fix Plapack compilation manually (http://issm.jpl.nasa.gov/installation/compilationtroubleshooting/petsc31/) =="
     43        echo "== Fix Plapack compilation manually (http://issm.jpl.nasa.gov/documentation/faq/petsc32/) =="
    4144        echo "== Then run STEP=2 =="
    4245fi
     
    6669         --CXXOPTFLAGS=" -O3 -xS" \
    6770         --with-pic=1
     71         cat > src/script.queue << EOF
     72#PBS -S /bin/bash
     73#PBS -q debug
     74#PBS -l select=1:ncpus=1:model=har
     75#PBS -l walltime=200
     76#PBS -W group_list=s1010
     77#PBS -m e
     78. /usr/share/modules/init/bash
     79module load comp-intel/11.1.046
     80module load mpi/mpt.1.25
     81module load math/intel_mkl_64_10.0.011
     82export PATH="$PATH:."
     83export MPI_GROUP_MAX=64
     84mpiexec -np 1 ./conftest-linux-gnu-ia64-intel.py
     85EOF
    6886        echo "== Follow PETSc's instructions"
    6987fi
  • issm/branches/trunk-jpl-damage/externalpackages/polygonclipper/install.sh

    r11101 r12258  
    33#Some cleanup
    44rm -rf install
     5
     6#Download from ISSM server
     7$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/PolygonClipper.zip' 'PolygonClipper.zip'
    58
    69#install
  • issm/branches/trunk-jpl-damage/externalpackages/pyclips/install.sh

    r12139 r12258  
    55rm -rf pyclips-1.0.7.348
    66mkdir install
     7
     8#Download from ISSM server
     9$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/pyclips-1.0.7.348.tar.gz' 'pyclips-1.0.7.348.tar.gz'
    710
    811#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/python

    • Property svn:ignore
      •  

        old new  
        1 install-*
        21install
        32src
         3*.tgz
  • issm/branches/trunk-jpl-damage/externalpackages/qhull/install.sh

    r12168 r12258  
    44rm -rf src install qhull-2003.1
    55mkdir src install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/qhull-2003.1.tar.gz' 'qhull-2003.1.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/rats/install.sh

    r12168 r12258  
    33#Erase install
    44rm -rf install  src rats-2.3
     5
     6#Download from ISSM server
     7$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/rats-2.3.tar.gz' 'rats-2.3.tar.gz'
    58
    69#install directory
  • issm/branches/trunk-jpl-damage/externalpackages/readline/install.sh

    r12141 r12258  
    55rm -rf readline-6.2.2
    66mkdir src
     7
     8#Download from ISSM server
     9$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/readline-6.2.2.tar.gz' 'readline-6.2.2.tar.gz'
    710
    811#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/rose/install.sh

    r12168 r12258  
    44rm -rf source build install
    55mkdir install source build
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/rose-0.9.5a-13219.tar.gz' 'rose-0.9.5a-13219.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/satstress/install.sh

    r11101 r12258  
    44rm -rf install SatStress-0.1.2
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/SatStress-0.1.2.tar.gz' 'SatStress-0.1.2.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/scipy/README

    r11782 r12258  
    11You will find instructions on scipy at:
    2 http://www.scipy.org/Installing_SciPy/Mac_OS_X#head-ba1926aec910a9a1deaf9eff99e38ee23103a3b3
     2http://www.scipy.org/Installing_SciPy/Mac_OS_X
  • issm/branches/trunk-jpl-damage/externalpackages/scotch/install.sh

    r11128 r12258  
    88# Create src and install directories
    99mkdir src install
     10
     11#Download from ISSM server
     12$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/scotch_5.1.6.tar.gz' 'scotch_5.1.6.tar.gz'
    1013
    1114# Untar
  • issm/branches/trunk-jpl-damage/externalpackages/shapelib/install.sh

    r11128 r12258  
    66rm -rf install
    77mkdir src install
     8
     9#Download from ISSM server
     10$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/shapelib-1.2.10.tar.gz' 'shapelib-1.2.10.tar.gz'
     11$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/shape_eg_data.zip' 'shape_eg_data.zip'
    812
    913# Untar
  • issm/branches/trunk-jpl-damage/externalpackages/slepc/install.sh

    r11128 r12258  
    44rm -rf install slepc-2.3.2
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/slepc-2.3.2.tgz' 'slepc-2.3.2.tgz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/swig/install.sh

    r12168 r12258  
    55rm -rf swig-2.0.4
    66mkdir install
     7
     8#Download from ISSM server
     9$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/swig-2.0.4.tar.gz' 'swig-2.0.4.tar.gz'
    710
    811#Untar and move python into install directory
  • issm/branches/trunk-jpl-damage/externalpackages/tao/install.sh

    r12168 r12258  
    66rm -rf install tao-2.0-p3
    77mkdir install
     8
     9#Download from ISSM server
     10$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/tao-2.0-p3.tar.gz' 'tao-2.0-p3.tar.gz'
    811
    912#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/tex2im/install.sh

    r11101 r12258  
    44rm -rf install
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/tex2im-1.8.tar.gz' 'tex2im-1.8.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/triangle/install-altix64.sh

    r11103 r12258  
    44rm -rf install triangle
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/triangle.zip' 'triangle.zip'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/triangle/install-android-4.0.sh

    r12004 r12258  
    44matlab=0
    55
    6 
    76#Some cleanup
    87rm -rf install triangle
    98mkdir install
     9
     10#Download from ISSM server
     11$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/triangle.zip' 'triangle.zip'
    1012
    1113#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/triangle/install-linux64.sh

    r11103 r12258  
    44rm -rf install triangle
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/triangle.zip' 'triangle.zip'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/triangle/install-macosx32.sh

    r11103 r12258  
    44rm -rf install triangle
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/triangle.zip' 'triangle.zip'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/triangle/install-macosx64.sh

    r12004 r12258  
    88rm -rf install triangle
    99mkdir install
     10
     11#Download from ISSM server
     12$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/triangle.zip' 'triangle.zip'
    1013
    1114#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/triangle/install-pleiades.sh

    r11103 r12258  
    44rm -rf install triangle
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/triangle.zip' 'triangle.zip'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/triangle/install-win32.sh

    r11103 r12258  
    44rm -rf install triangle
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/triangle.zip' 'triangle.zip'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/triangle/install-win7.sh

    r11398 r12258  
    44rm -rf install triangle
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/triangle.zip' 'triangle.zip'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/valgrind/install-altix64.sh

    r12168 r12258  
    44rm -rf install valgrind-3.7.0
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/valgrind-3.7.0.tar.bz2' 'valgrind-3.7.0.tar.bz2'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/valgrind/install-linux64.sh

    r12168 r12258  
    44rm -rf install valgrind-3.7.0
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/valgrind-3.7.0.tar.bz2' 'valgrind-3.7.0.tar.bz2'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/valgrind/install-macosx32.sh

    r12168 r12258  
    44rm -rf install valgrind-3.7.0
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/valgrind-3.7.0.tar.bz2' 'valgrind-3.7.0.tar.bz2'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/valgrind/install-macosx64.sh

    r12168 r12258  
    44rm -rf install valgrind-3.7.0
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/valgrind-3.7.0.tar.bz2' 'valgrind-3.7.0.tar.bz2'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/valgrind/install-win32.sh

    r12168 r12258  
    44rm -rf install valgrind-3.7.0
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/valgrind-3.7.0.tar.bz2' 'valgrind-3.7.0.tar.bz2'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/vim/addons/vim/syntax/c.vim

    r12004 r12258  
    547547syn keyword cType QuadTree
    548548syn keyword cType SetOfE4
     549syn keyword cType Variogram
     550syn keyword cType GaussianVariogram
     551syn keyword cType ExponentialVariogram
     552syn keyword cType SphericalVariogram
     553syn keyword cType Quadtree
     554syn keyword cType Observation
    549555"ISSM's objects end
    550556
     
    688694syn keyword cConstant SettingsResultsAsPatchesEnum
    689695syn keyword cConstant SettingsWaitonlockEnum
     696syn keyword cConstant DebugPetscProfilingEnum
     697syn keyword cConstant PetscProfilingCurrentMemEnum
     698syn keyword cConstant PetscProfilingCurrentFlopsEnum
     699syn keyword cConstant PetscProfilingSolutionTimeEnum
    690700syn keyword cConstant SteadystateMaxiterEnum
    691701syn keyword cConstant SteadystateNumRequestedOutputsEnum
     
    703713syn keyword cConstant ThermalIsenthalpyEnum
    704714syn keyword cConstant ThicknessEnum
     715syn keyword cConstant TimesteppingStartTimeEnum
     716syn keyword cConstant TimesteppingFinalTimeEnum
    705717syn keyword cConstant TimesteppingCflCoefficientEnum
    706 syn keyword cConstant TimesteppingFinalTimeEnum
    707718syn keyword cConstant TimesteppingTimeAdaptEnum
    708719syn keyword cConstant TimesteppingTimeStepEnum
     
    766777syn keyword cConstant BoolInputEnum
    767778syn keyword cConstant BoolParamEnum
     779syn keyword cConstant ContourEnum
    768780syn keyword cConstant ControlInputEnum
    769781syn keyword cConstant DatasetInputEnum
     
    906918syn keyword cConstant P1Enum
    907919syn keyword cConstant P1DGEnum
     920syn keyword cConstant SaveResultsEnum
    908921syn keyword cConstant BoolElementResultEnum
    909922syn keyword cConstant BoolExternalResultEnum
     
    920933syn keyword cConstant PetscVecExternalResultEnum
    921934syn keyword cConstant StringExternalResultEnum
     935syn keyword cConstant StepEnum
    922936syn keyword cConstant TimeEnum
    923937syn keyword cConstant TriaP1ElementResultEnum
  • issm/branches/trunk-jpl-damage/externalpackages/vim/install.sh

    r12168 r12258  
    55rm -rf vim72
    66mkdir install src
     7
     8#Download from ISSM server
     9$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/vim-7.2.tar.bz2' 'vim-7.2.tar.bz2'
    710
    811#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/windows/InstallInstructions.txt

    r12004 r12258  
    4242python: Python language interpreter
    4343unzip
     44cygrunsrv
    4445
    4546
     
    144145
    145146How to setup a Cron job?
    146 Download exim and cron from cygwin setup. Run exim-config (don't forget to launch your cygwin terminal as
    147 Administrator). If asked for a daemon name, type ntsec. Also, if cron complains about sendmail,
    148 symlink /usr/lib/sendmail to /usr/sbin/sendmail.  Then link /usr/sbin/sendmail
    149 to /usr/bin/exim. Alternatively, if you have an smtp server, you can download and configure
    150 ssmtp.  Run ssmtp-config
    151 as Administrator and link /usr/sbin/sendmail to /usr/bin/ssmtp. After the email has been configured,
    152 run cron-config as Administrator.
     147First, make sure you downloaded cygrunsrv, otherwise the cron setup will only work on a per-session
     148basis! Also, make sure that you have an email correctly setup.  In particular, cron relies on the
     149/usr/sbin/sendmail script. If it does not exist, cron will not send emails. Most email management
     150systems will create this script, but you need to check on it.
     151Run cron-config  and fill up the questions. For daemon name, type ntsec.
     152Be careful, make sure that you are running your terminal as Administrator,
     153otherwise your settings will be only user-based.
     154How to setup email?
     155
     156Preferred way is through ssmtp. Download it on cygwin, and type ssmtp-config.  If the ssmtp
     157daemon does not create /usr/sbin/sendmail, be sure to create a symlink from the email client
     158to the latter file. Be careful, make sure that you are running your terminal as Administrator,
     159otherwise your settings will be only user-based.
  • issm/branches/trunk-jpl-damage/externalpackages/windows/configs/sdk7.1.win7-32.sh

    r12004 r12258  
    11declare -x ALLUSERSPROFILE="C:\\ProgramData"
    2 declare -x CL="/AI C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319"
    3 declare -x COMMONPROGRAMFILES="C:\\Program Files (x86)\\Common Files"
     2declare -x CL="/AI C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319"
     3declare -x COMMONPROGRAMFILES="C:\\Program Files\\Common Files"
    44declare -x COMSPEC="C:\\Windows\\system32\\cmd.exe"
    5 declare -x CommandPromptType="Cross"
    6 declare -x CommonProgramW6432="C:\\Program Files\\Common Files"
     5declare -x CommandPromptType="Native"
    76declare -x Configuration="Debug"
    87declare -x FP_NO_HOST_CHECK="NO"
    98declare -x FrameworkVersion="v4.0.30319"
    109declare -x HOMEDRIVE="C:"
    11 declare -x INCLUDE="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\INCLUDE;C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\INCLUDE;C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\INCLUDE\\gl;C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\ATLMFC\\INCLUDE;"
     10declare -x INCLUDE="C:\\Program Files\\Microsoft Visual Studio 10.0\\VC\\INCLUDE;C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\INCLUDE;C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\INCLUDE\\gl;"
    1211declare -x INFOPATH="/usr/local/info:/usr/share/info:/usr/info:"
    1312declare -x LANG="en_US.UTF-8"
    14 declare -x LIB="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\Lib;C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib;C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319;C:\\Windows\\Microsoft.NET\\Framework\\v3.5;;C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\ATLMFC\\LIB;"
    15 declare -x LIBPATH="C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319;C:\\Windows\\Microsoft.NET\\Framework\\v3.5;;C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\Lib;"
     13declare -x LIB="C:\\Program Files\\Microsoft Visual Studio 10.0\\VC\\Lib;C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib;C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319;C:\\Windows\\Microsoft.NET\\Framework\\v3.5;;"
     14declare -x LIBPATH="C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319;C:\\Windows\\Microsoft.NET\\Framework\\v3.5;;C:\\Program Files\\Microsoft Visual Studio 10.0\\VC\\Lib;"
    1615declare -x MANPATH="/usr/local/man:/usr/share/man:/usr/man:"
    17 declare -x PATH="/usr/local/bin:/usr/bin:/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319:/cygdrive/c/Windows/Microsoft.NET/Framework/v3.5:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/Common7/IDE:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/Common7/Tools:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/VC/Bin:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/VC/Bin/VCPackages:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin/NETFX 4.0 Tools:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0:/cygdrive/c/Program Files/Microsoft Windows Performance Toolkit:/cygdrive/c/MATLAB/R2011b32/runtime/win32:/cygdrive/c/MATLAB/R2011b32/bin:/cygdrive/c/MATLAB/R2011b/runtime/win64:/cygdrive/c/MATLAB/R2011b/bin:/cygdrive/c/Program Files (x86)/Microsoft SQL Server/100/Tools/Binn:/cygdrive/c/Program Files/Microsoft SQL Server/100/Tools/Binn:/cygdrive/c/Program Files/Microsoft SQL Server/100/DTS/Binn:/cygdrive/c/Program Files/Microsoft Network Monitor 3"
     16declare -x PATH="/usr/local/bin:/usr/bin:/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319:/cygdrive/c/Windows/Microsoft.NET/Framework/v3.5:/cygdrive/c/Program Files/Microsoft Visual Studio 10.0/Common7/IDE:/cygdrive/c/Program Files/Microsoft Visual Studio 10.0/Common7/Tools:/cygdrive/c/Program Files/Microsoft Visual Studio 10.0/VC/Bin:/cygdrive/c/Program Files/Microsoft Visual Studio 10.0/VC/Bin/VCPackages:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin/NETFX 4.0 Tools:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0:/cygdrive/c/MATLAB/R2012a/runtime/win32:/cygdrive/c/MATLAB/R2012a/bin:/cygdrive/c/Program Files/Microsoft Windows Performance Toolkit"
    1817declare -x PATHEXT=".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC"
     18declare -x PRINTER="137.78.140.129#:1"
    1919declare -x PROCESSOR_ARCHITECTURE="x86"
    20 declare -x PROCESSOR_ARCHITEW6432="AMD64"
    21 declare -x PROCESSOR_IDENTIFIER="Intel64 Family 6 Model 42 Stepping 7, GenuineIntel"
     20declare -x PROCESSOR_IDENTIFIER="x86 Family 6 Model 42 Stepping 7, GenuineIntel"
    2221declare -x PROCESSOR_LEVEL="6"
    2322declare -x PROCESSOR_REVISION="2a07"
    24 declare -x PROGRAMFILES="C:\\Program Files (x86)"
     23declare -x PROGRAMFILES="C:\\Program Files"
    2524declare -x PSModulePath="C:\\Windows\\system32\\WindowsPowerShell\\v1.0\\Modules\\"
    2625declare -x PUBLIC="C:\\Users\\Public"
    2726declare -x PlatformToolset="Windows7.1SDK"
    2827declare -x ProgramData="C:\\ProgramData"
    29 declare -x ProgramW6432="C:\\Program Files"
    3028declare -x SHELL="/bin/bash"
    3129declare -x SYSTEMDRIVE="C:"
    3230declare -x SYSTEMROOT="C:\\Windows"
     31declare -x TARGET_CPU="x86"
    3332declare -x TARGET_PLATFORM="WIN7"
    3433declare -x TERM="cygwin"
    35 declare -x VS100COMNTOOLS="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\Common7\\Tools\\"
     34declare -x ToolsVersion="4.0"
     35declare -x VS100COMNTOOLS="C:\\Program Files\\Microsoft Visual Studio 10.0\\Common7\\Tools\\"
    3636declare -x WINDIR="C:\\Windows"
    3737declare -x WindowsSDKDir="C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\"
  • issm/branches/trunk-jpl-damage/externalpackages/windows/configs/sdk7.1.win7-64.sh

    r12168 r12258  
    1313declare -x LIB="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\Lib\\amd64;C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib\\X64;"
    1414declare -x LIBPATH="C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319;C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319;C:\\Windows\\Microsoft.NET\\Framework64\\v3.5;C:\\Windows\\Microsoft.NET\\Framework\\v3.5;;C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\Lib\\amd64;"
    15 declare -x LOCALAPPDATA="C:\\Users\\schlegel\\AppData\\Local"
    1615declare -x MANPATH="/usr/local/man:/usr/share/man:/usr/man:"
    1716declare -x PATH="/usr/local/bin:/usr/bin:/usr/include:/cygdrive/c/cygwin/usr/bin:/cygdrive/c/cygwin/usr/include:/cygdrive/c/Windows/Microsoft.NET/Framework64/v4.0.30319:/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319:/cygdrive/c/Windows/Microsoft.NET/Framework64/v3.5:/cygdrive/c/Windows/Microsoft.NET/Framework/v3.5:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/Common7/IDE:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/Common7/Tools:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/VC/Bin/amd64:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/VC/Bin/VCPackages:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin/NETFX 4.0 Tools/x64:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin/x64:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0:/cygdrive/c/Program Files/Microsoft Windows Performance Toolkit:/cygdrive/c/MATLAB/R2012a/runtime/win64:/cygdrive/c/MATLAB/R2012a/bin:/cygdrive/c/MATLAB/R2012a/extern/include:/cygdrive/c/MATLAB/R2011a/runtime/win64:/cygdrive/c/MATLAB/R2011a/bin:/cygdrive/c/MATLAB/R2011a/extern/include"
     
    4140declare -x TMP="/tmp"
    4241declare -x ToolsVersion="4.0"
    43 declare -x USER="schlegel"
    44 declare -x USERNAME="schlegel"
    4542declare -x VS100COMNTOOLS="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\Common7\\Tools\\"
    4643declare -x WINDIR="C:\\Windows"
  • issm/branches/trunk-jpl-damage/externalpackages/windows/windows_environment.sh

    r12004 r12258  
    22
    33#Where are the configuration files for each compiler:
    4 config_dir="$ISSM_TIER/externalpackages/windows/configs"
     4config_dir="$ISSM_DIR/externalpackages/windows/configs"
    55
    66#your choise of compiler:
     
    1010# 4: intel compiler on WinXP
    1111
    12 compiler=2;
     12#Determine OS version using uname:
     13version=`uname -s | grep 64`
     14if [[ $version == "" ]];then
     15        compiler=1
     16else
     17        compiler=2
     18fi
     19
     20#If you want to override and use intel compilers:
     21#compiler=3;
     22
    1323
    1424#source corresponding environment variables:
     
    2434fi
    2535
    26 #finally, out of ISSM_TIER, we need to create an ISSM_TIER_WIN variable for Matlab to pick up on.
    27 ISSM_TIER_WIN=`cygpath -m $ISSM_TIER`
    28 export ISSM_TIER_WIN
     36#finally, out of ISSM_DIR, we need to create an ISSM_DIR_WIN variable for Matlab to pick up on.
     37ISSM_DIR_WIN=`cygpath -m $ISSM_DIR`
     38export ISSM_DIR_WIN
  • issm/branches/trunk-jpl-damage/externalpackages/xerces/install.sh

    r11128 r12258  
    44rm -rf install xerces-c-src_2_8_0 src
    55mkdir install src
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/xerces-c-src_2_8_0.tar.gz' 'xerces-c-src_2_8_0.tar.gz'
    69
    710#Untar
  • issm/branches/trunk-jpl-damage/externalpackages/yams/install.sh

    r11101 r12258  
    44rm -rf install
    55mkdir install
     6
     7#Download from ISSM server
     8$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/yams2-linux.gz' 'yams2-linux.gz'
     9$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/yams2-osx.gz' 'yams2-osx.gz'
     10$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/yams2-win.exe' 'yams2-win.exe'
    611
    712#loop over the binaries
  • issm/branches/trunk-jpl-damage/m4/issm_options.m4

    r12168 r12258  
    6666                        export CFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
    6767                elif test $VENDOR = arm-linux; then
    68                         export CC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-cc
    69                         export CXX=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-cc
    70 
    71                 else
     68                        export CC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc
     69                        export GCC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc
     70                        export CXX=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-g++
     71                        export AR=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-ar
     72                        export RANLIB=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-ranlib
     73        else
    7274                AC_MSG_ERROR([unknow compiler vendor!])
    7375                fi
     
    949951
    950952        dnl check that --with-fortran-lib may have been provided
     953        HAVE_FORTRAN=no
    951954        if test -n "$FORTRAN_LIB" ; then
    952                 HAVE_FORTRAN=yes
    953                 FORTRANLIB="$FORTRAN_LIB"
    954 
    955                 AC_DEFINE([_HAVE_FORTRAN_],[1],[with FORTRAN in ISSM src])
    956                 AC_SUBST([FORTRANLIB])
    957         fi
     955        if test x$FORTRAN_LIB = xno; then
     956            HAVE_FORTRAN=NO
     957        else
     958            HAVE_FORTRAN=yes
     959            FORTRANLIB="$FORTRAN_LIB"
     960
     961            AC_DEFINE([_HAVE_FORTRAN_],[1],[with FORTRAN in ISSM src])
     962            AC_SUBST([FORTRANLIB])
     963        fi
     964        fi
     965        AM_CONDITIONAL([FORTRAN], [test x$HAVE_FORTRAN = xyes])
    958966        AC_MSG_RESULT(done)
    959967        dnl }}}
  • issm/branches/trunk-jpl-damage/src/c/Container/Parameters.h

    r11708 r12258  
    55#ifndef _CONTAINER_PARAMETERS_H_
    66#define  _CONTAINER_PARAMETERS_H_
     7#include <stdio.h>
    78
    89/*forward declarations */
  • issm/branches/trunk-jpl-damage/src/c/Container/Vertices.h

    r10522 r12258  
    3232};
    3333
    34 
    35 
    3634#endif //ifndef _VERTICES_H_
    37 
  • issm/branches/trunk-jpl-damage/src/c/Makefile.am

    r12168 r12258  
    572572                                ./objects/Bamg/Metric.cpp\
    573573                                ./objects/Bamg/Metric.h\
    574                                 ./objects/Bamg/QuadTree.cpp\
    575                                 ./objects/Bamg/QuadTree.h\
     574                                ./objects/Bamg/BamgQuadtree.cpp\
     575                                ./objects/Bamg/BamgQuadtree.h\
    576576                                ./objects/Bamg/R2.h\
    577577                                ./objects/Bamg/SetOfE4.cpp\
     
    608608                                ./modules/BamgTriangulatex/BamgTriangulatex.cpp\
    609609                                ./modules/BamgTriangulatex/BamgTriangulatex.h
     610#}}}
     611#Kriging sources  {{{1
     612kriging_sources = ./Container/Observations.h\
     613                                                ./Container/Observations.cpp\
     614                                                ./objects/Kriging/Variogram.h \
     615                                                ./objects/Kriging/GaussianVariogram.h\
     616                                                ./objects/Kriging/GaussianVariogram.cpp\
     617                                                ./objects/Kriging/ExponentialVariogram.h\
     618                                                ./objects/Kriging/ExponentialVariogram.cpp\
     619                                                ./objects/Kriging/SphericalVariogram.h\
     620                                                ./objects/Kriging/SphericalVariogram.cpp\
     621                                                ./objects/Kriging/PowerVariogram.h\
     622                                                ./objects/Kriging/PowerVariogram.cpp\
     623                                                ./objects/Kriging/Quadtree.h\
     624                                                ./objects/Kriging/Quadtree.cpp\
     625                                                ./objects/Kriging/Observation.h\
     626                                                ./objects/Kriging/Observation.cpp\
     627                                                ./modules/Krigingx/Krigingx.cpp\
     628                                                ./modules/Krigingx/Krigingx.h
     629
    610630#}}}
    611631#Kml sources  {{{1
     
    820840                        ./modules/HoleFillerx/HoleFillerx.cpp\
    821841                        ./modules/HoleFillerx/HoleFillerx.h\
    822                         ./modules/Krigingx/Krigingx.cpp\
    823                         ./modules/Krigingx/Krigingx.h\
    824842                        ./modules/AverageFilterx/AverageFilterx.cpp\
    825843                        ./modules/AverageFilterx/AverageFilterx.h\
     
    946964libISSMModules_a_SOURCES = $(module_sources)
    947965libISSMModules_a_SOURCES += $(bamg_sources)
     966libISSMModules_a_SOURCES += $(kriging_sources)
    948967libISSMModules_a_SOURCES += $(kml_sources)
    949968libISSMModules_a_CXXFLAGS = $(ALLCXXFLAGS)
     
    972991
    973992#External packages
    974 LDADD += $(PETSCLIB) $(TAOLIB) $(FLIBS) $(PLAPACKLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB)
     993LDADD += $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB)
     994
     995if FORTRAN
     996LDADD += $(FLIBS)
     997endif
    975998
    976999issm_SOURCES = solutions/issm.cpp
  • issm/branches/trunk-jpl-damage/src/c/matlab/io/FetchMatlabData.cpp

    r12052 r12258  
    404404        else if (mxIsClass(dataref,"char") ){
    405405
    406                 /*Check dataref is not pointing to NaN: */
    407                 if ( mxIsNaN(*(mxGetPr(dataref))) && (mxGetNumberOfElements(dataref)==1) ){
    408                         outmatrix_numel=0;
    409                         outmatrix_ndims=0;
    410                         outmatrix_size =NULL;
    411                         outmatrix=NULL;
    412                 }
    413                 else{
    414 
    415                         /*Convert matlab n-dim array to char* matrix: */
    416                         MatlabNArrayToNArray(&outmatrix,&outmatrix_numel,&outmatrix_ndims,&outmatrix_size,dataref);
    417                 }
     406                /*Convert matlab n-dim array to char* matrix: */
     407                MatlabNArrayToNArray(&outmatrix,&outmatrix_numel,&outmatrix_ndims,&outmatrix_size,dataref);
    418408        }
    419409        else{
  • issm/branches/trunk-jpl-damage/src/c/matlab/io/OptionParse.cpp

    r12013 r12258  
    4141        /*check and parse the name  */
    4242        ological=new OptionLogical;
    43         ological->name =(char *) xmalloc((strlen(name)+1)*sizeof(char));
     43        ological->name =(char*)xmalloc((strlen(name)+1)*sizeof(char));
    4444        memcpy(ological->name,name,(strlen(name)+1)*sizeof(char));
    4545
     
    5959
    6060        /*check and parse the name  */
    61         ochar=new OptionChar;
    62         ochar->name =(char *) xmalloc((strlen(name)+1)*sizeof(char));
     61        ochar=new OptionChar();
     62        ochar->name =(char*)xmalloc((strlen(name)+1)*sizeof(char));
    6363        memcpy(ochar->name,name,(strlen(name)+1)*sizeof(char));
    6464
  • issm/branches/trunk-jpl-damage/src/c/modules/Bamgx/Bamgx.cpp

    r11577 r12258  
    9292
    9393                //Make Quadtree from background mesh
    94                 BTh.MakeQuadTree();
     94                BTh.MakeBamgQuadtree();
    9595
    9696                //Bound hmin and hmax
  • issm/branches/trunk-jpl-damage/src/c/modules/Krigingx/Krigingx.cpp

    r12164 r12258  
    88#include "../../toolkits/toolkits.h"
    99#include "../../objects/objects.h"
     10#include "../../Container/Observations.h"
    1011#include "../modules.h"
    1112
    12 int Krigingx(double** ppredictions,double* x, double* y, double* observations, int n_obs,double* x_interp,double* y_interp,int n_interp){
     13#ifdef _HAVE_GSL_
     14#include <gsl/gsl_linalg.h>
     15#endif
     16
     17#include "../../objects/Kriging/GaussianVariogram.h"
     18/*FUNCTION Krigingx{{{*/
     19int Krigingx(double** ppredictions,double **perror,double* obs_x, double* obs_y, double* obs_list, int obs_length,double* x_interp,double* y_interp,int n_interp,Options* options){
    1320
    1421        /*output*/
    1522        double *predictions = NULL;
     23        double *error       = NULL;
     24
     25        /*Intermediaries*/
     26        double        range;
     27        char         *output       = NULL;
     28        Variogram    *variogram    = NULL;
     29        Observations *observations = NULL;
     30
     31        /*threading: */
     32        KrigingxThreadStruct gate;
     33        int num=1;
     34#ifdef _MULTITHREADING_
     35        num=_NUMTHREADS_;
     36#endif
     37
     38        /*Get Variogram from Options*/
     39        ProcessVariogram(&variogram,options);
     40        options->Get(&range,"searchrange",0.);
     41
     42        /*Process observation dataset*/
     43        observations=new Observations(obs_list,obs_x,obs_y,obs_length,options);
    1644
    1745        /*Allocate output*/
    18         predictions=(double*)xmalloc(n_interp*sizeof(double));
     46        predictions =(double*)xcalloc(n_interp,sizeof(double));
     47        error       =(double*)xcalloc(n_interp,sizeof(double));
     48
     49        /*Get output*/
     50        options->Get(&output,"output","prediction");
     51
     52        if(strcmp(output,"quadtree")==0){
     53                observations->QuadtreeColoring(predictions,x_interp,y_interp,n_interp);
     54        }
     55        else if(strcmp(output,"variomap")==0){
     56                observations->Variomap(predictions,x_interp,n_interp);
     57        }
     58        else if(strcmp(output,"prediction")==0){
     59
     60                /*initialize thread parameters: */
     61                gate.n_interp     = n_interp;
     62                gate.x_interp     = x_interp;
     63                gate.y_interp     = y_interp;
     64                gate.range        = range;
     65                gate.variogram    = variogram;
     66                gate.observations = observations;
     67                gate.predictions  = predictions;
     68                gate.error        = error;
     69                gate.percent      = (double*)xcalloc(num,sizeof(double));
     70
     71                /*launch the thread manager with Krigingxt as a core: */
     72                LaunchThread(Krigingxt,(void*)&gate,num);
     73                printf("\r      interpolation progress:  100.00%%\n");
     74                xfree((void**)&gate.percent);
     75        }
     76        else{
     77                _error_("output '%s' not supported yet",output);
     78        }
     79
     80        /*clean-up and Assign output pointer*/
     81        delete variogram;
     82        delete observations;
     83        xfree((void**)&output);
     84        *ppredictions = predictions;
     85        *perror       = error;
     86        return 1;
     87}/*}}}*/
     88/*FUNCTION Krigingxt{{{*/
     89void* Krigingxt(void* vpthread_handle){
     90
     91        /*gate variables :*/
     92        KrigingxThreadStruct *gate        = NULL;
     93        pthread_handle       *handle      = NULL;
     94        int my_thread;
     95        int num_threads;
     96        int i0,i1;
     97
     98        /*recover handle and gate: */
     99        handle      = (pthread_handle*)vpthread_handle;
     100        gate        = (KrigingxThreadStruct*)handle->gate;
     101        my_thread   = handle->id;
     102        num_threads = handle->num;
     103
     104        /*recover parameters :*/
     105        int           n_interp     = gate->n_interp;
     106        double       *x_interp     = gate->x_interp;
     107        double       *y_interp     = gate->y_interp;
     108        double        range        = gate->range;
     109        Variogram    *variogram    = gate->variogram;
     110        Observations *observations = gate->observations;
     111        double       *predictions  = gate->predictions;
     112        double       *error        = gate->error;
     113        double       *percent      = gate->percent;
     114
     115        /*Intermediaries*/
     116        int           i,j,n_obs;
     117        double        numerator,denominator,ratio,localpercent;
     118        double       *x            = NULL;
     119        double       *y            = NULL;
     120        double       *obs          = NULL;
     121        double       *Gamma        = NULL;
     122        double       *GinvG0       = NULL;
     123        double       *Ginv1        = NULL;
     124        double       *GinvZ        = NULL;
     125        double       *gamma0       = NULL;
     126        double       *ones         = NULL;
     127
     128        /*partition loop across threads: */
     129        PartitionRange(&i0,&i1,n_interp,num_threads,my_thread);
     130        for(int idx=i0;idx<i1;idx++){
     131
     132                /*Print info*/
     133                percent[my_thread]=double(idx-i0)/double(i1-i0)*100.;
     134                localpercent=percent[0];
     135                for(i=1;i<num_threads;i++) localpercent=min(localpercent,percent[i]);
     136                printf("\r      interpolation progress: %5.2lf%%",localpercent);
     137
     138                /*Get list of observations for current point*/
     139                observations->ObservationList(&x,&y,&obs,&n_obs,x_interp[idx],y_interp[idx],range);
     140
     141                /*Allocate intermediary matrix and vectors*/
     142                Gamma  = (double*)xmalloc(n_obs*n_obs*sizeof(double));
     143                gamma0 = (double*)xmalloc(n_obs*sizeof(double));
     144                ones   = (double*)xmalloc(n_obs*sizeof(double));
     145
     146                /*First: Create semivariogram matrix for observations*/
     147                for(i=0;i<n_obs;i++){
     148                        for(j=0;j<=i;j++){
     149                                Gamma[i*n_obs+j] = variogram->SemiVariogram(x[i]-x[j],y[i]-y[j]);
     150                                Gamma[j*n_obs+i] = Gamma[i*n_obs+j];
     151                        }
     152                }
     153                for(i=0;i<n_obs;i++) ones[i]=1;
     154
     155                /*Get semivariogram vector associated to this location*/
     156                for(i=0;i<n_obs;i++) gamma0[i] = variogram->SemiVariogram(x[i]-x_interp[idx],y[i]-y_interp[idx]);
     157
     158                /*Solve the three linear systems*/
     159                GslSolve(&GinvG0,Gamma,gamma0,n_obs); // Gamma^-1 gamma0
     160                GslSolve(&Ginv1, Gamma,ones,n_obs);   // Gamma^-1 ones
     161                GslSolve(&GinvZ, Gamma,obs,n_obs);    // Gamma^-1 Z
     162
     163                /*Prepare predictor*/
     164                numerator=-1.; denominator=0.;
     165                for(i=0;i<n_obs;i++) numerator  +=GinvG0[i];
     166                for(i=0;i<n_obs;i++) denominator+=Ginv1[i];
     167                ratio=numerator/denominator;
     168
     169                predictions[idx] = 0.;
     170                error[idx]       = - numerator*numerator/denominator;
     171                for(i=0;i<n_obs;i++) predictions[idx] += (gamma0[i]-ratio)*GinvZ[i];
     172                for(i=0;i<n_obs;i++) error[idx] += gamma0[i]*GinvG0[i];
     173
     174                /*clean-up*/
     175                xfree((void**)&x);
     176                xfree((void**)&y);
     177                xfree((void**)&obs);
     178                xfree((void**)&Gamma);
     179                xfree((void**)&gamma0);
     180                xfree((void**)&ones);
     181                xfree((void**)&GinvG0);
     182                xfree((void**)&Ginv1);
     183                xfree((void**)&GinvZ);
     184        }
     185
     186        return NULL;
     187}/*}}}*/
     188
     189void ProcessVariogram(Variogram **pvariogram,Options* options){/*{{{*/
     190
     191        /*Intermediaries*/
     192        Variogram* variogram = NULL;
     193        char      *model     = NULL;
     194
     195        if(options->GetOption("model")){
     196                options->Get(&model,"model");
     197                if     (strcmp(model,"gaussian")==0)    variogram = new GaussianVariogram(options);
     198                else if(strcmp(model,"exponential")==0) variogram = new ExponentialVariogram(options);
     199                else if(strcmp(model,"spherical")==0)   variogram = new SphericalVariogram(options);
     200                else if(strcmp(model,"power")==0)       variogram = new PowerVariogram(options);
     201                else _error_("variogram %s not supported yet (list of supported variogram: gaussian, exponential, spherical and power)",model);
     202        }
     203        else variogram = new GaussianVariogram(options);
    19204
    20205        /*Assign output pointer*/
    21         *ppredictions=predictions;
    22 }
     206        xfree((void**)&model);
     207        *pvariogram = variogram;
     208}/*}}}*/
     209void GslSolve(double** pX,double* A,double* B,int n){/*{{{*/
     210#ifdef _HAVE_GSL_
     211
     212                /*GSL Matrices and vectors: */
     213                int              s;
     214                gsl_matrix_view  a;
     215                gsl_vector_view  b;
     216                gsl_vector      *x = NULL;
     217                gsl_permutation *p = NULL;
     218
     219                /*A will be modified by LU decomposition. Use copy*/
     220                double* Acopy = (double*)xmalloc(n*n*sizeof(double));
     221                memcpy(Acopy,A,n*n*sizeof(double));
     222
     223                /*Initialize gsl matrices and vectors: */
     224                a = gsl_matrix_view_array (Acopy,n,n);
     225                b = gsl_vector_view_array (B,n);
     226                x = gsl_vector_alloc (n);
     227
     228                /*Run LU and solve: */
     229                p = gsl_permutation_alloc (n);
     230                gsl_linalg_LU_decomp (&a.matrix, p, &s);
     231                gsl_linalg_LU_solve (&a.matrix, p, &b.vector, x);
     232
     233                //printf ("x = \n");
     234                //gsl_vector_fprintf (stdout, x, "%g");
     235
     236                /*Copy result*/
     237                double* X = (double*)xmalloc(n*sizeof(double));
     238                memcpy(X,gsl_vector_ptr(x,0),n*sizeof(double));
     239
     240                /*Clean up and assign output pointer*/
     241                xfree((void**)&Acopy);
     242                gsl_permutation_free(p);
     243                gsl_vector_free(x);
     244                *pX=X;
     245#else
     246                _error_("GSL support required");
     247#endif
     248        }/*}}}*/
  • issm/branches/trunk-jpl-damage/src/c/modules/Krigingx/Krigingx.h

    r12164 r12258  
    99#include "../../toolkits/toolkits.h"
    1010
     11class Observations;
     12class Variogram;
    1113
    12 int Krigingx(double** ppredictions,double* x, double* y, double* observations, int n_obs,double* x_interp,double* y_interp,int n_interp);
     14int  Krigingx(double** ppredictions,double **perror,double* x, double* y, double* observations, int n_obs,double* x_interp,double* y_interp,int n_interp,Options* options);
     15void ProcessVariogram(Variogram **pvariogram,Options* options);
     16void GslSolve(double** pX,double* A,double* B,int n);
    1317
     18/*threading: */
     19typedef struct{
     20        int           n_interp;
     21        double       *x_interp;
     22        double       *y_interp;
     23        double        range;
     24        Variogram    *variogram;
     25        Observations *observations;
     26        double       *predictions;
     27        double       *error;
     28        double       *percent;
     29}KrigingxThreadStruct;
     30
     31void* Krigingxt(void*);
    1432#endif /* _KRIGINGX_H */
    15 
  • issm/branches/trunk-jpl-damage/src/c/modules/Shp2Kmlx/Shp2Kmlx.h

    r10380 r12258  
    2222
    2323/* local prototypes: */
    24 int Shp2Kmlx(char* filshp,char* filkml,
    25                          int sgn);
    26 int Shp2Kmlx(char* filshp,char* filkml,
    27                          int sgn,double cm,double sp);
     24int Shp2Kmlx(char* filshp,char* filkml, int sgn);
     25int Shp2Kmlx(char* filshp,char* filkml, int sgn,double cm,double sp);
    2826
    2927#endif  /* _SHP2KMLX_H */
  • issm/branches/trunk-jpl-damage/src/c/objects/Bamg/Geometry.cpp

    r9309 r12258  
    505505                float             *eangle   = new float[nbe];
    506506                double             eps      = 1e-20;
    507                 QuadTree           quadtree; // build quadtree to find duplicates
     507                BamgQuadtree           quadtree; // build quadtree to find duplicates
    508508                BamgVertex        *v0       = vertices;
    509509                GeomVertex *v0g      = (GeomVertex*) (void*)v0;
  • issm/branches/trunk-jpl-damage/src/c/objects/Bamg/Geometry.h

    r5573 r12258  
    1212
    1313        class Triangle;
    14         class QuadTree;
     14        class BamgQuadtree;
    1515        class GeomSubDomain;
    1616        class Edge;
     
    2020                public:
    2121
    22                         long                  NbRef;                         // counter of ref on the this class if 0 we can delete
    23                         long                  nbv;                           // number of vertices
    24                         long                  nbe;                           // number of edges
    25                         long                  nbsubdomains;
    26                         long                  nbcurves;
     22                        long           NbRef;                 // counter of ref on the this class if 0 we can delete
     23                        long           nbv;                   // number of vertices
     24                        long           nbe;                   // number of edges
     25                        long           nbsubdomains;
     26                        long           nbcurves;
    2727                        GeomVertex    *vertices;
    2828                        GeomEdge      *edges;
    29                         QuadTree             *quadtree;
     29                        BamgQuadtree  *quadtree;
    3030                        GeomSubDomain *subdomains;
    31                         Curve                *curves;
    32                         R2                    pmin,pmax;                     // domain extrema coordinates
    33                         double                coefIcoor;                     // coef to integer Icoor1;
    34                         double                MaxCornerAngle;
     31                        Curve         *curves;
     32                        R2             pmin,pmax;             // domain extrema coordinates
     33                        double         coefIcoor;             // coef to integer Icoor1;
     34                        double         MaxCornerAngle;
    3535
    3636                        //Constructor/Destructors
     
    4444                        GeomVertex       &operator[](long i) { return vertices[i];       };
    4545                        const GeomEdge   &operator()(long i) const { return edges[i];    };
    46                         GeomEdge         &operator()(long  i) { return edges[i];                };
     46                        GeomEdge         &operator()(long  i) { return edges[i];         };
    4747
    4848                        //Methods
  • issm/branches/trunk-jpl-damage/src/c/objects/Bamg/Mesh.cpp

    r11684 r12258  
    28852885
    28862886                //build quadtree
    2887                 if (!quadtree)  quadtree = new QuadTree(this,0);
     2887                if (!quadtree)  quadtree = new BamgQuadtree(this,0);
    28882888                quadtree->Add(*v0);
    28892889                quadtree->Add(*v1);
     
    31073107        }
    31083108        /*}}}1*/
    3109         /*FUNCTION Mesh::MakeQuadTree{{{1*/
    3110         void Mesh::MakeQuadTree() { 
    3111                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/MakeQuadTree)*/
     3109        /*FUNCTION Mesh::MakeBamgQuadtree{{{1*/
     3110        void Mesh::MakeBamgQuadtree() { 
     3111                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/MakeBamgQuadtree)*/
    31123112
    31133113                long int verbose=0;
    3114                 if (  !quadtree )  quadtree = new QuadTree(this);
     3114                if (  !quadtree )  quadtree = new BamgQuadtree(this);
    31153115
    31163116        }
     
    36223622
    36233623        if (!quadtree) delete quadtree; //ReInitialise;
    3624         quadtree = new QuadTree(this,0);
     3624        quadtree = new BamgQuadtree(this,0);
    36253625        quadtree->Add(*v0);
    36263626        quadtree->Add(*v1);
     
    39003900                if (quadtree){
    39013901                        delete quadtree;
    3902                         quadtree = new QuadTree(this);
     3902                        quadtree = new BamgQuadtree(this);
    39033903                }
    39043904
     
    41164116
    41174117        delete [] tstart;
    4118         if (quadtree) quadtree= new QuadTree(this);
     4118        if (quadtree) quadtree= new BamgQuadtree(this);
    41194119}
    41204120/*}}}1*/
  • issm/branches/trunk-jpl-damage/src/c/objects/Bamg/Mesh.h

    r10205 r12258  
    1717        class Geometry;
    1818        class CrackedEdge;
    19         class QuadTree;
     19        class BamgQuadtree;
    2020        class SubDomain;
    2121
     
    2929                        Triangle                     *triangles;
    3030                        Edge                         *edges;
    31                         QuadTree                     *quadtree;
     31                        BamgQuadtree                 *quadtree;
    3232                        BamgVertex                  **orderedvertices;
    3333                        SubDomain                    *subdomains;
     
    9494                        void MakeQuadrangles(double costheta);
    9595                        int  SplitElement(int choice);
    96                         void MakeQuadTree();
     96                        void MakeBamgQuadtree();
    9797                        void NewPoints(Mesh &,BamgOpts* bamgopts,int KeepVertices=1);
    9898                        long InsertNewPoints(long nbvold,long & NbTSwap) ;
  • issm/branches/trunk-jpl-damage/src/c/objects/Constraints/Constraint.h

    r9285 r12258  
    1111/*Headers:*/
    1212/*{{{1*/
     13class Nodes;
    1314#include "../Object.h"
    14 
    15 class Nodes;
    16 
    1715#include "../../toolkits/toolkits.h"
    1816/*}}}*/
  • issm/branches/trunk-jpl-damage/src/c/objects/Numerics/Vector.cpp

    r12168 r12258  
    8585/*}}}*/
    8686#endif
    87 #ifdef _HAVE_GSL_
     87#if defined(_HAVE_GSL_) && !defined(_HAVE_PETSC_)
    8888/*FUNCTION Vector::Vector(SeqVec* seq_vec){{{1*/
    8989Vector::Vector(SeqVec*  seq_vec){
  • issm/branches/trunk-jpl-damage/src/c/objects/Numerics/Vector.h

    r12168 r12258  
    4343                Vector(Vec petsc_vec);
    4444                #endif
    45                 #ifdef _HAVE_GSL_
     45                #if defined(_HAVE_GSL_) && !defined(_HAVE_PETSC_)
    4646                Vector(SeqVec*  seq_vec);
    4747                #endif
  • issm/branches/trunk-jpl-damage/src/c/objects/objects.h

    r12004 r12258  
    170170#include "./Bamg/Mesh.h"
    171171#include "./Bamg/Geometry.h"
    172 #include "./Bamg/QuadTree.h"
     172#include "./Bamg/BamgQuadtree.h"
    173173#include "./Bamg/SetOfE4.h"
    174174
     175/*Kriging*/
     176#include "./Kriging/Variogram.h"
     177#include "./Kriging/GaussianVariogram.h"
     178#include "./Kriging/ExponentialVariogram.h"
     179#include "./Kriging/SphericalVariogram.h"
     180#include "./Kriging/PowerVariogram.h"
     181#include "./Kriging/Quadtree.h"
     182#include "./Kriging/Observation.h"
     183
    175184#endif
  • issm/branches/trunk-jpl-damage/src/c/shared/Elements/elements.h

    r11684 r12258  
    4747        printf("\n");
    4848}
     49inline void printbinary(int n) {
     50        unsigned int i=1L<<(sizeof(n)*8-1);
     51
     52        while (i>0) {
     53                if (n&i)
     54                 printf("1");
     55                else
     56                 printf("0");
     57                i>>=1;
     58        }
     59}
    4960
    5061#endif //ifndef _SHARED_ELEMENTS_H_
  • issm/branches/trunk-jpl-damage/src/m/model/collapse.m

    r12168 r12258  
    102102
    103103%lat long
    104 if numel(md.mesh.lat)>1,  md.mesh.lat=project2d(md,md.mesh.lat,1); end
    105 if numel(md.mesh.long)>1, md.mesh.long=project2d(md,md.mesh.long,1); end
     104if numel(md.mesh.lat) ==md.mesh.numberofvertices,  md.mesh.lat=project2d(md,md.mesh.lat,1); end
     105if numel(md.mesh.long)==md.mesh.numberofvertices, md.mesh.long=project2d(md,md.mesh.long,1); end
    106106
    107107%Initialize with the 2d mesh
  • issm/branches/trunk-jpl-damage/src/m/model/partition/AreaAverageOntoPartition.m

    r9741 r12258  
    2929        %finally, project vector:
    3030        vector=project2d(md3d,vector,layer);
    31         md.qmu.partition=project2d(md3d,md3d.part,layer);
     31        md.qmu.partition=project2d(md3d,md3d.qmu.partition,layer);
    3232end
    3333
  • issm/branches/trunk-jpl-damage/src/m/utils/BC/SetIceShelfBC.py

    r12168 r12258  
    1 def SetIceShelfBC(md,icefrontfile='')
     1from numpy import *
     2def SetIceShelfBC(md,icefrontfile=''):
    23        #SETICESHELFBC - Create the boundary conditions for diagnostic and thermal models for a  Ice Shelf with Ice Front
    34        #
     
    2223                        print 'SetIceShelfBC error message: ice front file '+icefrontfile+ ' not found'
    2324                        return []
    24                 nodeinsideicefront=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,icefrontfile,'node',2);
    25                 nodeonicefront=double(md.mesh.vertexonboundary & nodeinsideicefront);
     25                nodeinsideicefront=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,icefrontfile,'node',2)
     26                nodeonicefront=double(md.mesh.vertexonboundary.astype(bool) and nodeinsideicefront.astype(bool))
    2627       
    27         pos=find(md.mesh.vertexonboundary & ~nodeonicefront);
    28         md.diagnostic.spcvx=NaN*ones(md.mesh.numberofvertices,1);
    29         md.diagnostic.spcvy=NaN*ones(md.mesh.numberofvertices,1);
    30         md.diagnostic.spcvz=NaN*ones(md.mesh.numberofvertices,1);
    31         md.diagnostic.spcvx(pos)=0;
    32         md.diagnostic.spcvy(pos)=0;
    33         md.diagnostic.spcvz(pos)=0;
    34         md.diagnostic.referential=NaN*ones(md.mesh.numberofvertices,6);
     28        pos=argwhere(logical_and(md.mesh.vertexonboundary.astype(bool),~nodeonicefront.astype(bool)))
     29        md.diagnostic.spcvx=NaN*ones(md.mesh.numberofvertices);
     30        md.diagnostic.spcvy=NaN*ones(md.mesh.numberofvertices);
     31        md.diagnostic.spcvz=NaN*ones(md.mesh.numberofvertices);
     32        md.diagnostic.spcvx[pos]=0;
     33        md.diagnostic.spcvy[pos]=0;
     34        md.diagnostic.spcvz[pos]=0;
     35        md.diagnostic.referential=float('NaN')*ones((md.mesh.numberofvertices,6),float);
    3536
    3637        #Dirichlet Values
    37         if (length(md.inversion.vx_obs)==md.mesh.numberofvertices & length(md.inversion.vy_obs)==md.mesh.numberofvertices)
    38                 disp('      boundary conditions for diagnostic model: spc set as observed velocities');
    39                 md.diagnostic.spcvx(pos)=md.inversion.vx_obs(pos);
    40                 md.diagnostic.spcvy(pos)=md.inversion.vy_obs(pos);
    41         else
    42                 disp('      boundary conditions for diagnostic model: spc set as zero');
    43         end
     38        if ~isnan(md.inversion.vx_obs) and ~isnan(md.inversion.vy_obs):
     39                if (len(md.inversion.vx_obs)==md.mesh.numberofvertices) and (len(md.inversion.vy_obs)==md.mesh.numberofvertices):
     40                        print '      boundary conditions for diagnostic model: spc set as observed velocities'
     41                        md.diagnostic.spcvx[pos]=md.inversion.vx_obs[pos]
     42                        md.diagnostic.spcvy[pos]=md.inversion.vy_obs[pos]
     43        else:
     44                print '      boundary conditions for diagnostic model: spc set as zero'
    4445
    4546        #segment on Ice Front
    4647        #segment on Neumann (Ice Front)
    47         pos=find(nodeonicefront(md.mesh.segments(:,1)) | nodeonicefront(md.mesh.segments(:,2)));
    48         if (md.mesh.dimension==2)
    49                 pressureload=md.mesh.segments(pos,:);
    50         elseif md.mesh.dimension==3
    51                 pressureload_layer1=[md.mesh.segments(pos,1:2)  md.mesh.segments(pos,2)+md.mesh.numberofvertices2d  md.mesh.segments(pos,1)+md.mesh.numberofvertices2d  md.mesh.segments(pos,3)];
     48        segs1=md.mesh.segments[:,0].astype(int)-1
     49        segs2=md.mesh.segments[:,1].astype(int)-1
     50
     51        pos=argwhere(logical_and(nodeonicefront[segs1].astype(bool),nodeonicefront[segs2].astype(bool)))
     52        if (md.mesh.dimension==2):
     53                pressureload=md.mesh.segments[pos,:];
     54        elif md.mesh.dimension==3:
     55                pressureload_layer=[md.mesh.segments[pos,0:2],md.mesh.segments[pos,1]+md.mesh.numberofvertices2d,md.mesh.segments[pos,0]+md.mesh.numberofvertices2d, md.mesh.segments[pos,2]];
    5256                pressureload=[];
    53                 for i=1:md.mesh.numberoflayers-1,
    54                         pressureload=[pressureload ;pressureload_layer1(:,1:4)+(i-1)*md.mesh.numberofvertices2d pressureload_layer1(:,5)+(i-1)*md.mesh.numberofelements2d ];
    55                 end
    56         end
     57                for i in range(1,md.mesh.numberoflayers-1):
     58                        pressureload=[pressureload ,pressureload_layer1[:,1:4]+(i-1)*md.mesh.numberofvertices2d, pressureload_layer1[:,5]+(i-1)*md.mesh.numberofelements2d ];
    5759
    5860        #Add water or air enum depending on the element
    59         pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end))];
     61        pressureload=[pressureload, 1*md.mask.elementonfloatingice(pressureload[:,end])];
    6062
    6163        #plug onto model
     
    6365
    6466        #Create zeros basalforcings and surfaceforcings
    65         if isnan(md.surfaceforcings.precipitation),
    66                 md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1);
    67                 disp('      no surfaceforcings.precipitation specified: values set as zero');
    68         end
    69         if isnan(md.surfaceforcings.mass_balance),
    70                 md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1);
    71                 disp('      no surfaceforcings.mass_balance specified: values set as zero');
    72         end
    73         if isnan(md.basalforcings.melting_rate),
    74                 md.basalforcings.melting_rate=zeros(md.mesh.numberofvertices,1);
    75                 disp('      no basalforcings.melting_rate specified: values set as zero');
    76         end
    77         if isnan(md.balancethickness.thickening_rate),
    78                 md.balancethickness.thickening_rate=zeros(md.mesh.numberofvertices,1);
    79                 disp('      no balancethickness.thickening_rate specified: values set as zero');
    80         end
     67        if isnan(md.surfaceforcings.precipitation):
     68                md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices);
     69                print '      no surfaceforcings.precipitation specified: values set as zero'
     70        if isnan(md.surfaceforcings.mass_balance):
     71                md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices);
     72                print '      no surfaceforcings.mass_balance specified: values set as zero'
     73        if isnan(md.basalforcings.melting_rate):
     74                md.basalforcings.melting_rate=zeros(md.mesh.numberofvertices)
     75                print '      no basalforcings.melting_rate specified: values set as zero'
     76        if isnan(md.balancethickness.thickening_rate):
     77                md.balancethickness.thickening_rate=zeros(md.mesh.numberofvertices);
     78                print '      no balancethickness.thickening_rate specified: values set as zero'
    8179
    82         md.prognostic.spcthickness=NaN*ones(md.mesh.numberofvertices,1);
    83         md.balancethickness.spcthickness=NaN*ones(md.mesh.numberofvertices,1);
     80        md.prognostic.spcthickness=NaN*ones(md.mesh.numberofvertices);
     81        md.balancethickness.spcthickness=NaN*ones(md.mesh.numberofvertices);
    8482
    85         if (length(md.initialization.temperature)==md.mesh.numberofvertices),
    86                 md.thermal.spctemperature=NaN*ones(md.mesh.numberofvertices,1);
    87                 pos=find(md.mesh.vertexonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); #impose observed temperature on surface
    88                 if (length(md.basalforcings.geothermalflux)~=md.mesh.numberofvertices),
    89                         md.basalforcings.geothermalflux=zeros(md.mesh.numberofvertices,1);
    90                 end
    91         else
    92                 disp('      no thermal boundary conditions created: no observed temperature found');
    93         end
     83        if (len(md.initialization.temperature)==md.mesh.numberofvertices):
     84                md.thermal.spctemperature=NaN*ones(md.mesh.numberofvertices);
     85                pos=argwhere(md.mesh.vertexonsurface); md.thermal.spctemperature[pos]=md.initialization.temperature[pos]; #impose observed temperature on surface
     86                if (len(md.basalforcings.geothermalflux) !=md.mesh.numberofvertices):
     87                        md.basalforcings.geothermalflux=zeros(md.mesh.numberofvertices);
     88        else:
     89                print '      no thermal boundary conditions created: no observed temperature found'
     90
     91        return md
  • issm/branches/trunk-jpl-damage/src/modules/Kriging/Kriging.cpp

    r12164 r12258  
    77
    88        /*Outputs*/
    9         double *x            = NULL;
    10         double *y            = NULL;
    11         double *observations = NULL;
    12         double *x_interp     = NULL;
    13         double *y_interp     = NULL;
    14         double *predictions  = NULL;
    15         int     n_interp,n,n_obs;
     9        double  *x            = NULL;
     10        double  *y            = NULL;
     11        double  *observations = NULL;
     12        double  *x_interp     = NULL;
     13        double  *y_interp     = NULL;
     14        double  *predictions  = NULL;
     15        double  *error        = NULL;
     16        Options *options      = NULL;
     17        int      N_interp,M_interp,M,N,n_obs;
    1618
    1719        /*Boot module: */
     
    1921
    2022        /*checks on arguments on the matlab side: */
    21         CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&KrigingUsage);
     23        if (nrhs<NRHS || nlhs>NLHS){
     24                KrigingUsage(); _error_("Kriging usage error");
     25        }
    2226
    2327        /*Fetch inputs: */
    2428        FetchData(&x,&n_obs,X);
    25         FetchData(&y,&n,Y);                       if(n_obs!=n) _error_("x and y should have the same size");
    26         FetchData(&observations,&n,OBSERVATIONS); if(n_obs!=n) _error_("x and observations should have the same size");
    27         FetchData(&x_interp,&n_interp,XINTERP);
    28         FetchData(&y_interp,&n,YINTERP);          if(n_interp!=n) _error_("x_interp and y_interp should have the same size");
     29        FetchData(&y,&N,Y);                       if(n_obs!=N) _error_("x and y should have the same size");
     30        FetchData(&observations,&N,OBSERVATIONS); if(n_obs!=N) _error_("x and observations should have the same size");
     31        FetchData(&x_interp,&M_interp,&N_interp,XINTERP);
     32        FetchData(&y_interp,&M,&N,YINTERP);       if(N!=N_interp || M!=M_interp) _error_("x_interp and y_interp should have the same size");
     33        FetchData(&options,NRHS,nrhs,prhs);
    2934
    3035        /*Call x layer*/
    31         Krigingx(&predictions,x,y,observations,n_obs,x_interp,y_interp,n_interp);
     36        Krigingx(&predictions,&error,x,y,observations,n_obs,x_interp,y_interp,M_interp*N_interp,options);
    3237
    3338        /*Generate output Matlab Structures*/
    34         WriteData(PREDICTIONS,predictions,n_interp);
     39        if(nlhs>=1) WriteData(PREDICTIONS,predictions,M_interp,N_interp);
     40        if(nlhs==2) WriteData(ERROR,error,M_interp,N_interp);
    3541
    3642        /*Free ressources: */
     
    4147        xfree((void**)&y_interp);
    4248        xfree((void**)&predictions);
     49        xfree((void**)&error);
    4350
    4451        /*end module: */
  • issm/branches/trunk-jpl-damage/src/modules/Kriging/Kriging.h

    r12164 r12258  
    2626/* serial output macros: */
    2727#define PREDICTIONS (mxArray**)&plhs[0]
     28#define ERROR       (mxArray**)&plhs[1]
    2829
    2930/* serial arg counts: */
    3031#undef NLHS
    31 #define NLHS  1
     32#define NLHS  2
    3233#undef NRHS
    3334#define NRHS  5
  • issm/branches/trunk-jpl-damage/src/modules/matlab

    • Property svn:ignore
      •  

        old new  
         1*.obj
        12Makefile
         3*.lib
         4*.mexw64
         5*.manifest
         6*.exp
         7.deps
         8Makefile.in
Note: See TracChangeset for help on using the changeset viewer.