Changeset 12161


Ignore:
Timestamp:
05/01/12 07:54:24 (13 years ago)
Author:
Mathieu Morlighem
Message:

Changing ISSM_TIER to ISSM_DIR

Location:
issm/trunk-jpl/etc
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/etc/environment.csh

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

  • issm/trunk-jpl/etc/environment.sh

    r12097 r12161  
    1 #ISSM_TIER and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
     1#ISSM_DIR and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
    22
    33#Windows compilers:
    44if [[ "$ISSM_ARCH" == "cygwin-intel" ]]; then
    5         source $ISSM_TIER/externalpackages/windows/windows_environment.sh
     5        source $ISSM_DIR/externalpackages/windows/windows_environment.sh
    66fi
    77
    8 source $ISSM_TIER/etc/environment_variables.sh
     8source $ISSM_DIR/etc/environment_variables.sh
    99
    1010#Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them after exporting the variables
    … …  
    1616
    1717#CRON utilities
    18 PATH="$PATH:$ISSM_TIER/cron"
     18PATH="$PATH:$ISSM_DIR/cron"
    1919
    2020#scripts
    21 PATH="$PATH:$ISSM_TIER/scripts"
     21PATH="$PATH:$ISSM_DIR/scripts"
    2222
    2323##MATLAB
    … …  
    137137#export INTEL_DIR
    138138#PATH="$PATH:$INTEL_DIR"
    139 #source $ISSM_TIER/externalpackages/intel/intel.sh
     139#source $ISSM_DIR/externalpackages/intel/intel.sh
    140140
    141141#SDK
    … …  
    259259#PYTHON
    260260export PATH="$PYTHON_DIR/bin:$PATH"
    261 export PYTHONPATH="$PYTHONPATH:$ISSM_TIER/src/modules/python"
    262 export LD_LIBRARY_PATH=$ISSM_TIER/src/modules/python:$LD_LIBRARY_PATH
     261export PYTHONPATH="$PYTHONPATH:$ISSM_DIR/src/modules/python"
     262export LD_LIBRARY_PATH=$ISSM_DIR/src/modules/python:$LD_LIBRARY_PATH
    263263
    264264#MODELE

  • issm/trunk-jpl/etc/environment_variables.csh

    r10874 r12161  
    11#
    22#
    3 #This routine can only be run if the ISSM_TIER variable has been correctly set!
     3#This routine can only be run if the ISSM_DIR variable has been correctly set!
    44#
    55#
    66
    77#MATLAB
    8 set MATLAB_DIR={$ISSM_TIER}/externalpackages/matlab/install
     8set MATLAB_DIR={$ISSM_DIR}/externalpackages/matlab/install
    99
    1010#MPI
    11 set MPI_DIR={$ISSM_TIER}/externalpackages/mpich2/install
     11set MPI_DIR={$ISSM_DIR}/externalpackages/mpich2/install
    1212
    1313#PETSC
    14 set PETSC_DIR={$ISSM_TIER}/externalpackages/petsc/install
     14set PETSC_DIR={$ISSM_DIR}/externalpackages/petsc/install
    1515
    1616#SLEPC
    17 set SLEPC_DIR={$ISSM_TIER}/externalpackages/slepc/install
     17set SLEPC_DIR={$ISSM_DIR}/externalpackages/slepc/install
    1818
    1919#Dakota
    20 set DAKOTA_DIR={$ISSM_TIER}/externalpackages/dakota/install
     20set DAKOTA_DIR={$ISSM_DIR}/externalpackages/dakota/install
    2121
    2222#Qhull
    23 set QHULL_DIR={$ISSM_TIER}/externalpackages/qhull/install
     23set QHULL_DIR={$ISSM_DIR}/externalpackages/qhull/install
    2424
    2525#Doxygen
    26 set DOXYGEN_DIR={$ISSM_TIER}/externalpackages/doxygen/install
     26set DOXYGEN_DIR={$ISSM_DIR}/externalpackages/doxygen/install
    2727
    2828#MTOC
    29 set MTOC_DIR={$ISSM_TIER}/externalpackages/mtoc/install
     29set MTOC_DIR={$ISSM_DIR}/externalpackages/mtoc/install
    3030
    3131#Triangle
    32 set TRIANGLE_DIR={$ISSM_TIER}/externalpackages/triangle/install
     32set TRIANGLE_DIR={$ISSM_DIR}/externalpackages/triangle/install
    3333
    3434#METIS
    35 set METIS_DIR={$ISSM_TIER}/externalpackages/metis/install
     35set METIS_DIR={$ISSM_DIR}/externalpackages/metis/install
    3636
    3737#BLAS
    38 set BLAS_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/fblaslapack
     38set BLAS_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/fblaslapack
    3939
    4040#LAPACK
    41 set LAPACK_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/fblaslapack/$ISSM_ARCH
     41set LAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/fblaslapack/$ISSM_ARCH
    4242
    4343#SCALAPACK
    44 set SCALAPACK_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/SCALAPACK/$ISSM_ARCH
     44set SCALAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/SCALAPACK/$ISSM_ARCH
    4545
    4646#PLAPACK
    47 set PLAPACK_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/PLAPACKR32
     47set PLAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/PLAPACKR32
    4848
    4949#BLACS
    50 set BLACS_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/blacs-dev/$ISSM_ARCH
     50set BLACS_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/blacs-dev/$ISSM_ARCH
    5151
    5252#sowing
    53 set SOWING_DIR={$ISSM_TIER}/externalpackages/sowing/install
     53set SOWING_DIR={$ISSM_DIR}/externalpackages/sowing/install
    5454
    5555#YAMS
    56 set YAMS_DIR={$ISSM_TIER}/externalpackages/yams/install
     56set YAMS_DIR={$ISSM_DIR}/externalpackages/yams/install
    5757
    5858#TEX2IM
    59 set TEX2IM_DIR={$ISSM_TIER}/externalpackages/tex2im/install
     59set TEX2IM_DIR={$ISSM_DIR}/externalpackages/tex2im/install
    6060
    6161#Chaco
    62 set CHACO_DIR={$ISSM_TIER}/externalpackages/chaco/install
     62set CHACO_DIR={$ISSM_DIR}/externalpackages/chaco/install
    6363
    6464#MeshPart
    65 set MESHPART_DIR={$ISSM_TIER}/externalpackages/meshpart/install
     65set MESHPART_DIR={$ISSM_DIR}/externalpackages/meshpart/install
    6666
    6767#SCOTCH
    68 set SCOTCH_DIR={$ISSM_TIER}/externalpackages/scotch/install
     68set SCOTCH_DIR={$ISSM_DIR}/externalpackages/scotch/install
    6969
    7070#Development packages
    7171#automake
    72 set AUTOMAKE_DIR={$ISSM_TIER}/externalpackages/automake/install
     72set AUTOMAKE_DIR={$ISSM_DIR}/externalpackages/automake/install
    7373
    7474#autoconf
    75 set AUTOCONF_DIR={$ISSM_TIER}/externalpackages/autoconf/install
     75set AUTOCONF_DIR={$ISSM_DIR}/externalpackages/autoconf/install
    7676
    7777#borland
    … …  
    7979
    8080#ssh
    81 set SSH_DIR={$ISSM_TIER}/externalpackages/ssh
     81set SSH_DIR={$ISSM_DIR}/externalpackages/ssh
    8282
    8383#valgrind
    84 set VALGRIND_DIR={$ISSM_TIER}/externalpackages/valgrind/install/bin
     84set VALGRIND_DIR={$ISSM_DIR}/externalpackages/valgrind/install/bin

  • issm/trunk-jpl/etc/environment_variables.sh

    r12097 r12161  
    11#
    22#
    3 #This routine can only be run if the ISSM_TIER variable has been correctly set!
     3#This routine can only be run if the ISSM_DIR variable has been correctly set!
    44#
    55#
    66
    77#MATLAB
    8 MATLAB_DIR="$ISSM_TIER/externalpackages/matlab/install"
     8MATLAB_DIR="$ISSM_DIR/externalpackages/matlab/install"
    99
    1010#MPI
    11 MPI_DIR="$ISSM_TIER/externalpackages/mpich2/install"
     11MPI_DIR="$ISSM_DIR/externalpackages/mpich2/install"
    1212
    1313#PETSC
    14 PETSC_DIR="$ISSM_TIER/externalpackages/petsc/install"
     14PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install"
    1515
    1616#SLEPC
    17 SLEPC_DIR="$ISSM_TIER/externalpackages/slepc/install"
     17SLEPC_DIR="$ISSM_DIR/externalpackages/slepc/install"
    1818
    1919#Dakota
    20 DAKOTA_DIR="$ISSM_TIER/externalpackages/dakota/install"
     20DAKOTA_DIR="$ISSM_DIR/externalpackages/dakota/install"
    2121
    2222#Qhull
    23 QHULL_DIR="$ISSM_TIER/externalpackages/qhull/install"
     23QHULL_DIR="$ISSM_DIR/externalpackages/qhull/install"
    2424
    2525#Doxygen
    26 DOXYGEN_DIR="$ISSM_TIER/externalpackages/doxygen/install"
     26DOXYGEN_DIR="$ISSM_DIR/externalpackages/doxygen/install"
    2727
    2828#MTOC
    29 MTOC_DIR="$ISSM_TIER/externalpackages/mtoc/install"
     29MTOC_DIR="$ISSM_DIR/externalpackages/mtoc/install"
    3030
    3131#Triangle
    32 TRIANGLE_DIR="$ISSM_TIER/externalpackages/triangle/install"
     32TRIANGLE_DIR="$ISSM_DIR/externalpackages/triangle/install"
    3333
    3434#METIS
    35 METIS_DIR="$ISSM_TIER/externalpackages/metis/install"
     35METIS_DIR="$ISSM_DIR/externalpackages/metis/install"
    3636
    3737#BLAS
    38 BLAS_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/fblaslapack"
     38BLAS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack"
    3939
    4040#LAPACK
    41 LAPACK_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH"
     41LAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH"
    4242
    4343#SCALAPACK
    44 SCALAPACK_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH"
     44SCALAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH"
    4545
    4646#PLAPACK
    47 PLAPACK_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32"
     47PLAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32"
    4848
    4949#BLACS
    50 BLACS_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
     50BLACS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
    5151
    5252#sowing
    53 SOWING_DIR="$ISSM_TIER/externalpackages/sowing/install"
     53SOWING_DIR="$ISSM_DIR/externalpackages/sowing/install"
    5454
    5555#BLACS
    56 BLACS_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
     56BLACS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
    5757
    5858#YAMS
    59 YAMS_DIR="$ISSM_TIER/externalpackages/yams/install"
     59YAMS_DIR="$ISSM_DIR/externalpackages/yams/install"
    6060
    6161#BAMG
    62 BAMG_DIR="$ISSM_TIER/externalpackages/bamg/install"
     62BAMG_DIR="$ISSM_DIR/externalpackages/bamg/install"
    6363
    6464#Chaco
    65 CHACO_DIR="$ISSM_TIER/externalpackages/chaco/install"
     65CHACO_DIR="$ISSM_DIR/externalpackages/chaco/install"
    6666
    6767#MeshPart
    68 MESHPART_DIR="$ISSM_TIER/externalpackages/meshpart/install"
     68MESHPART_DIR="$ISSM_DIR/externalpackages/meshpart/install"
    6969
    7070#SCOTCH
    71 SCOTCH_DIR="$ISSM_TIER/externalpackages/scotch/install"
     71SCOTCH_DIR="$ISSM_DIR/externalpackages/scotch/install"
    7272
    7373#Development packages
    7474#automake
    75 AUTOMAKE_DIR="$ISSM_TIER/externalpackages/automake/install"
     75AUTOMAKE_DIR="$ISSM_DIR/externalpackages/automake/install"
    7676
    7777#libtool
    78 LIBTOOL_DIR="$ISSM_TIER/externalpackages/libtool/install"
     78LIBTOOL_DIR="$ISSM_DIR/externalpackages/libtool/install"
    7979
    8080#autoconf
    81 AUTOCONF_DIR="$ISSM_TIER/externalpackages/autoconf/install"
     81AUTOCONF_DIR="$ISSM_DIR/externalpackages/autoconf/install"
    8282
    8383#borland
    … …  
    8888
    8989#TEX2IM                 
    90 TEX2IM_DIR="$ISSM_TIER/externalpackages/tex2im/install"
     90TEX2IM_DIR="$ISSM_DIR/externalpackages/tex2im/install"
    9191
    9292#sdk
    … …  
    9494
    9595#ssh
    96 SSH_DIR="$ISSM_TIER/externalpackages/ssh"
     96SSH_DIR="$ISSM_DIR/externalpackages/ssh"
    9797
    9898#valgrind
    99 VALGRIND_DIR="$ISSM_TIER/externalpackages/valgrind/install/bin"
     99VALGRIND_DIR="$ISSM_DIR/externalpackages/valgrind/install/bin"
    100100
    101101#graphviz
    102 GRAPHVIZ_DIR="$ISSM_TIER/externalpackages/graphviz/install/bin"
     102GRAPHVIZ_DIR="$ISSM_DIR/externalpackages/graphviz/install/bin"
    103103
    104104#cppcheck
    105 CPPCHECK_DIR="$ISSM_TIER/externalpackages/cppcheck/install"
     105CPPCHECK_DIR="$ISSM_DIR/externalpackages/cppcheck/install"
    106106
    107107#gdal
    108 GDAL_DIR="$ISSM_TIER/externalpackages/gdal/install"
     108GDAL_DIR="$ISSM_DIR/externalpackages/gdal/install"
    109109
    110110#mercurial
    111 MERCURIAL_DIR="$ISSM_TIER/externalpackages/mercurial/install"
     111MERCURIAL_DIR="$ISSM_DIR/externalpackages/mercurial/install"
    112112
    113113#boost
    114 BOOST_DIR="$ISSM_TIER/externalpackages/boost/install"
    115 BOOSTROOT="$ISSM_TIER/externalpackages/boost/install"
     114BOOST_DIR="$ISSM_DIR/externalpackages/boost/install"
     115BOOSTROOT="$ISSM_DIR/externalpackages/boost/install"
    116116
    117117#OpenAnalysis
    118 OPENANALYSISROOT="$ISSM_TIER/externalpackages/openanalysis/install"
     118OPENANALYSISROOT="$ISSM_DIR/externalpackages/openanalysis/install"
    119119
    120120#xerces
    121 XERCESROOT="$ISSM_TIER/externalpackages/xerces/install"
    122 XERCESCROOT="$ISSM_TIER/externalpackages/xerces/src"
     121XERCESROOT="$ISSM_DIR/externalpackages/xerces/install"
     122XERCESCROOT="$ISSM_DIR/externalpackages/xerces/src"
    123123
    124124#xaifBooster
    125 XAIFBOOSTERROOT="$ISSM_TIER/externalpackages/xaifbooster/"
    126 XAIF_DIR="$ISSM_TIER/externalpackages/xaifbooster/xaifBooster"
    127 XAIFBOOSTER_HOME="$ISSM_TIER/externalpackages/xaifbooster/xaifBooster"
     125XAIFBOOSTERROOT="$ISSM_DIR/externalpackages/xaifbooster/"
     126XAIF_DIR="$ISSM_DIR/externalpackages/xaifbooster/xaifBooster"
     127XAIFBOOSTER_HOME="$ISSM_DIR/externalpackages/xaifbooster/xaifBooster"
    128128PLATFORM=x86-Linux
    129129
    130130#angel
    131 ANGELROOT="$ISSM_TIER/externalpackages/angel/angel"
     131ANGELROOT="$ISSM_DIR/externalpackages/angel/angel"
    132132
    133133#java
    … …  
    135135
    136136#bbftp
    137 BBFTP_DIR="$ISSM_TIER/externalpackages/bbftp/install"
     137BBFTP_DIR="$ISSM_DIR/externalpackages/bbftp/install"
    138138
    139139#adic2
    140 ADIC_DIR="$ISSM_TIER/externalpackages/adic/install"
     140ADIC_DIR="$ISSM_DIR/externalpackages/adic/install"
    141141
    142142#colpack
    143 COLPACK_DIR="$ISSM_TIER/externalpackages/colpack/install"
     143COLPACK_DIR="$ISSM_DIR/externalpackages/colpack/install"
    144144
    145145#eclipse
    146 ECLIPSE_DIR="$ISSM_TIER/externalpackages/eclipse/install"
     146ECLIPSE_DIR="$ISSM_DIR/externalpackages/eclipse/install"
    147147
    148148#flaim
    149 FLAIM_DIR="$ISSM_TIER/externalpackages/flaim/install"
     149FLAIM_DIR="$ISSM_DIR/externalpackages/flaim/install"
    150150
    151151#appscan
    152 APPSCAN_DIR="$ISSM_TIER/externalpackages/appscan"
     152APPSCAN_DIR="$ISSM_DIR/externalpackages/appscan"
    153153
    154154#cppcheck
    155 CPPCHECK_DIR="$ISSM_TIER/externalpackages/cppcheck/install"
     155CPPCHECK_DIR="$ISSM_DIR/externalpackages/cppcheck/install"
    156156
    157157#rats
    158 RATS_DIR="$ISSM_TIER/externalpackages/rats/install"
     158RATS_DIR="$ISSM_DIR/externalpackages/rats/install"
    159159
    160160#dyson
    161 DYSON_DIR="$ISSM_TIER/externalpackages/dyson/"
     161DYSON_DIR="$ISSM_DIR/externalpackages/dyson/"
    162162
    163163#cmake
    164 CMAKE_DIR="$ISSM_TIER/externalpackages/cmake/install"
     164CMAKE_DIR="$ISSM_DIR/externalpackages/cmake/install"
    165165
    166166#shapelib
    167 SHAPELIB_DIR="$ISSM_TIER/externalpackages/shapelib/install"
     167SHAPELIB_DIR="$ISSM_DIR/externalpackages/shapelib/install"
    168168
    169169#cccl
    170 CCCL_DIR="$ISSM_TIER/externalpackages/cccl/install"
     170CCCL_DIR="$ISSM_DIR/externalpackages/cccl/install"
    171171
    172172#packagemaker
    173 PACKAGEMAKER_DIR="$ISSM_TIER/externalpackages/packagemaker/install"
     173PACKAGEMAKER_DIR="$ISSM_DIR/externalpackages/packagemaker/install"
    174174
    175175#android-dev-dir
    176 ANDROID_DIR="$ISSM_TIER/externalpackages/android"
     176ANDROID_DIR="$ISSM_DIR/externalpackages/android"
    177177
    178178#android-ndk
    … …  
    186186
    187187#gsl
    188 GSL_DIR="$ISSM_TIER/externalpackages/gsl/install"
     188GSL_DIR="$ISSM_DIR/externalpackages/gsl/install"
    189189
    190190#gnu make
    191 GMAKE_DIR="$ISSM_TIER/externalpackages/gmake/install"
     191GMAKE_DIR="$ISSM_DIR/externalpackages/gmake/install"
    192192
    193193#PYTHON
    194 PYTHON_DIR="$ISSM_TIER/externalpackages/python/install"
     194PYTHON_DIR="$ISSM_DIR/externalpackages/python/install"
    195195
    196196#MODELE
    197 MODELE_DIR="$ISSM_TIER/externalpackages/modelE"
     197MODELE_DIR="$ISSM_DIR/externalpackages/modelE"
Note: See TracChangeset for help on using the changeset viewer.