[getdp] 19/30: update to svn rev 2227
Matteo F. Vescovi
mfv at moszumanska.debian.org
Thu Feb 11 10:12:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
mfv pushed a commit to tag 2.2.0-1
in repository getdp.
commit 08be4da17041cac384b158462594c463e37f00f8
Author: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
Date: Wed Jan 18 09:46:57 2012 +0000
update to svn rev 2227
---
README.Debian | 27 +++++++++++++++++++-
changelog | 10 ++++++++
control | 7 +++---
getdp-sparskit.install | 4 +--
getdp.install | 12 +++++----
patches/Makefile.diff | 16 ++++++------
patches/TS_type_undef.diff | 31 -----------------------
patches/configure.diff | 57 ++++++++++++++++++++++++-------------------
patches/gmsh-2.1.diff | 13 ----------
patches/petsc-solverfile.diff | 49 -------------------------------------
patches/petsc3.1.diff | 31 -----------------------
patches/series | 2 --
rules | 44 +++++++++++----------------------
13 files changed, 102 insertions(+), 201 deletions(-)
diff --git a/README.Debian b/README.Debian
index be359ba..3e6a9f6 100644
--- a/README.Debian
+++ b/README.Debian
@@ -1,6 +1,31 @@
getdp for Debian
----------------
-initial build for debian lenny
+ Options for PETSc can be provided on the command line, or in the file
+ ~/.petscrc.
+
+ By default we try to use the MUMPS or UMFPACK direct solver (if
+ available, with PETSc 3). Otherwise we use a GMRES iterative solver
+ preconditionned with an ILU(6).
+
+ All these options can be changed at runtime. For example you could
+ use
+
+ -pc_type ilu
+ -pc_factor_levels 0
+ -ksp_rtol 1.e-6
+ -ksp_gmres_restart 500
+ -ksp_monitor
+
+ for GMRES with ILU(0), with a restart of 500 and a stopping
+ criterion of 1e-6. Or you could set
+
+ -pc_type lu
+ -pc_factor_mat_solver_package mumps
+ -ksp_type gmres
+
+ to use the MUMPS direct solver as a preconditioner to GMRES (useful
+ e.g if the matrix changed a bit, but you want to keep the same
+ factorization using "SolveAgain").
-- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Thu, 27 Aug 2009 13:09:50 +0200
diff --git a/changelog b/changelog
index ba5a495..403217c 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,13 @@
+getdp (2.1.1~svn2227-1) unstable; urgency=low
+
+ * Update to svn rev 2227
+ * Remove unneeded patches
+ * debian/rules:
+ - rewrite rules for getdp-sparskit (add --disable-gmsh)
+ - simplify rules
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Tue, 17 Jan 2012 09:45:45 +0100
+
getdp (2.1.1-1) unstable; urgency=low
* New upstream release
diff --git a/control b/control
index d7d34b1..8336e06 100644
--- a/control
+++ b/control
@@ -2,11 +2,10 @@ Source: getdp
Section: math
Priority: extra
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
+Uploaders: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
Build-Depends: quilt, cdbs, debhelper (>= 7), autotools-dev, automake, autoconf, gfortran, mpi-default-dev,
- libarpack2-dev, libgsl0-dev, libscotchmetis-dev, libpetsc3.1-dev, libslepc3.1-dev, libhdf5-openmpi-dev (>= 1.8.4), gmsh,
- texlive, texlive-generic-recommended, texinfo, install-info
-Standards-Version: 3.9.1
+ libarpack2-dev, libgsl0-dev, libscotchmetis-dev, libpetsc3.1-dev, libslepc3.1-dev, libhdf5-openmpi-dev (>= 1.8.4), gmsh
+Standards-Version: 3.9.2
Homepage: http://www.geuz.org/getdp
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/getdp/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/getdp/trunk/
diff --git a/getdp-sparskit.install b/getdp-sparskit.install
index ff47e48..5d8de40 100644
--- a/getdp-sparskit.install
+++ b/getdp-sparskit.install
@@ -1,2 +1,2 @@
-usr/bin/getdp-sparskit
-usr/share/man/man1/getdp-sparskit.1
+debian/getdp-sparskit.1 usr/share/man/man1
+bin/getdp-sparskit usr/bin
diff --git a/getdp.install b/getdp.install
index f097d13..f058f13 100644
--- a/getdp.install
+++ b/getdp.install
@@ -1,5 +1,7 @@
-usr/bin/getdp
-usr/share/man/man1/getdp.1
-usr/share/doc/getdp/getdp.html
-usr/share/doc/getdp/demos
-usr/share/info/getdp*
+debian/tmp/usr/bin/getdp
+debian/tmp/usr/share/man/man1/getdp.1
+debian/tmp/usr/share/info/getdp*
+
+doc/getdp.html usr/share/doc/getdp
+demos usr/share/doc/getdp
+
diff --git a/patches/Makefile.diff b/patches/Makefile.diff
index ca12f04..3cab0a2 100644
--- a/patches/Makefile.diff
+++ b/patches/Makefile.diff
@@ -1,8 +1,8 @@
-Index: getdp-2.1.0/Makefile
+Index: getdp-2.1.1~svn2227/Makefile
===================================================================
---- getdp-2.1.0.orig/Makefile 2010-10-25 13:09:49.000000000 +0200
-+++ getdp-2.1.0/Makefile 2010-10-25 13:09:49.000000000 +0200
-@@ -37,11 +37,11 @@
+--- getdp-2.1.1~svn2227.orig/Makefile 2012-01-03 09:34:51.000000000 +0100
++++ getdp-2.1.1~svn2227/Makefile 2012-01-17 16:30:54.465820750 +0100
+@@ -27,11 +27,11 @@
@for i in ${GETDP_DIRS}; do (cd $$i && ${MAKE}); done
install: variables
@@ -19,7 +19,7 @@ Index: getdp-2.1.0/Makefile
variables: configure
@echo "********************************************************************"
-@@ -62,6 +62,7 @@
+@@ -52,6 +52,7 @@
clean:
for i in doc lib demos ${GETDP_DIRS}; do (cd $$i && ${MAKE} clean); done
rm -f ${GETDP_VERSION_FILE}
@@ -27,10 +27,10 @@ Index: getdp-2.1.0/Makefile
depend: initialtag
mv -f Common/GetDPConfig.h .
-Index: getdp-2.1.0/doc/texinfo/Makefile
+Index: getdp-2.1.1~svn2227/doc/texinfo/Makefile
===================================================================
---- getdp-2.1.0.orig/doc/texinfo/Makefile 2010-10-26 09:04:01.000000000 +0200
-+++ getdp-2.1.0/doc/texinfo/Makefile 2010-10-26 09:05:58.000000000 +0200
+--- getdp-2.1.1~svn2227.orig/doc/texinfo/Makefile 2012-01-03 09:34:51.000000000 +0100
++++ getdp-2.1.1~svn2227/doc/texinfo/Makefile 2012-01-17 16:30:54.465820750 +0100
@@ -13,8 +13,9 @@
makeinfo --split-size 1000000 getdp.texi
diff --git a/patches/TS_type_undef.diff b/patches/TS_type_undef.diff
deleted file mode 100644
index 53e5232..0000000
--- a/patches/TS_type_undef.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: getdp-2.0.0/Legacy/Pos_Format.cpp
-===================================================================
---- getdp-2.0.0.orig/Legacy/Pos_Format.cpp 2010-06-17 14:33:17.000000000 +0200
-+++ getdp-2.0.0/Legacy/Pos_Format.cpp 2010-06-17 14:37:57.000000000 +0200
-@@ -48,7 +48,7 @@
- static List_T *SL = NULL, *VL = NULL, *TL = NULL;
- static List_T *ST = NULL, *VT = NULL, *TT = NULL;
- static List_T *SQ = NULL, *VQ = NULL, *TQ = NULL;
--static List_T *SS = NULL, *VS = NULL, *TS = NULL;
-+static List_T *SS = NULL, *VS = NULL, *TS_ = NULL;
- static List_T *SH = NULL, *VH = NULL, *TH = NULL;
- static List_T *SI = NULL, *VI = NULL, *TI = NULL;
- static List_T *SY = NULL, *VY = NULL, *TY = NULL;
-@@ -350,7 +350,7 @@
- List_WriteToFile(SQ, PostStream, f); List_WriteToFile(VQ, PostStream, f);
- List_WriteToFile(TQ, PostStream, f);
- List_WriteToFile(SS, PostStream, f); List_WriteToFile(VS, PostStream, f);
-- List_WriteToFile(TS, PostStream, f);
-+ List_WriteToFile(TS_, PostStream, f);
- List_WriteToFile(SH, PostStream, f); List_WriteToFile(VH, PostStream, f);
- List_WriteToFile(TH, PostStream, f);
- List_WriteToFile(SI, PostStream, f); List_WriteToFile(VI, PostStream, f);
-@@ -595,7 +595,7 @@
- if(!TQ) TQ = List_Create(100,1000,sizeof(double)); else List_Reset(TQ);
- if(!SS) SS = List_Create(100,1000,sizeof(double)); else List_Reset(SS);
- if(!VS) VS = List_Create(100,1000,sizeof(double)); else List_Reset(VS);
-- if(!TS) TS = List_Create(100,1000,sizeof(double)); else List_Reset(TS);
-+ if(!TS_) TS_ = List_Create(100,1000,sizeof(double)); else List_Reset(TS_);
- if(!SH) SH = List_Create(100,1000,sizeof(double)); else List_Reset(SH);
- if(!VH) VH = List_Create(100,1000,sizeof(double)); else List_Reset(VH);
- if(!TH) TH = List_Create(100,1000,sizeof(double)); else List_Reset(TH);
diff --git a/patches/configure.diff b/patches/configure.diff
index 7b30347..38a467c 100644
--- a/patches/configure.diff
+++ b/patches/configure.diff
@@ -1,34 +1,41 @@
-Index: getdp-2.0.0/configure.in
+Index: getdp-2.1.1~svn2227/configure.in
===================================================================
---- getdp-2.0.0.orig/configure.in 2010-03-18 10:21:13.000000000 +0100
-+++ getdp-2.0.0/configure.in 2010-03-18 10:26:27.000000000 +0100
-@@ -6,6 +6,7 @@
- dnl Process this file with autoconf to produce the configure script.
-
- dnl Check that this is the getdp source tree
-+AC_PREREQ(2.50)
- AC_INIT(Interface/ProParser.y)
-
- dnl Parse '--with' command-line options
-@@ -189,12 +190,9 @@
- dnl Check for Arpack, then link with blas and lapack if necessary
+--- getdp-2.1.1~svn2227.orig/configure.in 2012-01-17 15:30:29.861973181 +0100
++++ getdp-2.1.1~svn2227/configure.in 2012-01-17 15:45:59.837934072 +0100
+@@ -55,7 +55,7 @@
+ [use SLEPc eigensolvers (default=yes)]))
+ AC_ARG_ENABLE(sparskit,
+ AC_HELP_STRING([--enable-sparskit],
+- [use Sperskit linear solvers (default=no)]))
++ [use Sparskit linear solvers (default=no)]))
+ AC_ARG_ENABLE(zitsol,
+ AC_HELP_STRING([--enable-zitsol],
+ [enable support for ZITSOL (default=no)]))
+@@ -222,12 +222,21 @@
+ dnl Check for Arpack
if test "x$enable_fortran" != "xno"; then
if test "x$enable_arpack" != "xno" -a "x${LAPACK}" = "xyes"; then
- AC_CHECK_FILE(./contrib/Arpack/znaupd.f, ARPACK="yes", ARPACK="no")
- if test "x${ARPACK}" = "xyes"; then
- AC_DEFINE(HAVE_ARPACK)
- BO="${BO} Arpack"
+- AC_DEFINE(HAVE_ARPACK)
+- BO="${BO} Arpack"
- GETDP_DIRS="${GETDP_DIRS} contrib/Arpack"
- GETDP_LIBS="${GETDP_LIBS} -lGetDPArpack"
-+ GETDP_LIBS="${GETDP_LIBS} -larpack"
- if test "x${SPARSKIT}" = "xyes"; then
- if test "x${BLAS_LAPACK_PREFIX}" != "x"; then
- GETDP_LIBS="${GETDP_LIBS} -L${BLAS_LAPACK_PREFIX} -llapack -lblas"
-@@ -202,7 +200,6 @@
- GETDP_LIBS="${GETDP_LIBS} -llapack -lblas"
- fi
- fi
-- fi
++ AC_LANG_PUSH(Fortran)
++ AC_CHECK_LIB(arpack,znaupd,ARPACK="yes",ARPACK="no")
++ AC_LANG_POP()
++ if test "x${ARPACK}" = "xno"; then
++ AC_CHECK_FILE(./contrib/Arpack/znaupd.f, ARPACK="yes", ARPACK="no")
++ if test "x${ARPACK}" = "xyes"; then
++ AC_DEFINE(HAVE_ARPACK)
++ BO="${BO} Arpack"
++ GETDP_DIRS="${GETDP_DIRS} contrib/Arpack"
++ GETDP_LIBS="${GETDP_LIBS} -lGetDPArpack"
++ fi
++ else
++ GETDP_LIBS="${GETDP_LIBS} -larpack"
++ AC_DEFINE(HAVE_ARPACK)
++ BO="${BO} Arpack"
+ fi
fi
fi
-
diff --git a/patches/gmsh-2.1.diff b/patches/gmsh-2.1.diff
deleted file mode 100644
index 7930e34..0000000
--- a/patches/gmsh-2.1.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: getdp-1.2.1/GeoData/GeoData.c
-===================================================================
---- getdp-1.2.1.orig/GeoData/GeoData.c 2009-11-04 16:50:34.000000000 +0100
-+++ getdp-1.2.1/GeoData/GeoData.c 2009-11-04 16:50:46.000000000 +0100
-@@ -333,7 +333,7 @@
- if(!strncmp(&String[1], "MeshFormat", 10)) {
-
- fscanf(File_GEO, "%lf %d %d\n", &Version, &Format, &Size);
-- if(Version != 2.0){
-+ if(Version != 2.0 && Version!=2.1){
- Msg(GERROR, "Unknown mesh file version (%g)", Version);
- return;
- }
diff --git a/patches/petsc-solverfile.diff b/patches/petsc-solverfile.diff
deleted file mode 100644
index 48adcc2..0000000
--- a/patches/petsc-solverfile.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: getdp-2.1.0~svn2026/Legacy/LinAlg_PETSC.cpp
-===================================================================
---- getdp-2.1.0~svn2026.orig/Legacy/LinAlg_PETSC.cpp 2010-10-18 10:44:08.000000000 +0200
-+++ getdp-2.1.0~svn2026/Legacy/LinAlg_PETSC.cpp 2010-10-18 10:46:48.000000000 +0200
-@@ -25,6 +25,10 @@
- #include <slepc.h>
- #endif
-
-+extern char *Name_Path;
-+static const char *Name_SolverFile = NULL, *Name_DefaultSolverFile = "solver.par" ;
-+static char *SolverOptions[100];
-+
- // Johan, we curse you for a thousand generations!
- #include "ProData.h"
- #include "DofData.h"
-@@ -96,6 +100,33 @@
-
- void LinAlg_CreateSolver(gSolver *Solver, const char *SolverDataFileName)
- {
-+ char FileName[256];
-+
-+ strcpy(FileName, Name_Path);
-+
-+ if(SolverDataFileName){
-+ // name in .pro file
-+ if(SolverDataFileName[0] == '/' || SolverDataFileName[0] == '\\'){
-+ // -> absolute if it starts with / or \
-+ strcpy(FileName, SolverDataFileName);
-+ }
-+ else{
-+ // -> relative otherwise
-+ strcat(FileName, SolverDataFileName);
-+ }
-+ }
-+ else if (Name_SolverFile){
-+ // name on command line -> always absolute
-+ strcpy(FileName, Name_SolverFile);
-+ }
-+ else{
-+ // default file name -> always relative
-+ strcat(FileName, Name_DefaultSolverFile);
-+ }
-+
-+ Msg::Info("Loading parameter file '%s'", FileName);
-+ PetscOptionsInsertFile(PETSC_COMM_WORLD, FileName, PETSC_FALSE);
-+
- for(int i = 0; i < 10; i++) Solver->ksp[i] = NULL;
- }
-
diff --git a/patches/petsc3.1.diff b/patches/petsc3.1.diff
deleted file mode 100644
index d28201b..0000000
--- a/patches/petsc3.1.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: getdp-2.0.0/Legacy/Pos_Format.cpp
-===================================================================
---- getdp-2.0.0.orig/Legacy/Pos_Format.cpp 2010-06-18 09:12:31.000000000 +0200
-+++ getdp-2.0.0/Legacy/Pos_Format.cpp 2010-06-18 09:21:03.000000000 +0200
-@@ -48,7 +48,7 @@
- static List_T *SL = NULL, *VL = NULL, *TL = NULL;
- static List_T *ST = NULL, *VT = NULL, *TT = NULL;
- static List_T *SQ = NULL, *VQ = NULL, *TQ = NULL;
--static List_T *SS = NULL, *VS = NULL, *TS = NULL;
-+static List_T *SS = NULL, *VS = NULL, *TS_getdp = NULL;
- static List_T *SH = NULL, *VH = NULL, *TH = NULL;
- static List_T *SI = NULL, *VI = NULL, *TI = NULL;
- static List_T *SY = NULL, *VY = NULL, *TY = NULL;
-@@ -350,7 +350,7 @@
- List_WriteToFile(SQ, PostStream, f); List_WriteToFile(VQ, PostStream, f);
- List_WriteToFile(TQ, PostStream, f);
- List_WriteToFile(SS, PostStream, f); List_WriteToFile(VS, PostStream, f);
-- List_WriteToFile(TS, PostStream, f);
-+ List_WriteToFile(TS_getdp, PostStream, f);
- List_WriteToFile(SH, PostStream, f); List_WriteToFile(VH, PostStream, f);
- List_WriteToFile(TH, PostStream, f);
- List_WriteToFile(SI, PostStream, f); List_WriteToFile(VI, PostStream, f);
-@@ -595,7 +595,7 @@
- if(!TQ) TQ = List_Create(100,1000,sizeof(double)); else List_Reset(TQ);
- if(!SS) SS = List_Create(100,1000,sizeof(double)); else List_Reset(SS);
- if(!VS) VS = List_Create(100,1000,sizeof(double)); else List_Reset(VS);
-- if(!TS) TS = List_Create(100,1000,sizeof(double)); else List_Reset(TS);
-+ if(!TS_getdp) TS_getdp = List_Create(100,1000,sizeof(double)); else List_Reset(TS_getdp);
- if(!SH) SH = List_Create(100,1000,sizeof(double)); else List_Reset(SH);
- if(!VH) VH = List_Create(100,1000,sizeof(double)); else List_Reset(VH);
- if(!TH) TH = List_Create(100,1000,sizeof(double)); else List_Reset(TH);
diff --git a/patches/series b/patches/series
index bfcc5e3..30a6920 100644
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1,2 @@
Makefile.diff
configure.diff
-#petsc3.1.diff
-#petsc-solverfile.diff
diff --git a/rules b/rules
index cb24ffc..c511c7e 100755
--- a/rules
+++ b/rules
@@ -18,45 +18,29 @@ export SLEPC_DIR=/usr/lib/slepcdir/3.1
#DEB_MAKE_ENVVARS := -j2
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-metis
-DEB_CONFIGURE_SCRIPT_ENV += F77="gfortran"
+#DEB_CONFIGURE_EXTRA_FLAGS := --enable-metis
+DEB_CONFIGURE_EXTRA_FLAGS :=
+DEB_CONFIGURE_SCRIPT_ENV += F77="gfortran"
DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
-build/getdp::
- cd doc/texinfo && $(MAKE) pdf html info LC_ALL=C
-
install/getdp::
- mkdir -p debian/tmp/usr/share/doc/getdp
- install -m 644 doc/getdp.html debian/tmp/usr/share/doc/getdp
- mkdir -p debian/tmp/usr/share/doc/getdp/demos
- install -m 644 demos/* debian/tmp/usr/share/doc/getdp/demos
- rm debian/tmp/usr/share/doc/getdp/demos/Makefile
-
- # install doc
- cd doc/texinfo && $(MAKE) install-info LC_ALL=C DESTDIR=$(CURDIR)/debian/tmp
+ echo "installing getdp"
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ cd doc/texinfo && $(MAKE) pdf html info LC_ALL=C
+ cd doc/texinfo && $(MAKE) install-info DESTDIR=$(CURDIR)/debian/tmp
install/getdp-sparskit::
- # unset PETSC var
- export PETSC_DIR=''
- export PETSC_ARCH=''
- export SLEPC_DIR=''
-
- # remove config cache
- rm -rf autom4te.cache
-
- # rebuild getdp with sparskit support
+ echo "installing getdp-sparskit"
make clean
- $(DEB_CONFIGURE_INVOKE) $(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(DEB_CONFIGURE_USER_FLAGS) --enable-sparskit
- $(MAKE)
-
- # install getdp with sparskit
+ rm -rf Common/GetDPVersion.h
+ rm -rf Common/GetDPConfig.h
+ $(DEB_CONFIGURE_INVOKE) $(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(DEB_CONFIGURE_USER_FLAGS) --enable-sparskit --disable-gmsh
+ $(MAKE)
+
mv bin/getdp bin/getdp-sparskit
- mkdir -p debian/tmp/usr/bin
- install bin/getdp-sparskit debian/tmp/usr/bin
- mkdir -p debian/tmp/usr/share/man/man1
- install -m 644 debian/getdp-sparskit.1 debian/tmp/usr/share/man/man1
+
clean::
find . \( -name "*.o" -o -name "*.a" \) -delete
rm -rf bin/getdp bin/getdp-sparskit
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/getdp.git
More information about the debian-science-commits
mailing list