[aster] 01/01: Add a patch to set the default renumbering algorithm to MD
Denis Laxalde
dlax-guest at moszumanska.debian.org
Wed Nov 12 07:48:00 UTC 2014
This is an automated email from the git hooks/post-receive script.
dlax-guest pushed a commit to branch master
in repository aster.
commit 3405ab353af119265362f782fbe95a9a840d7b5d
Author: Denis Laxalde <denis.laxalde at logilab.fr>
Date: Fri Oct 17 11:07:53 2014 +0200
Add a patch to set the default renumbering algorithm to MD
Since METIS is not available.
---
debian/changelog | 8 +++
...S-into-MD-as-a-default-value-for-the-RENU.patch | 79 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 88 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index a606e69..eb92d60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+aster (11.5.0+dfsg2-4) UNRELEASED; urgency=low
+
+ [ Florent Cayré ]
+ * Add a patch to set the default renumbering algorithm to MD instead of
+ METIS.
+
+ -- Denis Laxalde <denis.laxalde at logilab.fr> Fri, 17 Oct 2014 11:08:18 +0200
+
aster (11.5.0+dfsg2-3) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/0011-Change-METIS-into-MD-as-a-default-value-for-the-RENU.patch b/debian/patches/0011-Change-METIS-into-MD-as-a-default-value-for-the-RENU.patch
new file mode 100644
index 0000000..4a1eb0c
--- /dev/null
+++ b/debian/patches/0011-Change-METIS-into-MD-as-a-default-value-for-the-RENU.patch
@@ -0,0 +1,79 @@
+From: Florent Cayre <florent.cayre at logilab.fr>
+Date: Fri, 17 Oct 2014 09:39:38 +0200
+Subject: Change METIS into MD as a default value for the RENUM property
+
+---
+ bibpyt/Macro/macro_elas_mult_ops.py | 2 +-
+ catapy/commande/assemblage.capy | 2 +-
+ catapy/commande/macro_elas_mult.capy | 2 +-
+ catapy/commande/nume_ddl.capy | 2 +-
+ catapy/commun/c_solveur.capy | 4 ++--
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/bibpyt/Macro/macro_elas_mult_ops.py b/bibpyt/Macro/macro_elas_mult_ops.py
+index e6deb01..b0fb9ad 100755
+--- a/bibpyt/Macro/macro_elas_mult_ops.py
++++ b/bibpyt/Macro/macro_elas_mult_ops.py
+@@ -85,7 +85,7 @@ def macro_elas_mult_ops(self,MODELE,CHAM_MATER,CARA_ELEM,NUME_DDL,
+ motscles['RENUM'] =SOLVEUR['RENUM']
+ else:
+ motscles['METHODE'] ='MULT_FRONT'
+- motscles['RENUM'] ='METIS'
++ motscles['RENUM'] ='MD'
+ if numeddl!=None:
+ self.DeclareOut('num',numeddl)
+ num=NUME_DDL(MATR_RIGI=__nomrig,**motscles)
+diff --git a/catapy/commande/assemblage.capy b/catapy/commande/assemblage.capy
+index b88b6de..d082219 100755
+--- a/catapy/commande/assemblage.capy
++++ b/catapy/commande/assemblage.capy
+@@ -62,7 +62,7 @@ ASSEMBLAGE=MACRO(nom="ASSEMBLAGE",
+ SOLVEUR =FACT(statut='d',
+ METHODE =SIMP(statut='f',typ='TXM',defaut="MULT_FRONT",into=("MULT_FRONT","LDLT","GCPC","MUMPS","PETSC") ),
+ b_mult_front =BLOC(condition="METHODE=='MULT_FRONT'",fr="Paramètres associés à la méthode multifrontale",
+- RENUM =SIMP(statut='f',typ='TXM',into=("MD","MDA","METIS"),defaut="METIS" ),
++ RENUM =SIMP(statut='f',typ='TXM',into=("MD","MDA","METIS"),defaut="MD" ),
+ ),
+ b_ldlt =BLOC(condition="METHODE=='LDLT'",fr="Paramètres associés à la méthode LDLT",
+ RENUM =SIMP(statut='f',typ='TXM',into=("RCMK","SANS"),defaut="RCMK" ),
+diff --git a/catapy/commande/macro_elas_mult.capy b/catapy/commande/macro_elas_mult.capy
+index 9b5eed5..2ea067d 100755
+--- a/catapy/commande/macro_elas_mult.capy
++++ b/catapy/commande/macro_elas_mult.capy
+@@ -55,7 +55,7 @@ MACRO_ELAS_MULT=MACRO(nom="MACRO_ELAS_MULT",
+ METHODE =SIMP(statut='f',typ='TXM',defaut="MULT_FRONT",into=("MULT_FRONT","LDLT") ),
+ b_mult_front = BLOC ( condition = "METHODE == 'MULT_FRONT' ",
+ fr="Paramètres de la méthode multi frontale",
+- RENUM =SIMP(statut='f',typ='TXM',defaut="METIS",into=("MD","MDA","METIS") ),
++ RENUM =SIMP(statut='f',typ='TXM',defaut="MD",into=("MD","MDA","METIS") ),
+ ),
+ b_ldlt =BLOC(condition = "METHODE == 'LDLT' ",fr="Paramètres de la méthode LDLT",
+ RENUM =SIMP(statut='f',typ='TXM',defaut="RCMK",into=("RCMK","SANS") ),
+diff --git a/catapy/commande/nume_ddl.capy b/catapy/commande/nume_ddl.capy
+index 4c54014..30228ac 100755
+--- a/catapy/commande/nume_ddl.capy
++++ b/catapy/commande/nume_ddl.capy
+@@ -28,7 +28,7 @@ NUME_DDL=OPER(nom="NUME_DDL",op=11,sd_prod=nume_ddl_sdaster,reentrant='n',
+ ),
+ METHODE =SIMP(statut='f',typ='TXM',defaut="MULT_FRONT",into=("MULT_FRONT","LDLT","GCPC","PETSC","MUMPS") ),
+ b_mult_front =BLOC(condition="METHODE=='MULT_FRONT'",fr="paramètres associés à la méthode multifrontale",
+- RENUM =SIMP(statut='f',typ='TXM',into=("MD","MDA","METIS"),defaut="METIS" ),
++ RENUM =SIMP(statut='f',typ='TXM',into=("MD","MDA","METIS"),defaut="MD" ),
+ ),
+ b_ldlt =BLOC(condition="METHODE=='LDLT'",fr="paramètres associés à la méthode LDLT",
+ RENUM =SIMP(statut='f',typ='TXM',into=("RCMK","SANS"),defaut="RCMK" ),
+diff --git a/catapy/commun/c_solveur.capy b/catapy/commun/c_solveur.capy
+index a8c9e6b..04e3374 100755
+--- a/catapy/commun/c_solveur.capy
++++ b/catapy/commun/c_solveur.capy
+@@ -228,8 +228,8 @@ def C_SOLVEUR( COMMAND, BASE=None ) : #COMMUN#
+ # ----------------------------------------------------------------------------------------------------------------------------------
+
+ # RENUM
+- _BlocMF['RENUM'] = SIMP(statut='f', typ='TXM', defaut="METIS", into=("MD", "MDA", "METIS", ), )
+- _BlocFE['RENUM'] = SIMP(statut='f', typ='TXM', defaut="METIS", into=("MD", "MDA", "METIS", ), )
++ _BlocMF['RENUM'] = SIMP(statut='f', typ='TXM', defaut="MD", into=("MD", "MDA", "METIS", ), )
++ _BlocFE['RENUM'] = SIMP(statut='f', typ='TXM', defaut="MD", into=("MD", "MDA", "METIS", ), )
+
+ if _rcmk:
+ _into = ("RCMK", "SANS", )
diff --git a/debian/patches/series b/debian/patches/series
index f7b15a6..78c2dfa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
0008-Disable-BLACS-checks.patch
0009-Fix-NumPy-version-comparison.patch
0010-Check-that-DEST_CPU-exists-before-reading-it.patch
+0011-Change-METIS-into-MD-as-a-default-value-for-the-RENU.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/aster.git
More information about the debian-science-commits
mailing list