Index: /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh (revision 24638) +++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh (revision 24639) @@ -6,10 +6,9 @@ # DAK_ROOT=${ISSM_DIR}/externalpackages/dakota -MPI_INSTALL=${ISSM_DIR}/externalpackages/petsc/install VER="6.2" ## Environment # -export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2cblas -L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it +export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lfblas -L${ISSM_DIR}/lib -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it export BOOST_ROOT=${ISSM_DIR}/externalpackages/boost/install export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost (absolutely necessary for this version) @@ -18,6 +17,5 @@ export DAK_INSTALL=${DAK_ROOT}/install export DAK_SRC=${DAK_ROOT}/src -export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2clapack -L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it -export MPIHOME=${MPI_INSTALL} # This appears to only be used by certain external packages and examples +export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lflapack -L${ISSM_DIR}/lib -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it # Cleanup @@ -49,7 +47,7 @@ -DBUILD_SHARED_LIBS=OFF \ -DBUILD_STATIC_LIBS=ON \ - -DCMAKE_C_COMPILER=${MPI_INSTALL}/bin/mpicc \ - -DCMAKE_CXX_COMPILER=${MPI_INSTALL}/bin/mpicxx \ - -DCMAKE_Fortran_COMPILER=${MPI_INSTALL}/bin/mpif77 \ + -DCMAKE_C_COMPILER=${MPI_HOME}/bin/mpicc \ + -DCMAKE_CXX_COMPILER=${MPI_HOME}/bin/mpicxx \ + -DCMAKE_Fortran_COMPILER=${MPI_HOME}/bin/mpif77 \ -DCMAKE_C_FLAGS="-fPIC" \ -DCMAKE_CXX_FLAGS="-fPIC" \ Index: /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh (revision 24638) +++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh (revision 24639) @@ -6,10 +6,9 @@ # DAK_ROOT=${ISSM_DIR}/externalpackages/dakota -MPI_INSTALL=${ISSM_DIR}/externalpackages/petsc/install VER="6.2" ## Environment # -export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2cblas" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it +export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lfblas -L/usr/lib/x86_64-linux-gnu -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it export BOOST_ROOT=${ISSM_DIR}/externalpackages/boost/install export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost (absolutely necessary for this version) @@ -18,6 +17,5 @@ export DAK_INSTALL=${DAK_ROOT}/install export DAK_SRC=${DAK_ROOT}/src -export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2clapack" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it -export MPIHOME=${MPI_INSTALL} # This appears to only be used by certain external packages and examples +export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lflapack -L/usr/lib/x86_64-linux-gnu -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it # Cleanup @@ -25,5 +23,5 @@ mkdir build install src -#Download from ISSM server +# Download source ${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/dakota-${VER}-public.src.tar.gz" "dakota-${VER}-public-src.tar.gz" @@ -49,7 +47,7 @@ -DBUILD_SHARED_LIBS=ON \ -DBUILD_STATIC_LIBS=OFF \ - -DCMAKE_C_COMPILER=${MPI_INSTALL}/bin/mpicc \ - -DCMAKE_CXX_COMPILER=${MPI_INSTALL}/bin/mpicxx \ - -DCMAKE_Fortran_COMPILER=${MPI_INSTALL}/bin/mpif77 \ + -DCMAKE_C_COMPILER=${MPI_HOME}/bin/mpicc \ + -DCMAKE_CXX_COMPILER=${MPI_HOME}/bin/mpicxx \ + -DCMAKE_Fortran_COMPILER=${MPI_HOME}/bin/mpif77 \ -DHAVE_ACRO=OFF \ -DHAVE_JEGA=OFF \ Index: sm/trunk-jpl/externalpackages/dakota/install-6.2-linux64-petsclibs.sh =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux64-petsclibs.sh (revision 24638) +++ (revision ) @@ -1,61 +1,0 @@ -#!/bin/bash -set -eu - -#Some cleanup -rm -rf Dakota -rm -rf src -rm -rf build -rm -rf install -mkdir src build install - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' - -#Untar -tar -zxvf dakota-6.2-public-src.tar.gz - -#Move Dakota to src directory -mv dakota-6.2.0.src/* src -rm -rf dakota-6.2.0.src - -#Set up Dakota cmake variables and config -export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src -export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build -export MPIHOME=$ISSM_DIR/externalpackages/mpich/install -cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake -patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.patch -patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch -patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.petsclibs.patch - -#Apply patches -patch src/src/NonDSampling.cpp configs/6.2/NonDSampling.cpp.patch -patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch -patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch - -#Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost -export CXXFLAGS='-std=c++98' - -#Configure dakota -cd $DAK_BUILD - -cmake -D CMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \ - -D CMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \ - -D CMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \ - -DHAVE_ACRO=off \ - -DHAVE_JEGA=off \ - -C $DAK_SRC/cmake/BuildDakotaCustom.cmake \ - -C $DAK_SRC/cmake/DakotaDev.cmake \ - $DAK_SRC -cd .. - -#Compile and install dakota -cd $DAK_BUILD -if [ $# -eq 0 ]; -then - make - make install -else - make -j $1 - make -j $1 install -fi -cd .. Index: sm/trunk-jpl/externalpackages/dakota/install-6.2-linux64-static.sh =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux64-static.sh (revision 24638) +++ (revision ) @@ -1,88 +1,0 @@ -#!/bin/bash -set -eu - - -# Constants -# -VER="6.2" - -# Cleanup -rm -rf Dakota -rm -rf src -rm -rf build -rm -rf install -mkdir src build install - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/dakota-${VER}-public.src.tar.gz" "dakota-${VER}-public-src.tar.gz" - -#Untar -tar -zxvf dakota-${VER}-public-src.tar.gz - -#Move Dakota to src directory -mv dakota-${VER}.0.src/* src -rm -rf dakota-${VER}.0.src - -#Set up Dakota cmake variables and config -DAK_PATH=$ISSM_DIR/externalpackages/dakota - -export DAK_BUILD=$DAK_PATH/build -export DAK_INSTALL=$DAK_PATH/install -export DAK_SRC=$DAK_PATH/src -export MPIHOME=$ISSM_DIR/externalpackages/mpich/install -export BOOST_ROOT=$ISSM_DIR/externalpackages/boost/install -export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -lblas" # Need to export BLAS_LIBS *and* pass is as an option to CMake to ensure that external packages also find it -export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -llapack" # Need to export BLAS_LIBS *and* pass is as an option to CMake to ensure thatss is as an option to CMake to ensure that external packages also find it - - -cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake -patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/${VER}/BuildDakotaCustom.cmake.patch -patch $DAK_SRC/cmake/DakotaDev.cmake configs/${VER}/DakotaDev.cmake.patch -patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.petsclibs.patch - -#Apply patches -patch src/src/NonDSampling.cpp configs/${VER}/NonDSampling.cpp.patch -patch src/src/NonDLocalReliability.cpp configs/${VER}/NonDLocalReliability.cpp.patch -patch src/packages/pecos/src/pecos_global_defs.hpp configs/${VER}/pecos_global_defs.hpp.patch - -#Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost -export CXXFLAGS='-std=c++98' - -#Configure dakota -cd $DAK_BUILD - -cmake \ - -DBUILD_STATIC_LIBS=ON \ - -DBUILD_SHARED_LIBS=OFF \ - -DBoost_INSTALL_PREFIX=$DAK_INSTALL \ - -DBOOST_ROOT=$BOOST_ROOT \ - -DBoost_NO_BOOST_CMAKE=TRUE \ - -DBoost_LIBRARY_DIRS=$BOOST_ROOT/lib \ - -DBoost_NO_SYSTEM_PATHS=TRUE \ - -DCMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \ - -DCMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \ - -DCMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \ - -DCMAKE_C_FLAGS="-O2 -g -fPIC" \ - -DCMAKE_CXX_FLAGS="-O2 -g -fPIC" \ - -DCMAKE_Fortran_FLAGS="-O2 -g -fPIC" \ - -DHAVE_ACRO=off \ - -DHAVE_JEGA=off \ - -C$DAK_SRC/cmake/BuildDakotaCustom.cmake \ - -C$DAK_SRC/cmake/DakotaDev.cmake \ - $DAK_SRC - -cd .. - -#Compile and install dakota -cd $DAK_BUILD - -if [ $# -eq 0 ]; -then - make - make install -else - make -j $1 - make -j $1 install -fi - -cd .. Index: sm/trunk-jpl/externalpackages/dakota/install-6.2-linux64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux64.sh (revision 24638) +++ (revision ) @@ -1,63 +1,0 @@ -#!/bin/bash -set -eu - -#Some cleanup -rm -rf Dakota -rm -rf src -rm -rf build -rm -rf install -mkdir src build install - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz' - -#Untar -tar -zxvf dakota-6.2-public-src.tar.gz - -#Move Dakota to src directory -mv dakota-6.2.0.src/* src -rm -rf dakota-6.2.0.src - -#Set up Dakota cmake variables and config -export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src -export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build -export MPIHOME=$ISSM_DIR/externalpackages/mpich/install -export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/blas/install/lib -lblas" # Need to export BLAS_LIBS *and* pass is as an option to CMake to ensure that external packages also find it -export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -llapack" # Need to export BLAS_LIBS *and* pass is as an option to CMake to ensure that -cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake -patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.patch -patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch -patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.libvars.patch - -#Apply patches -patch src/src/NonDSampling.cpp configs/6.2/NonDSampling.cpp.patch -patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch -patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch - -#Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost -export CXXFLAGS='-std=c++98' - -#Configure dakota -cd $DAK_BUILD - -cmake -D CMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \ - -D CMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \ - -D CMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \ - -DHAVE_ACRO=off \ - -DHAVE_JEGA=off \ - -C $DAK_SRC/cmake/BuildDakotaCustom.cmake \ - -C $DAK_SRC/cmake/DakotaDev.cmake \ - $DAK_SRC -cd .. - -#Compile and install dakota -cd $DAK_BUILD -if [ $# -eq 0 ]; -then - make - make install -else - make -j $1 - make -j $1 install -fi -cd .. Index: /issm/trunk-jpl/externalpackages/petsc/install-3.11-linux-static.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-3.11-linux-static.sh (revision 24639) +++ /issm/trunk-jpl/externalpackages/petsc/install-3.11-linux-static.sh (revision 24639) @@ -0,0 +1,55 @@ +#!/bin/bash +set -eu + + +## Constants +# +VER="3.11.3" + +# Download source +$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/petsc-lite-${VER}.tar.gz" "petsc-${VER}.tar.gz" + +# Unpack source +tar -zxvf petsc-${VER}.tar.gz + +# Cleanup +rm -rf install src +mkdir install src + +# Move source to 'src' directory +mv petsc-${VER}/* src/ +rm -rf petsc-${VER} + +# Configure +# +# NOTE: Cannot use --with-fpic option when compiling static libs, +# +# Cannot determine compiler PIC flags if shared libraries is turned off +# Either run using --with-shared-libraries or --with-pic=0 and supply the +# compiler PIC flag via CFLAGS, CXXXFLAGS, and FCFLAGS +# +cd src +./config/configure.py \ + --prefix="${ISSM_DIR}/externalpackages/petsc/install" \ + --PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" \ + --with-shared-libraries=0 \ + --CFLAGS="-fPIC" \ + --CXXFLAGS="-fPIC" \ + --FFLAGS="-fPIC" \ + --COPTFLAGS="-O2" \ + --CXXOPTFLAGS="-O2" \ + --FOPTFLAGS="-O2" \ + --with-debugging=0 \ + --with-valgrind=0 \ + --with-x=0 \ + --with-ssl=0 \ + --download-fblaslapack=1 \ + --download-mpich=1 \ + --download-metis=1 \ + --download-parmetis=1 \ + --download-scalapack=1 \ + --download-mumps=1 + +# Compile and install +make +make install Index: /issm/trunk-jpl/externalpackages/petsc/install-3.11-mac-static.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-3.11-mac-static.sh (revision 24639) +++ /issm/trunk-jpl/externalpackages/petsc/install-3.11-mac-static.sh (revision 24639) @@ -0,0 +1,55 @@ +#!/bin/bash +set -eu + + +## Constants +# +VER="3.11.3" + +# Download source +$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/petsc-lite-${VER}.tar.gz" "petsc-${VER}.tar.gz" + +# Unpack source +tar -zxvf petsc-${VER}.tar.gz + +# Cleanup +rm -rf install src +mkdir install src + +# Move source to 'src' directory +mv petsc-${VER}/* src/ +rm -rf petsc-${VER} + +# Configure +# +# NOTE: Cannot use --with-fpic option when compiling static libs, +# +# Cannot determine compiler PIC flags if shared libraries is turned off +# Either run using --with-shared-libraries or --with-pic=0 and supply the +# compiler PIC flag via CFLAGS, CXXXFLAGS, and FCFLAGS +# +cd src +./config/configure.py \ + --prefix="${ISSM_DIR}/externalpackages/petsc/install" \ + --PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" \ + --with-shared-libraries=0 \ + --CFLAGS="-fPIC" \ + --CXXFLAGS="-fPIC" \ + --FFLAGS="-fPIC" \ + --COPTFLAGS="-O2" \ + --CXXOPTFLAGS="-O2" \ + --FOPTFLAGS="-O2" \ + --with-debugging=0 \ + --with-valgrind=0 \ + --with-x=0 \ + --with-ssl=0 \ + --download-fblaslapack=1 \ + --download-mpich=1 \ + --download-metis=1 \ + --download-parmetis=1 \ + --download-scalapack=1 \ + --download-mumps=1 + +# Compile and install +make +make install Index: /issm/trunk-jpl/externalpackages/petsc/install-3.11-mac.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-3.11-mac.sh (revision 24638) +++ /issm/trunk-jpl/externalpackages/petsc/install-3.11-mac.sh (revision 24639) @@ -26,4 +26,7 @@ --prefix="${ISSM_DIR}/externalpackages/petsc/install" \ --PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" \ + --COPTFLAGS="-O2" \ + --CXXOPTFLAGS="-O2" \ + --FOPTFLAGS="-O2" \ --with-debugging=0 \ --with-valgrind=0 \ Index: /issm/trunk-jpl/jenkins/jenkins.sh =================================================================== --- /issm/trunk-jpl/jenkins/jenkins.sh (revision 24638) +++ /issm/trunk-jpl/jenkins/jenkins.sh (revision 24639) @@ -16,5 +16,5 @@ rm -rf $ISSM_DIR/execution/* rm -rf $ISSM_DIR/nightlylog -mkdir $ISSM_DIR/nightlylog +mkdir $ISSM_DIR/nightlylog #Server URI @@ -31,5 +31,5 @@ if [ ! -f "$1" ] then - echo "File $1 not found!" >&2 # Error message to stderr. + echo "File $1 not found!" >&2 # Error message to stderr. exit 1 fi @@ -67,5 +67,5 @@ SVN_CURRENT=$SVN_REVISION_1 echo "Previous revision number: $SVN_PREVIOUS" - echo "Current revision number: $SVN_CURRENT" + echo "Current revision number: $SVN_CURRENT" # Get list of changed files @@ -82,5 +82,5 @@ #cat changes | grep 'document_edit' |sed -e 's/document_edit.png/document_edit.png\ #/g' | sed -e 's/.*<\/a><\/td>\(.*\)<\/td><\/tr>.*/\1/' | grep -v 'document_edit.png' > $ISSM_DIR/TEMP - cat changes | tr " " "\n" | grep trunk | sed -e 's/.*\(.*\)<\/a>.*/\1/' > $ISSM_DIR/TEMP + cat changes | tr " " "\n" | grep trunk | sed -e 's/.*\(.*\)<\/a>.*/\1/' > $ISSM_DIR/TEMP # Print list of changed files @@ -146,8 +146,10 @@ echo $SVN_REVISION_1 > $ISSM_DIR/svn_revision_old #}}} -#Install external packages (ISSM_EXTERNALPACKAGES){{{ - -#number of packages: -NUMPACKAGES=$(($(echo $EXTERNALPACKAGES | wc -w )/2)) + +## External Packages +# + +# Number of packages +NUMPACKAGES=$(($(echo ${EXTERNALPACKAGES} | wc -w ) / 2)) #Jenkins xml files for individual packages @@ -315,6 +317,5 @@ warning off %necessary to avoid a log of several Go for parallel runs try, - $(if [ "$MATLAB_NROPTIONS" = "" ] - then + $(if [ "$MATLAB_NROPTIONS" = "" ]; then echo "runme('output','nightly','rank',$i,'numprocs',$NUMCPUS_RUN);" else @@ -374,6 +375,6 @@ for job in `jobs -p` do -echo "Waiting on: $job" - wait $job + echo "Waiting on: $job" + wait $job done @@ -411,6 +412,6 @@ for job in `jobs -p` do - echo "Waiting on: $job" - wait $job + echo "Waiting on: $job" + wait $job done @@ -535,16 +536,16 @@ if [ $MATLAB_TEST -eq 1 ]; then #number tests: - numtests=`cat matlab_log.log | grep "\-\-\-\-\-\-\-\-starting" | wc -l` - testlist=`cat matlab_log.log | grep "\-\-\-\-\-\-\-\-starting" | sed 's/----------------starting://g' | sed 's/-//g'` + numtests=`cat matlab_log.log | grep "\-\-\-\-\-\-\-\-starting" | wc -l` + testlist=`cat matlab_log.log | grep "\-\-\-\-\-\-\-\-starting" | sed 's/----------------starting://g' | sed 's/-//g'` #look through numtests: for i in `echo $testlist` do - juLog -test=MATLAB-$i -name=Error -error=ERROR awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" matlab_log.log - juLog -test=MATLAB-$i -name=Failure -error=FAILURE awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" matlab_log.log + juLog -test=MATLAB-$i -name=Error -error=ERROR awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" matlab_log.log + juLog -test=MATLAB-$i -name=Failure -error=FAILURE awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" matlab_log.log done # Check that MATLAB did not exit in error - matlabExitedInError=`grep -E "Activation cannot proceed|license" matlab_log.log | wc -l` + matlabExitedInError=`grep -E "Error|Activation cannot proceed|license" matlab_log.log | wc -l` if [ $matlabExitedInError -ne 0 ] @@ -563,16 +564,16 @@ if [ $PYTHON_TEST -eq 1 ]; then #number tests: - numtests=`cat python_log.log | grep "\-\-\-\-\-\-\-\-starting" | wc -l` - testlist=`cat python_log.log | grep "\-\-\-\-\-\-\-\-starting" | sed 's/----------------starting://g' | sed 's/-//g'` + numtests=`cat python_log.log | grep "\-\-\-\-\-\-\-\-starting" | wc -l` + testlist=`cat python_log.log | grep "\-\-\-\-\-\-\-\-starting" | sed 's/----------------starting://g' | sed 's/-//g'` #look through numtests: for i in `echo $testlist` do - juLog -test=PYTHON-$i -name=Error -error=ERROR awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" python_log.log - juLog -test=PYTHON-$i -name=Failure -error=FAILURE awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" python_log.log + juLog -test=PYTHON-$i -name=Error -error=ERROR awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" python_log.log + juLog -test=PYTHON-$i -name=Failure -error=FAILURE awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" python_log.log done # Check that Python did not exit in error - pythonExitedInError=`grep -E "Traceback|bad interpreter" python_log.log | wc -l` + pythonExitedInError=`grep -E "Error|Traceback|bad interpreter" python_log.log | wc -l` if [ $pythonExitedInError -ne 0 ] @@ -597,11 +598,11 @@ $SED -i .bak 's///g' matlab_log_examples.log - numtests=`cat matlab_log_examples.log | grep "starting: " | wc -l` - testlist=`cat matlab_log_examples.log | grep "starting: " | sed 's/starting: //'` + numtests=`cat matlab_log_examples.log | grep "starting: " | wc -l` + testlist=`cat matlab_log_examples.log | grep "starting: " | sed 's/starting: //'` echo "Processing: $numtests" for i in `echo $testlist` do - juLog -test=Example-$i -name=Error -error=FAILURE awk "/starting: $i/{flag=1;next}/finished: $i/{flag=0} flag{print}" matlab_log_examples.log + juLog -test=Example-$i -name=Error -error=FAILURE awk "/starting: $i/{flag=1;next}/finished: $i/{flag=0} flag{print}" matlab_log_examples.log done fi Index: /issm/trunk-jpl/jenkins/macosx_pine-island =================================================================== --- /issm/trunk-jpl/jenkins/macosx_pine-island (revision 24638) +++ /issm/trunk-jpl/jenkins/macosx_pine-island (revision 24639) @@ -41,5 +41,5 @@ autotools install.sh cmake install.sh - petsc install-3.12-mac.sh + petsc install-3.11-mac.sh triangle install-mac.sh chaco install.sh Index: /issm/trunk-jpl/jenkins/ross-debian_linux =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux (revision 24638) +++ /issm/trunk-jpl/jenkins/ross-debian_linux (revision 24639) @@ -32,5 +32,5 @@ autotools install-debian-linux.sh cmake install.sh - petsc install-3.12-linux.sh + petsc install-3.11-linux.sh triangle install-linux.sh chaco install.sh Index: /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampioff =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampioff (revision 24638) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampioff (revision 24639) @@ -40,5 +40,5 @@ autotools install-debian-linux.sh cmake install.sh - petsc install-3.12-linux.sh + petsc install-3.11-linux.sh triangle install-linux.sh gsl install-linux64.sh Index: /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion (revision 24638) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion (revision 24639) @@ -41,5 +41,5 @@ autotools install-debian-linux.sh cmake install.sh - petsc install-3.12-linux.sh + petsc install-3.11-linux.sh triangle install-linux.sh gsl install-linux64.sh Index: /issm/trunk-jpl/jenkins/ross-debian_linux-binaries =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-binaries (revision 24638) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-binaries (revision 24639) @@ -37,5 +37,5 @@ autotools install-debian-linux.sh cmake install.sh - petsc install-3.12-linux-static.sh + petsc install-3.11-linux-static.sh triangle install-linux-static.sh chaco install.sh Index: /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-with_dakota =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-with_dakota (revision 24638) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-with_dakota (revision 24639) @@ -43,5 +43,5 @@ autotools install-debian-linux.sh cmake install.sh - petsc install-3.12-linux-static.sh + petsc install-3.11-linux-static.sh boost install-1.55-linux-static.sh dakota install-6.2-linux-static.sh Index: /issm/trunk-jpl/jenkins/ross-debian_linux-codipack =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-codipack (revision 24638) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-codipack (revision 24639) @@ -38,5 +38,5 @@ autotools install-debian-linux.sh cmake install.sh - petsc install-3.12-linux.sh + petsc install-3.11-linux.sh triangle install-linux.sh chaco install.sh Index: /issm/trunk-jpl/jenkins/ross-debian_linux-dakota =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-dakota (revision 24638) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-dakota (revision 24639) @@ -38,5 +38,5 @@ autotools install-debian-linux.sh cmake install.sh - petsc install-3.12-linux.sh + petsc install-3.11-linux.sh boost install-1.55-linux.sh dakota install-6.2-linux.sh Index: /issm/trunk-jpl/jenkins/ross-debian_linux-gia =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-gia (revision 24638) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-gia (revision 24639) @@ -33,5 +33,5 @@ autotools install-debian-linux.sh cmake install.sh - petsc install-3.12-linux.sh + petsc install-3.11-linux.sh triangle install-linux.sh math77 install.sh Index: /issm/trunk-jpl/jenkins/ross-debian_linux-iceocean =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-iceocean (revision 24638) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-iceocean (revision 24639) @@ -33,5 +33,5 @@ autotools install-debian-linux.sh cmake install.sh - petsc install-3.12-linux.sh + petsc install-3.11-linux.sh triangle install-linux.sh chaco install.sh Index: /issm/trunk-jpl/jenkins/ross-debian_linux-python =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-python (revision 24638) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-python (revision 24639) @@ -32,5 +32,5 @@ autotools install-debian-linux.sh cmake install.sh - petsc install-3.12-linux.sh + petsc install-3.11-linux.sh triangle install-linux.sh chaco install.sh Index: /issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth (revision 24638) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth (revision 24639) @@ -32,5 +32,5 @@ autotools install-debian-linux.sh cmake install.sh - petsc install-3.12-linux.sh + petsc install-3.11-linux.sh triangle install-linux.sh chaco install.sh