Changeset 22757


Ignore:
Timestamp:
05/10/18 10:20:20 (7 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk and trunk-jpl

Location:
issm/trunk-jpl
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl

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

    r21728 r22757  
    11#!/bin/bash
    22set -eu
     3
     4export CXXFLAGS="-fPIC"
     5export CFLAGS="-fPIC"
     6export FFLAGS="-fPIC"
    37
    48#Some cleanup
    … …  
    1620rm -rf mpich-3.0.4
    1721
    18 export CXXFLAGS='-fPIC'
    19 export CFLAGS='-fPIC'
    20 export FFLAGS='-fPIC'
    21 
    2222#Configure mpich
    2323cd src
    2424./configure \
    25         --prefix="$ISSM_DIR/externalpackages/mpich/install" \
    26         --disable-shared \
     25        --prefix="$ISSM_DIR/externalpackages/mpich/install"
    2726
    2827#Compile mpich (this new version supports parallel make)

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

    r21692 r22757  
    1919cd src
    2020./configure \
    21         --prefix="$ISSM_DIR/externalpackages/mpich/install" \
    22         --disable-shared \
     21        --prefix="$ISSM_DIR/externalpackages/mpich/install"
    2322
    2423#Compile mpich (this new version supports parallel make)

  • issm/trunk-jpl/externalpackages/petsc/install-3.6-linux64-static.sh

    r20606 r22757  
    3030        --download-fblaslapack=1 \
    3131        --download-scalapack=1 \
    32         --with-pic=1
    33 
     32        --CFLAGS="-fPIC" \
     33        --CC_LINKER_FLAGS="-fPIC" \
     34        --CXXFLAGS="-fPIC" \
     35        --FFLAGS="-fPIC" \
     36        --FC_LINKER_FLAGS="-fPIC"
     37       
    3438#Compile and intall
    3539make

  • issm/trunk-jpl/externalpackages/petsc/install-3.7-linux64-static.sh

    r21692 r22757  
    3030        --download-fblaslapack=1 \
    3131        --download-scalapack=1 \
    32         --with-pic=1
     32        --COPTFLAGS="-fPIC" \
     33        --CXXOPTFLAGS="-fPIC" \
     34        --FOPTFLAGS="-fPIC"
    3335
    3436#Compile and intall

  • issm/trunk-jpl/externalpackages/petsc/install-3.7-macosx64-static.sh

    r21692 r22757  
    2929        --download-mumps=1 \
    3030        --download-fblaslapack=1 \
    31         --download-scalapack=1
     31        --download-scalapack=1 \
     32        --COPTFLAGS="-fPIC" \
     33        --CXXOPTFLAGS="-fPIC" \
     34        --FOPTFLAGS="-fPIC"
    3235
    3336#Compile and intall

  • issm/trunk-jpl/jenkins/jenkins.sh

    r22686 r22757  
    296296        cd $ISSM_DIR/test/NightlyRun
    297297        if [ "$OS" = "win" ]; then
    298                 $MATLAB_PATH/bin/matlab -nojvm -nosplash -r "addpath $ISSM_DIR_WIN/src/m/dev; devpath; addpath $ISSM_DIR_WIN/nightlylog/; matlab_run$i" -logfile $ISSM_DIR_WIN/nightlylog/matlab_log$i.log &
    299         else
    300                 $MATLAB_PATH/bin/matlab -nojvm -nosplash -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; matlab_run$i" -logfile $ISSM_DIR/nightlylog/matlab_log$i.log &
     298                $MATLAB_PATH/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "addpath $ISSM_DIR_WIN/src/m/dev; devpath; addpath $ISSM_DIR_WIN/nightlylog/; matlab_run$i" -logfile $ISSM_DIR_WIN/nightlylog/matlab_log$i.log &
     299        else
     300                $MATLAB_PATH/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; matlab_run$i" -logfile $ISSM_DIR/nightlylog/matlab_log$i.log &
    301301        fi
    302302done
    … …  
    470470                                echo 'end' >> $FILE
    471471
    472                                 $MATLAB_PATH/bin/matlab -nosplash -nodisplay -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; runme" -logfile $ISSM_DIR/nightlylog/$LOG_FILE
     472                                $MATLAB_PATH/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; runme" -logfile $ISSM_DIR/nightlylog/$LOG_FILE
    473473                                echo "starting: $(basename $dir)" >> $ISSM_DIR/nightlylog/matlab_log_examples.log
    474474                                cat $ISSM_DIR/nightlylog/$LOG_FILE >> $ISSM_DIR/nightlylog/matlab_log_examples.log

  • issm/trunk-jpl/jenkins/macosx_pine-island_dakota_static

    r21871 r22757  
    1414        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
    1515        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
    16         --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi " \
     16        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich -lmpl -lpmpich" \
    1717        --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
    18         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
    19         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
     18        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
     19        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
    2020        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
    2121        --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
    … …  
    2323        --with-boost-dir=$ISSM_DIR/externalpackages/boost/install \
    2424        --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
    25         --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
     25        --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
    2626        --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a /usr/local/gfortran/lib/libquadmath.a /usr/local/gfortran/lib/gcc/x86_64-apple-darwin14/5.2.0/libgcc.a" \
    2727        --with-numthreads=4'
    … …  
    3939                                                cmake        install.sh
    4040                                                chaco        install-macosx64.sh
    41                                                 mpich        install-3.2-macosx64-static.sh
     41                                                mpich        install-3.0-macosx64-static.sh
    4242                                                m1qn3        install.sh
    43                                                 petsc        install-3.7-macosx64-static.sh
     43                                                petsc        install-3.6-macosx64-static.sh
    4444                                                triangle     install-macosx64.sh
    4545                                                boost        install-1.55-macosx-el_capitan.sh

  • issm/trunk-jpl/jenkins/macosx_pine-island_static

    r21694 r22757  
    1515        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
    1616        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
    17         --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
    18         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
    19         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
    20         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
     17        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich -lmpl -lpmpich" \
     18        --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
     19        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
     20        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
    2121        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
    2222        --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
    … …  
    3636EXTERNALPACKAGES="autotools    install.sh
    3737                                                cmake        install.sh
    38                                                 mpich        install-3.2-macosx64-static.sh
     38                                                mpich        install-3.0-macosx64-static.sh
    3939                                                m1qn3        install.sh
    40                                                 petsc        install-3.7-macosx64-static.sh
     40                                                petsc        install-3.6-macosx64-static.sh
    4141                                                triangle     install-macosx64.sh
    4242                                                shell2junit  install.sh"

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

    r21728 r22757  
    1111cd $ISSM_DIR/test/NightlyRun
    1212rm 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
     13/Applications/MATLAB_R2015b.app/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -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

    r21728 r22757  
    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 -nodisplay -nojvm -nosplash -nodesktop -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/ubuntu/package.sh

    r21595 r22757  
    55cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
    66echo "move mpiexec to bin"
     7cp ../externalpackages/mpich/install/bin/mpiexec .
     8cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
    79
    810#Check that test101 runs
    911cd $ISSM_DIR/test/NightlyRun
    1012rm matlab.log
    11 $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/usr/local/MATLAB/R2015a/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
    1214
    1315if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then

  • issm/trunk-jpl/src

Note: See TracChangeset for help on using the changeset viewer.