[code-saturne] 21/70: with mpi
Gilles Filippini
pini at debian.org
Sun Jan 18 22:33:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository code-saturne.
commit 1da8a2087c8b53ef1e2a81c047f4a0a68ece0a7e
Author: Sylvestre Ledru <sylvestre at debian.org>
Date: Sat Feb 19 12:01:03 2011 +0000
with mpi
---
debian/changelog | 5 +-
debian/control | 2 +-
debian/patches/cs-20rc1.diff | 115 -------------------------------------------
debian/rules | 7 ++-
debian/watch | 2 +-
5 files changed, 9 insertions(+), 122 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8e72f16..943a9e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-code-saturne (2.0.0.rc1-6) unstable; urgency=low
+code-saturne (2.0.1-1) unstable; urgency=low
+ * New upstream release
* Switch to dpkg-source 3.0 (quilt) format
+ * watch file updated
+ * Repack script updated
-- Sylvestre Ledru <sylvestre at debian.org> Tue, 08 Feb 2011 18:17:01 +0100
diff --git a/debian/control b/debian/control
index 24d155c..b0e73c0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre at debian.org>
Build-Depends: debhelper (>= 7), autotools-dev, cdbs, libbft-dev (>= 1.1.4),
- libfvm-dev (>= 0.15.2), libmei-dev (>= 1.0.1), python-qt4, pyqt4-dev-tools,
+ libfvm-dev (>= 0.15.2-2), libmei-dev (>= 1.0.1), python-qt4, pyqt4-dev-tools,
texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra,
fig2ps, syrthes, ecs (>= 2.0.1), gfortran, autoconf,
# To help the configure detection on cs lib
diff --git a/debian/patches/cs-20rc1.diff b/debian/patches/cs-20rc1.diff
deleted file mode 100644
index 247dbb4..0000000
--- a/debian/patches/cs-20rc1.diff
+++ /dev/null
@@ -1,115 +0,0 @@
-Index: ChangeLog
-===================================================================
---- ChangeLog (révision 1344)
-+++ ChangeLog (copie de travail)
-@@ -1,6 +1,31 @@
--* 18/02/2010 - David Monfort <david.monfort at edf.fr>
-+* 19/02/2010 - David Monfort <david.monfort at edf.fr>
- Release of Code_Saturne 2.0-rc1.
-
-+* 19/02/2010 - David Monfort <david.monfort at edf.fr>
-+ Remove a line introduced twice in the arguments of usray4.
-+ modified routine:
-+ src/rayt/raycli.f90
-+
-+* 19/02/2010 - David Monfort <david.monfort at edf.fr>
-+ Add Clamart 2 cluster "scratchdir" to the list of the temporary directories.
-+ modified scripts:
-+ bin/runcase.in
-+ bin/runcase.py.in
-+
-+* 19/02/2010 - Yvan Fournier <yvan.fournier at edf.fr>
-+ Fix a bug in handling FVM long-gnum option in the restart files.
-+ modified routine:
-+ src/base/cs_io.c
-+
-+* 19/02/2010 - David Monfort <david.monfort at edf.fr>
-+ Fix last-minute bug where the number of arguments of a subroutine did not
-+ match (with no impact on the calculation).
-+ modified routine:
-+ src/cfbl/cfvarp.f90
-+
-+* 18/02/2010 - David Monfort <david.monfort at edf.fr>
-+ Pre-release of Code_Saturne 2.0-rc1.
-+
- * 18/02/2010 - Pierre Plion <pierre.plion at edf.fr>
- Improve combustion documentation in the theory manual.
- added files:
-Index: src/rayt/raycli.f90
-===================================================================
---- src/rayt/raycli.f90 (révision 1344)
-+++ src/rayt/raycli.f90 (copie de travail)
-@@ -722,7 +722,6 @@
- dt , rtp , rtpa , propce , propfa , propfb , &
- coefa , coefb , &
- w1 , w2 , w3 , w4 , w5 , w6 , &
-- rdevel , rtuser , &
- propfb(1,ipprob(itparo)) , tbord , tempk , &
- ! Resultat : T en K
- rdevel , rtuser , &
-Index: src/cfbl/cfvarp.f90
-===================================================================
---- src/cfbl/cfvarp.f90 (révision 1344)
-+++ src/cfbl/cfvarp.f90 (copie de travail)
-@@ -144,12 +144,12 @@
- ii , ii , ii , ii , &
- iit , iit , iit , iit , iit , &
- iit , iit , iit , iit , &
-- iit , iit , iit , iit , &
-+ iit , iit , iit , &
- dblpre , dblpre , dblpre , dblpre , dblpre , dblpre , dblpre , &
- dblpre , dblpre , dblpre , dblpre , dblpre , dblpre , &
- dblpre , dblpre , &
- dblpre , dblpre , dblpre , dblpre , &
-- dblpre , dblpre , dblpre , dblpre )
-+ dblpre , dblpre , dblpre )
-
- ! --> Utilisation d'un flux de masse specifique pour la vitesse
-
-Index: src/base/cs_io.c
-===================================================================
---- src/base/cs_io.c (révision 1344)
-+++ src/base/cs_io.c (copie de travail)
-@@ -1937,7 +1937,7 @@
- break;
- case FVM_INT64:
- outp->type_name[0] = 'i';
-- outp->type_name[1] = '4';
-+ outp->type_name[1] = '8';
- break;
- case FVM_UINT32:
- outp->type_name[0] = 'u';
-@@ -1945,7 +1945,7 @@
- break;
- case FVM_UINT64:
- outp->type_name[0] = 'u';
-- outp->type_name[1] = '4';
-+ outp->type_name[1] = '8';
- break;
- case FVM_CHAR:
- outp->type_name[0] = 'c';
-Index: bin/runcase.py.in
-===================================================================
---- bin/runcase.py.in (révision 1344)
-+++ bin/runcase.py.in (copie de travail)
-@@ -205,6 +205,7 @@
- user = os.getenv('USER')
-
- exec_prefix_prefs = [os.getenv('SCRATCHDIR'),
-+ os.path.join('/scratch', user),
- os.path.join('/local00/users', user),
- os.path.join('/local01/users', user)]
-
-Index: bin/runcase.in
-===================================================================
---- bin/runcase.in (révision 1344)
-+++ bin/runcase.in (copie de travail)
-@@ -315,6 +315,8 @@
- # On the CCRT, there is no TMPDIR. We work by default in SCRATCHDIR
- if [ "$SCRATCHDIR" != "" ] ; then
- RUN=$SCRATCHDIR/tmp_Saturne/$STUDY.$CASE.$DATE
-+ elif [ -d "/scratch/$USER" ] ; then
-+ RUN=/scratch/$USER/tmp_Saturne/$STUDY.$CASE.$DATE
- #
- elif [ "$TMPDIR" != "" -a "$TMPDIR" != "/tmp" ] ; then
- RUN=$TMPDIR/tmp_Saturne/$STUDY.$CASE.$DATE
diff --git a/debian/rules b/debian/rules
index 658b43c..a7e4f30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,14 +5,13 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_USER_FLAGS := --with-syrthes=/usr/lib/syrthes/3.4.2 --with-mpi=/usr/lib/openmpi
+DEB_CONFIGURE_USER_FLAGS := --with-syrthes=/usr/lib/syrthes/3.4.2 --with-mpi CFLAGS="-I/usr/lib/openmpi/include/"
DEB_MAKE_BUILD_TARGET := all pdf
DEB_MAKE_INSTALL_TARGET := install install-pdf DESTDIR=`pwd`/debian/tmp
DEB_COMPRESS_EXCLUDE := .pdf
-debian/stamp-autotools-files:
- autoconf
- touch $@
+binary-install/code-saturne-bin::
+ chrpath -d debian/code-saturne-bin/usr/bin/cs_solver
binary-install/code-saturne-data::
find debian/code-saturne-data/ -name '*.pyc' -exec rm '{}' ';'
diff --git a/debian/watch b/debian/watch
index 3011b65..7ec66ee 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
-http://research.edf.com/research-and-the-scientific-community/softwares/code-saturne/download-80059.html \
+http://research.edf.com/research-and-the-scientific-community/softwares/code-saturne/download-code-saturne-80059.html \
.*/ncs-(\d)(\d)(\d)\.zip debian debian/orig-tar.sh
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/code-saturne.git
More information about the debian-science-commits
mailing list