Index: ../trunk-jpl/jenkins/imac-012301-gil
===================================================================
--- ../trunk-jpl/jenkins/imac-012301-gil	(revision 18397)
+++ ../trunk-jpl/jenkins/imac-012301-gil	(revision 18398)
@@ -12,17 +12,14 @@
 ISSM_CONFIG='--prefix=$ISSM_DIR \
 	--with-matlab-dir=$MATLAB_DIR \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
-	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
-	--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
-	--with-math-lib="/usr/lib/libm.dylib" \
-	--with-graphics-lib="/usr/X11/lib/libX11.dylib" \
-	--with-numthreads=8 \
+	--with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lpmpich -lmpich -lmpl" \
 	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
-	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
 	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
 	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
+	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
+	--with-numthreads=8 \
+	--enable-debugging \
 	--enable-development'
 
 #MATLAB path
@@ -59,7 +56,6 @@
 						triangle  install-macosx64.sh 
 						shell2junit  install.sh "
 
-
 #---------------------#
 # 4: ISSM Compilation #
 #---------------------#
@@ -69,22 +65,8 @@
 # - "no"  do not compile ISSM
 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
Index: ../trunk-jpl/jenkins/jenkins.sh
===================================================================
--- ../trunk-jpl/jenkins/jenkins.sh	(revision 18397)
+++ ../trunk-jpl/jenkins/jenkins.sh	(revision 18398)
@@ -2,51 +2,6 @@
 #This bash script calls the nightlyrun.m matlab file to run our nightly test decks. 
 #It then processes the results and sends an email to the Ice developpers.
 
