r36950 - in /packages/getdp/trunk/debian: changelog control patches/Makefile.patch patches/petsc-solverfile.diff patches/series source/ source/format

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Mon Oct 18 08:38:15 2010
New Revision: 36950

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36950
Log:
update to 2.1.0 rev 2026

Added:
    packages/getdp/trunk/debian/patches/petsc-solverfile.diff
    packages/getdp/trunk/debian/source/
    packages/getdp/trunk/debian/source/format
Removed:
    packages/getdp/trunk/debian/patches/Makefile.patch
Modified:
    packages/getdp/trunk/debian/changelog
    packages/getdp/trunk/debian/control
    packages/getdp/trunk/debian/patches/series

Modified: packages/getdp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/changelog?rev=36950&op=diff
==============================================================================
--- packages/getdp/trunk/debian/changelog (original)
+++ packages/getdp/trunk/debian/changelog Mon Oct 18 08:38:15 2010
@@ -1,3 +1,9 @@
+getdp (2.1.0~svn2026-1) unstable; urgency=low
+
+  * Update to svn rev 2026
+
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Mon, 18 Oct 2010 09:35:33 +0200
+
 getdp (2.0.0-1) unstable; urgency=low
 
   * Initial release (Closes: #502615)

Modified: packages/getdp/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/control?rev=36950&op=diff
==============================================================================
--- packages/getdp/trunk/debian/control (original)
+++ packages/getdp/trunk/debian/control Mon Oct 18 08:38:15 2010
@@ -3,7 +3,8 @@
 Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
-Build-Depends: quilt, cdbs, debhelper (>= 7), autotools-dev, automake, autoconf, gfortran, libarpack2-dev, libgsl0-dev, libscotchmetis-dev, libpetsc3.1-dev, libhdf5-openmpi-dev (>= 1.8.4)
+Build-Depends: quilt, cdbs, debhelper (>= 7), autotools-dev, automake, autoconf, gfortran, mpi-default-dev,
+ libarpack2-dev, libgsl0-dev, libscotchmetis-dev, libpetsc3.1-dev, libhdf5-openmpi-dev (>= 1.8.4), gmsh
 Standards-Version: 3.9.1
 Homepage: http://www.geuz.org/getdp
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/getdp/trunk/

Added: packages/getdp/trunk/debian/patches/petsc-solverfile.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/patches/petsc-solverfile.diff?rev=36950&op=file
==============================================================================
--- packages/getdp/trunk/debian/patches/petsc-solverfile.diff (added)
+++ packages/getdp/trunk/debian/patches/petsc-solverfile.diff Mon Oct 18 08:38:15 2010
@@ -1,0 +1,47 @@
+Index: getdp-2.1.0~svn2026/Legacy/LinAlg_PETSC.cpp
+===================================================================
+--- getdp-2.1.0~svn2026.orig/Legacy/LinAlg_PETSC.cpp	2010-10-18 10:23:51.000000000 +0200
++++ getdp-2.1.0~svn2026/Legacy/LinAlg_PETSC.cpp	2010-10-18 10:26:33.000000000 +0200
+@@ -25,6 +25,8 @@
+ #include <slepc.h>
+ #endif
+ 
++extern char *Name_Path;
++
+ // Johan, we curse you for a thousand generations!
+ #include "ProData.h"
+ #include "DofData.h"
+@@ -96,6 +98,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;
+ }
+ 

Modified: packages/getdp/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/patches/series?rev=36950&op=diff
==============================================================================
--- packages/getdp/trunk/debian/patches/series (original)
+++ packages/getdp/trunk/debian/patches/series Mon Oct 18 08:38:15 2010
@@ -1,3 +1,4 @@
 Makefile.diff
 configure.diff
-petsc3.1.diff
+#petsc3.1.diff
+petsc-solverfile.diff

Added: packages/getdp/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/source/format?rev=36950&op=file
==============================================================================
--- packages/getdp/trunk/debian/source/format (added)
+++ packages/getdp/trunk/debian/source/format Mon Oct 18 08:38:15 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)