Changeset 21728


Ignore:
Timestamp:
05/19/17 14:35:04 (8 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk and trunk-jpl

Location:
issm/trunk-jpl
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl

  • issm/trunk-jpl/externalpackages/mpich/install-3.0-linux64-static.sh

    r20606 r21728  
    1616rm -rf mpich-3.0.4
    1717
     18export CXXFLAGS='-fPIC'
     19export CFLAGS='-fPIC'
     20export FFLAGS='-fPIC'
     21
    1822#Configure mpich
    1923cd src

  • issm/trunk-jpl/jenkins/linux64_ross_static

    r21694 r21728  
    99#ISSM CONFIGURATION
    1010ISSM_CONFIG='--prefix=$ISSM_DIR \
    11         --disable-shared \
     11        --disable-static \
    1212        --enable-standalone-executables \
    1313        --enable-standalone-libraries \
     14        --enable-standalone-modules \
    1415        --with-matlab-dir=$MATLAB_PATH \
    1516        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \

  • issm/trunk-jpl/m4/issm_options.m4

    r21615 r21728  
    10671067                                else
    10681068                                        PETSCLIB="-L$PETSC_ROOT/lib -lpetsc -ldl"
    1069                                         if test $PETSC_MAJOR -gt 3 || test $PETSC_MINOR -ge 3; then PETSCLIB+=" -lmetis"; fi
     1069                                        if test $PETSC_MAJOR -gt 3 || test $PETSC_MINOR -ge 3; then PETSCLIB+=" -lparmetis -lmetis"; fi
    10701070                                fi
    10711071                                if test "x$host_os_version" = "x3.0.101-0.31.1_1.0502.8394-cray_gem_s" ; then

  • issm/trunk-jpl/packagers/macosx-dakota/package.sh

    r21595 r21728  
    1111cd $ISSM_DIR/test/NightlyRun
    1212rm matlab.log
    13 $MATLAB_DIR/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
     13/Applications/MATLAB_R2015b.app/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
    1414
    1515if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then

  • issm/trunk-jpl/packagers/macosx/package.sh

    r21595 r21728  
    3131rm -rf trunk
    3232mkdir trunk
    33 cp -rf bin lib test examples trunk/
     33#Need script to download data
     34cp -rf bin lib test examples scripts trunk/
    3435tar -czf $tarball_name trunk
    3536ls -lah $tarball_name

  • issm/trunk-jpl/src

  • issm/trunk-jpl/src/wrappers/matlab/Makefile.am

    r21496 r21728  
    115115# Module sources and dependencies {{{
    116116if !WINDOWS
    117 libISSMMatlab_la_LIBADD = ./../../c/libISSMCore.la ./../../c/libISSMModules.la $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(MKLLIB) $(GSLLIB) $(PROJ4LIB) $(MATHLIB) $(MEXLIB)
     117libISSMMatlab_la_LIBADD = ./../../c/libISSMCore.la ./../../c/libISSMModules.la $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(MKLLIB) $(GSLLIB) $(PROJ4LIB) $(MATHLIB) $(MEXLIB)
    118118endif
    119119
    … …  
    124124
    125125if !WINDOWS
    126 libISSMApi_la_LIBADD = $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB) $(MATHLIB) $(MEXLIB)
     126libISSMApi_la_LIBADD = $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB) $(MATHLIB) $(MEXLIB)
    127127endif
    128128
    … …  
    133133BamgMesher_matlab_la_SOURCES = ../BamgMesher/BamgMesher.cpp
    134134BamgMesher_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    135 BamgMesher_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     135BamgMesher_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    136136
    137137BamgConvertMesh_matlab_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp
    138138BamgConvertMesh_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    139 BamgConvertMesh_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     139BamgConvertMesh_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    140140
    141141BamgTriangulate_matlab_la_SOURCES = ../BamgTriangulate/BamgTriangulate.cpp
    142142BamgTriangulate_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    143 BamgTriangulate_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     143BamgTriangulate_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    144144
    145145if CHACO
    … …  
    151151ContourToMesh_matlab_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp
    152152ContourToMesh_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    153 ContourToMesh_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
     153ContourToMesh_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(MULTITHREADINGLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    154154
    155155ExpToLevelSet_matlab_la_SOURCES = ../ExpToLevelSet/ExpToLevelSet.cpp
    156156ExpToLevelSet_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    157 ExpToLevelSet_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
     157ExpToLevelSet_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(MULTITHREADINGLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    158158
    159159ContourToNodes_matlab_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp
    160160ContourToNodes_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    161 ContourToNodes_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     161ContourToNodes_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    162162
    163163DistanceToMaskBoundary_matlab_la_SOURCES = ../DistanceToMaskBoundary/DistanceToMaskBoundary.cpp
    164164DistanceToMaskBoundary_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    165 DistanceToMaskBoundary_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     165DistanceToMaskBoundary_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    166166
    167167ElementConnectivity_matlab_la_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp
    168168ElementConnectivity_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    169 ElementConnectivity_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     169ElementConnectivity_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    170170
    171171InterpFromGridToMesh_matlab_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp
    172172InterpFromGridToMesh_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    173 InterpFromGridToMesh_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
     173InterpFromGridToMesh_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(MULTITHREADINGLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    174174
    175175InterpFromMeshToMesh2d_matlab_la_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp
    176176InterpFromMeshToMesh2d_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    177 InterpFromMeshToMesh2d_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
     177InterpFromMeshToMesh2d_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(MULTITHREADINGLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    178178
    179179InterpFromMeshToMesh3d_matlab_la_SOURCES = ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp
    180180InterpFromMeshToMesh3d_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    181 InterpFromMeshToMesh3d_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     181InterpFromMeshToMesh3d_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    182182
    183183InterpFromMeshToGrid_matlab_la_SOURCES = ../InterpFromMeshToGrid/InterpFromMeshToGrid.cpp
    184184InterpFromMeshToGrid_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    185 InterpFromMeshToGrid_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     185InterpFromMeshToGrid_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    186186
    187187InterpFromMesh2d_matlab_la_SOURCES = ../InterpFromMesh2d/InterpFromMesh2d.cpp
    188188InterpFromMesh2d_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    189 InterpFromMesh2d_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
     189InterpFromMesh2d_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(MULTITHREADINGLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    190190
    191191IssmConfig_matlab_la_SOURCES = ../IssmConfig/IssmConfig.cpp
    192192IssmConfig_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    193 IssmConfig_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB)
     193IssmConfig_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB)
    194194
    195195ExpSimplify_matlab_la_SOURCES = ../ExpSimplify/ExpSimplify.cpp
    196196ExpSimplify_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    197 ExpSimplify_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     197ExpSimplify_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB) $(NEOPZLIB)
    198198
    199199Kriging_matlab_la_SOURCES = ../Kriging/Kriging.cpp
    200200Kriging_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    201 Kriging_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
     201Kriging_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
    202202
    203203MeshPartition_matlab_la_SOURCES = ../MeshPartition/MeshPartition.cpp
    204204MeshPartition_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    205 MeshPartition_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(METISLIB) $(GSLLIB) $(PROJ4LIB)
     205MeshPartition_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(METISLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    206206
    207207M1qn3_matlab_la_SOURCES = ../M1qn3/M1qn3.cpp
    208208M1qn3_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    209 M1qn3_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(METISLIB) $(M1QN3LIB) $(GSLLIB) $(PROJ4LIB)
     209M1qn3_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(METISLIB) $(M1QN3LIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    210210
    211211MeshProfileIntersection_matlab_la_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp
    212212MeshProfileIntersection_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    213 MeshProfileIntersection_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     213MeshProfileIntersection_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    214214
    215215NodeConnectivity_matlab_la_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp
    216216NodeConnectivity_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    217 NodeConnectivity_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     217NodeConnectivity_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    218218
    219219PointCloudFindNeighbors_matlab_la_SOURCES = ../PointCloudFindNeighbors/PointCloudFindNeighbors.cpp
    220220PointCloudFindNeighbors_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    221 PointCloudFindNeighbors_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
     221PointCloudFindNeighbors_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(MULTITHREADINGLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    222222
    223223PropagateFlagsFromConnectivity_matlab_la_SOURCES = ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp
    224224PropagateFlagsFromConnectivity_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    225 PropagateFlagsFromConnectivity_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     225PropagateFlagsFromConnectivity_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    226226
    227227Scotch_matlab_la_SOURCES = ../Scotch/Scotch.cpp
    228228Scotch_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    229 Scotch_matlab_la_LIBADD = ${deps} $(SCOTCHLIB) $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(BLASLAPACKLIB)
     229Scotch_matlab_la_LIBADD = ${deps} $(SCOTCHLIB) $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(BLASLAPACKLIB)
    230230
    231231ShpRead_matlab_la_SOURCES = ../ShpRead/ShpRead.cpp
    232232ShpRead_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    233 ShpRead_matlab_la_LIBADD = ${deps} $(SHAPELIBLIB) $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     233ShpRead_matlab_la_LIBADD = ${deps} $(SHAPELIBLIB) $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    234234
    235235TriMesh_matlab_la_SOURCES = ../TriMesh/TriMesh.cpp
    236236TriMesh_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    237 TriMesh_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(TRIANGLELIB) $(GSLLIB) $(PROJ4LIB)
     237TriMesh_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(TRIANGLELIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    238238
    239239TriMeshProcessRifts_matlab_la_SOURCES = ../TriMeshProcessRifts/TriMeshProcessRifts.cpp
    240240TriMeshProcessRifts_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    241 TriMeshProcessRifts_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    242 #}}}
     241TriMeshProcessRifts_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     242#}}}

  • issm/trunk-jpl/test

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.