-#some functions
-function timer() #{{{
-{
-	if [[ $# -eq 0 ]]; then
-		echo $(date '+%s')
-	else
-		local  stime=$1
-		etime=$(date '+%s')
-
-		if [[ -z "$stime" ]]; then stime=$etime; fi
-
-		dt=$((etime - stime))
-		ds=$((dt % 60))
-		dm=$(((dt / 60) % 60))
-		dh=$((dt / 3600))
-		printf '%d:%02d:%02d' $dh $dm $ds
-	fi
-} #}}}
-function todaydate() #{{{
-{
-	suffix=`date | awk '{printf("%s-%s-%s  %s",$2,$3,$6,$4);}'`			 
-	echo $suffix;			 
-} #}}}
-function host_name() #{{{
-{
-	#return host name depending on the OS
-	if [ "$1" = "win7" ] 
-	then
-		HOST_NAME=`hostname | sed 's/-//g'`;
-	else
-		HOST_NAME=`hostname -s | sed 's/-//g'`;
-	fi
-	echo $HOST_NAME;
-} #}}}
-function pause() #{{{
-{
-pid=`ps aux -W | grep $1 | awk '{printf("%s\n",$1);}'`
-
-while [ -n "$pid" ]
-do
-	pid=`ps aux -W | grep $1 | awk '{printf("%s\n",$1);}'`
-done
-}
-#}}}
-
 #Get configuration
 #Source config file{{{
 if [ $# -ne 1 ];
@@ -62,17 +17,11 @@
 fi 
 source $1;
 #}}}
-#Initialize variables {{{
-TODAY=$(todaydate);
+#Get Operating system (OS) name{{{
 OS=$(uname -s)
 if [[ $OS == "CYGWIN_NT-6.1-WOW64" ]]; then 
 	OS="win7";
 fi
-HOST_NAME=$(host_name $OS);
-START_TIME=$(timer);
-ISSM_RELEASE=$(basename $(echo $REPOSITORY));
-USER=$(whoami);
-INIT_PATH=$(pwd);
 #}}}
 
 #Installation ISSM
@@ -211,37 +160,14 @@
 echo "Cleaning up execution directory"
 rm -rf $ISSM_DIR/execution/*
 
-#Prepare info.log
-#{{{
-rm -rf $ISSM_DIR/nightlylog
-mkdir  $ISSM_DIR/nightlylog
-INSTALL_TIME=$(timer)
-ELAPSED=$(timer $START_TIME)
-VERSION=$(svnversion $ISSM_DIR)
-cat << END > $ISSM_DIR/nightlylog/info.log
-name:      $(echo $NAME)
-today:     $(echo $TODAY)
-user:      $(echo $USER)
-host:      $(echo $HOST_NAME)
-OS:        $(echo $OS)
-release:   $(echo $ISSM_RELEASE)
-init_path: $(echo $INIT_PATH)
-is_matlab: $(echo $MATLAB_TEST)
-is_python: $(echo $PYTHON_TEST)
-elapsed_install: $(echo $ELAPSED)
-version: $(echo $VERSION)
-END
-#}}}
-
 #matlab tests
 if [ $MATLAB_TEST -eq 1 ]; then
 #Launch all tests on different cpus {{{
-MATLAB_START_TIME=$(timer);
 for (( i=1;i<=$NUMCPUS_RUN;i++ ))
 do
 	#Launch matlab and the nightly run script
 	cat > $ISSM_DIR/nightlylog/matlab_run$i.m << EOF
-	warning off %necessary to avoid a info.log of several Go for parallel runs
+	warning off %necessary to avoid a log of several Go for parallel runs
 	try,
 	$(if [ "$MATLAB_NROPTIONS" = ""  ]
 	then
@@ -268,7 +194,12 @@
 
 #wait until matlab closes
 if [ "$OS" = "win7" ]; then
-	pause MATLAB
+	pid=$(ps aux -W | grep MATLAB | awk '{printf("%s\n",MATLAB);}')
+
+	while [ -n "$pid" ]
+	do
+		pid=$(ps aux -W | grep MATLAB | awk '{printf("%s\n",MATLAB);}')
+	done
 else
 	wait
 fi
@@ -283,22 +214,8 @@
 
 #filter out windows characters: 
 cat matlab_log.log | tr -cd '\11\12\40-\176' > matlab_log.log2 && mv matlab_log.log2 matlab_log.log
-
 #}}}
-#Complete info.log {{{
-if [ $(cat matlab_log.log | grep "MATLABEXITEDCORRECTLY" | wc -l) -eq $NUMCPUS_RUN ]
-then
-	MATLABCRASH=0
-else
-	MATLABCRASH=1
 fi
-ELAPSED=$(timer $MATLAB_START_TIME)
-cat << END >>  $ISSM_DIR/nightlylog/info.log
-elapsed_matlab: $(echo $ELAPSED)
-matlab_crash:   $(echo $MATLABCRASH)
-END
-#}}}
-fi
 
 #python tests
 if [ $PYTHON_TEST -eq 1 ]; then
@@ -311,13 +228,6 @@
 	./runme.py --output=nightly --rank=$i --numprocs=$NUMCPUS_RUN $PYTHON_NROPTIONS 2>&1 > $ISSM_DIR/nightlylog/python_log$i.log &
 done
 
-#wait until python closes
-if [ "$OS" = "win7" ]; then
-	pause MATLAB
-else
-	wait
-fi
-
 #concatenate reports
 cd $ISSM_DIR/nightlylog/
 rm python_log.log
@@ -326,29 +236,8 @@
 	cat python_log$i.log >> python_log.log
 done
 #}}}
-#Complete info.log {{{
-if [ $(cat python_log.log | grep "PYTHONEXITEDCORRECTLY" | wc -l) -eq $NUMCPUS_RUN ]
-then
-	PYTHONCRASH=0
-else
-	PYTHONCRASH=1
 fi
-ELAPSED=$(timer $PYTHON_START_TIME)
-cat << END >>  $ISSM_DIR/nightlylog/info.log
-elapsed_python: $(echo $ELAPSED)
-python_crash:   $(echo $PYTHONCRASH)
-END
-#}}}
-fi
 
-#complete info.log
-#{{{
-ELAPSED=$(timer $START_TIME)
-cat << END >>  $ISSM_DIR/nightlylog/info.log
-elapsed_total:  $(echo $ELAPSED)
-END
-#}}}
-
 #process logs to be junit compatible
 #{{{
 cd $ISSM_DIR/nightlylog/
Index: ../trunk-jpl/configure.ac
===================================================================
--- ../trunk-jpl/configure.ac	(revision 18397)
+++ ../trunk-jpl/configure.ac	(revision 18398)
@@ -13,10 +13,10 @@
 AC_PROG_CXX([icpc cccl cl icl g++])
 AC_PROG_F77([ifort g77 gfortran])
 
-AC_F77_LIBRARY_LDFLAGS
+#AC_F77_LIBRARY_LDFLAGS
 
 #Libraries and linking
-AC_PATH_XTRA      #figure out X library and include paths
+#AC_PATH_XTRA      #figure out X library and include paths
 
 #AUTOMAKE
 #Initialize automake and declare foreign so that we don't need a ChangeLog, INSTALL, etc
