Changeset 15194

Timestamp:

06/05/13 22:48:15 (12 years ago)

Author:

Eric.Larour

Message:

CHG: R2.h missing include file that declares Abs routine.
CHG: config-linux64-ubuntu64.sh updated to compile on xubuntu 13.0.4

Location:

issm/trunk-jpl

Files:

• configs/config-linux64-ubuntu64.sh (modified) (2 diffs)
• src/c/bamg/R2.h (modified) (1 diff)

issm/trunk-jpl/configs/config-linux64-ubuntu64.sh

@@ -7 +7 @@
  --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
  --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
- --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl -ldl" \
+ --with-mpi-include="/usr/lib/mpich2/include" \
+ --with-mpi-lib="-L/usr/lib/mpich2/lib -lmpich -lmpl -ldl" \
  --with-petsc-arch=$ISSM_ARCH \
  --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
@@ -19 +19 @@
  --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
  --with-cxxoptflags="-mtune=barcelona -ffast-math -O3 -msse4.2 -Wno-write-strings "\
- --with-fortran-lib="-lgfortran"\
+ --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.7/ -lgfortran"\
  --with-numthreads=8 \
  --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \

issm/trunk-jpl/src/c/bamg/R2.h

@@ -4 +4 @@
 
 #include <cstdio>
+#include "../shared/shared.h"
 
 namespace bamg {