Changeset 10229

Timestamp:

10/18/11 11:49:50 (13 years ago)

Author:

Eric.Larour

Message:

Added shapelib library linking to serial build.
Added Shp2Kml module (only the shell).

Location:

issm/trunk

Files:

• configs/astrid/configure.sh.petsc2 (modified) (1 diff)
• etc/environment.sh (modified) (1 diff)
• etc/environment_variables.sh (modified) (1 diff)
• externalpackages/matlab/install.sh (modified) (1 diff)
• m4/issm_options.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (1 diff)
• src/mex/Makefile.am (modified) (4 diffs)
• src/mex/Shp2Kml (added)
• src/mex/Shp2Kml/Shp2Kml.cpp (added)
• src/mex/Shp2Kml/Shp2Kml.h (added)

issm/trunk/configs/astrid/configure.sh.petsc2

@@ -5 +5 @@
 #mpich 1.0.2
 
-./configure --prefix=$ISSM_TIER --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install --with-metis-dir=$ISSM_TIER/externalpackages/metis/install --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include  --with-mpi-lib="-L$ISSM_TIER/externalpackages/mpich2/install/lib/ -lmpich" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" --with-graphics-lib=/usr/lib64/libX11.so --with-cxxoptflags="-march=opteron -O2" --with-numthreads=32 --with-scotch-dir=$ISSM_TIER/externalpackages/scotch/install --with-chaco-dir=$ISSM_TIER/externalpackages/chaco/install --enable-debugging
+./configure --prefix=$ISSM_TIER --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install --with-metis-dir=$ISSM_TIER/externalpackages/metis/install --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include  --with-mpi-lib="-L$ISSM_TIER/externalpackages/mpich2/install/lib/ -lmpich" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" --with-graphics-lib=/usr/lib64/libX11.so --with-cxxoptflags="-march=opteron -O2" --with-numthreads=32 --with-scotch-dir=$ISSM_TIER/externalpackages/scotch/install --with-chaco-dir=$ISSM_TIER/externalpackages/chaco/install --enable-debugging --with-shapelib-dir=$ISSM_TIER/externalpackages/shapelib/install\

issm/trunk/etc/environment.sh

@@ -218 +218 @@
 #CMAKE
 export PATH="$PATH:$CMAKE_DIR/bin"
+
+#SHAPELIB
+export PATH="$PATH:$SHAPELIB_DIR/exec"

issm/trunk/etc/environment_variables.sh

@@ -161 +161 @@
 CMAKE_DIR="$ISSM_TIER/externalpackages/cmake/install"
 
+#shapelib
+SHAPELIB_DIR="$ISSM_TIER/externalpackages/shapelib/install"

issm/trunk/externalpackages/matlab/install.sh

@@ -5 +5 @@
 
 #Select or create a new simlink
-ln -s /usr/local/pkgs/matlab-7.6/ install
+#ln -s /usr/local/pkgs/matlab-7.6/ install
+#ln -s /usr/local/matlab704  install
+ln -s /usr/local/matlab711  install
 #ln -s /usr/local/matlab712/ install
 #ln -s /usr/local/pkgs/matlab-7.6/ install

issm/trunk/m4/issm_options.m4

@@ -540 +540 @@
         AC_MSG_RESULT($HAVE_SLEPC)
         dnl }}}
+        dnl shapelib{{{1
+        AC_ARG_WITH([shapelib-dir],
+                          AS_HELP_STRING([--with-shapelib-dir = DIR],
+                                                         [shapelib root directory]),
+                          [SHAPELIB_ROOT=$withval],[SHAPELIB_ROOT=""])
+                          
+        AC_MSG_CHECKING(for Shapelib headers and libraries in $SHAPELIB_ROOT)
+        if test -d "$SHAPELIB_ROOT"; then
+
+
+                dnl defaults
+                HAVE_SHAPELIB=yes
+                SHAPELIBINCL=-I"$SHAPELIB_ROOT/include"
+                SHAPELIBLIB=-L"$SHAPELIB_ROOT/lib/ -lshape"
+
+                AC_DEFINE([_HAVE_SHAPELIB_],[1],[with Shapelib in ISSM src])
+                AC_SUBST([SHAPELIBINCL])
+                AC_SUBST([SHAPELIBLIB])
+        else
+                HAVE_SHAPELIB=no
+        fi
+        AC_MSG_RESULT($HAVE_SHAPELIB)
+        dnl }}}
         dnl scalapack{{{1
         AC_ARG_WITH([scalapack-dir],

issm/trunk/src/c/Makefile.am

@@ -1 @@
-INCLUDES = @DAKOTAINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@  @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@  @TRIANGLEINCL@ @HYPREINCL@ @MLINCL@ @TAOINCL@
+INCLUDES = @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@  @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@  @TRIANGLEINCL@ @HYPREINCL@ @MLINCL@ @TAOINCL@
 
 #Library declaration {{{1

issm/trunk/src/mex/Makefile.am

@@ -1 @@
-INCLUDES = @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@
+INCLUDES = @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@
 EXEEXT=$(MEXEXT)
 
@@ -69 +69 @@
                                 SparseToVector\
                                 SpcNodes\
+                                Shp2Kml\
                                 UpdateConstraints\
                                 SurfaceArea\
@@ -98 +99 @@
 #}}}
 #Flags and libraries {{{1
-LDADD =   $(TRIANGLELIB) ../c/libISSM.a $(PETSCLIB) $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB)  $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB)
+LDADD =   $(TRIANGLELIB) ../c/libISSM.a $(PETSCLIB) $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB)  $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB)
 
 AM_LDFLAGS = $(MEXLINK)
@@ -308 +309 @@
 SpcNodes_SOURCES = SpcNodes/SpcNodes.cpp\
                           SpcNodes/SpcNodes.h
+
+Shp2Kml_SOURCES = Shp2Kml/Shp2Kml.cpp\
+                          Shp2Kml/Shp2Kml.h
 
 UpdateConstraints_SOURCES = UpdateConstraints/UpdateConstraints.cpp\