From 01aad7a5040760744b3af81014bf50b505834d7a Mon Sep 17 00:00:00 2001 From: GERALD NICOLAS Date: Thu, 15 Apr 2021 14:20:03 +0200 Subject: [PATCH] =?utf8?q?R=C3=A9f=C3=A9rence?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/Tools/blocFissure/CasTests/disquePerce.py | 10 +++++----- src/Tools/blocFissure/gmu/fissureCoude.py | 18 ++++++++++-------- .../blocFissure/gmu/getStatsMaillageFissure.py | 12 +++++++----- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/Tools/blocFissure/CasTests/disquePerce.py b/src/Tools/blocFissure/CasTests/disquePerce.py index 7cb18872f..368cdc555 100644 --- a/src/Tools/blocFissure/CasTests/disquePerce.py +++ b/src/Tools/blocFissure/CasTests/disquePerce.py @@ -38,12 +38,12 @@ dicoParams = dict(nomCas = 'disque', # --------------------------------------------------------------------------- referencesMaillageFissure = dict ( \ + Entity_Quad_Edge = 376, \ Entity_Quad_Quadrangle = 2748, \ Entity_Quad_Hexa = 6232, \ - Entity_Node = 43889, \ - Entity_Quad_Edge = 376, \ - Entity_Quad_Triangle = 1366, \ - Entity_Quad_Tetra = 9112, \ + Entity_Node = 43479, \ + Entity_Quad_Triangle = 1340, \ + Entity_Quad_Tetra = 8821, \ Entity_Quad_Pyramid = 466, \ Entity_Quad_Penta = 448 \ - ) + ) diff --git a/src/Tools/blocFissure/gmu/fissureCoude.py b/src/Tools/blocFissure/gmu/fissureCoude.py index 47ebf1134..ad1154e5f 100644 --- a/src/Tools/blocFissure/gmu/fissureCoude.py +++ b/src/Tools/blocFissure/gmu/fissureCoude.py @@ -687,11 +687,13 @@ class fissureCoude(fissureGenerique): # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): - self.referencesMaillageFissure = dict(Entity_Node = 77917, - Entity_Quad_Edge = 975, - Entity_Quad_Triangle = 2182, - Entity_Quad_Quadrangle = 6842, - Entity_Quad_Tetra = 20135, - Entity_Quad_Hexa = 8994, - Entity_Quad_Penta = 972, - Entity_Quad_Pyramid = 1038) + self.referencesMaillageFissure = dict( \ + Entity_Quad_Edge = 975, \ + Entity_Quad_Quadrangle = 6842, \ + Entity_Quad_Hexa = 8994, \ + Entity_Node = 77917, \ + Entity_Quad_Triangle = 2182, \ + Entity_Quad_Tetra = 20135, \ + Entity_Quad_Pyramid = 1038, \ + Entity_Quad_Penta = 972 \ + ) diff --git a/src/Tools/blocFissure/gmu/getStatsMaillageFissure.py b/src/Tools/blocFissure/gmu/getStatsMaillageFissure.py index 49a93052f..3305bac0f 100644 --- a/src/Tools/blocFissure/gmu/getStatsMaillageFissure.py +++ b/src/Tools/blocFissure/gmu/getStatsMaillageFissure.py @@ -64,12 +64,14 @@ def getStatsMaillageFissure(maillage, referencesMaillageFissure, maillageFissure fic_stat.write(text+"\n") text_2 += " {} = {}, \\\n".format(key,d_resu[key]) - # Le nombre de noeuds, de triangles, de tétarèdres ou de pyramides peut varier du fait des algorithmes. On tolère 1% d'écart. - tolerance = 0.01 + # Le nombre de noeuds, de triangles, de tétraèdres ou de pyramides peut varier du fait des algorithmes. On tolère 5% d'écart. + tolerance = 0.05 for key in ('Entity_Node', 'Entity_Quad_Triangle', 'Entity_Quad_Tetra', 'Entity_Quad_Pyramid', 'Entity_Quad_Penta'): - if (d_resu[key] < (1.0 - tolerance)*referencesMaillageFissure[key]) \ - or (d_resu[key] > (1.0 + tolerance)*referencesMaillageFissure[key]): - text = "Ecart" + if d_resu[key] == referencesMaillageFissure[key]: + text = "Valeur_OK" + elif (d_resu[key] < (1.0 - tolerance)*referencesMaillageFissure[key]) \ + or (d_resu[key] > (1.0 + tolerance)*referencesMaillageFissure[key]): + text = "Ecart de plus de {}%".format(tolerance*100.) ok_maillage = False else: text = "Valeur_OK à moins de {}%".format(tolerance*100.) -- 2.30.2