Changeset 19105 for issm/trunk/jenkins/linux64_murdo_ampi

Timestamp:

02/12/15 16:48:40 (10 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 19103

Location:

issm/trunk

Files:

• . (modified) (2 props)
• jenkins/linux64_murdo_ampi (modified) (4 diffs)

issm/trunk

@@ +1 @@
+build-fw
+build-ad
 nightlylog
 configure.sh

@@ +1 @@
+build-fw
+build-ad
 nightlylog
 configure.sh

issm/trunk/jenkins/linux64_murdo_ampi

@@ -1 @@
-#
-########### Configuration file for Eric Larour's Jenkins run on Murdo ############
 
 #-------------------------------#
 # 1: ISSM general configuration #
 #-------------------------------#
-
-#Nightly run name
-NAME="ISSM tests on Linux64 (murdo). Automatic differentiation validation tests with ampi"
-
-#ISSM Architecture
-ISSM_ARCH="linux-gnu-amd64"
 
 #ISSM CONFIGURATION 
@@ -24 +16 @@
                                   --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
                                   --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \
-                                  --with-graphics-lib="/usr/lib/x86_64-linux-gnu/libX11.so" \
                                   --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
                                   --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
@@ -30 +21 @@
                                   --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
                                   --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+                                  --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.6/ -lgfortran" \
                                   --enable-development \
                                   --enable-debugging CXXFLAGS="-g -O0" '
@@ -81 +73 @@
 ISSM_COMPILATION="yes"
 
-#----------------------#
-# 5: Mail notification #
-#----------------------#
-
-#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
-#sent to the adresses present in $ISSM_DIR/cron/mailinglist.
-SKIPMAIL="no"
-
-#Sender email address
-EMAIL_ADRESS="eric.larour@jpl.nasa.gov"
-
-#Mailing list
-MAILINGLIST="eric.larour@jpl.nasa.gov"
-
 #------------------------#
-# 6: Nightly run options #
+# 5: Nightly run options #
 #------------------------#
 
 #number of cpus used in ISSM installation and compilation (one is usually
 #safer as some packages are very sensitive to parallel compilation)
-NUMCPUS_INSTALL=8
+NUMCPUS_INSTALL=1
 
 #number of cpus used in the nightly runs.

@@ +1 @@
+build-fw
+build-ad
 nightlylog
 configure.sh