From 9c68cb9dab83c8f6ed5e7a78cdb43e2192f71001 Mon Sep 17 00:00:00 2001 From: Frederic Pons Date: Wed, 5 Apr 2023 18:11:36 +0200 Subject: [PATCH] Fix Compute for Homard --- doc/examples/test_homard_adapt.py | 4 +- doc/examples/test_uniform_refinement.py | 4 +- test/ex30_tepal.py | 98 ------------------------- test/tests.set | 1 - 4 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 test/ex30_tepal.py diff --git a/doc/examples/test_homard_adapt.py b/doc/examples/test_homard_adapt.py index 9f3672b63..0c1d88fe7 100644 --- a/doc/examples/test_homard_adapt.py +++ b/doc/examples/test_homard_adapt.py @@ -40,7 +40,7 @@ smeshhomard.SetLogInFile(True) smeshhomard.SetLogFile(log_file_1) smeshhomard.SetRemoveLogOnSuccess(False) smeshhomard.SetVerboseLevel(3) -if not smeshhomard.Compute(): raise Exception("Error when computing Mesh") +if smeshhomard.Compute() != 0: raise Exception("Error when computing Mesh") if osp.isfile(output_med_1): os.remove(output_med_1) @@ -79,7 +79,7 @@ smeshhomard.SetLogInFile(True) smeshhomard.SetLogFile(log_file_2) smeshhomard.SetRemoveLogOnSuccess(True) smeshhomard.SetVerboseLevel(0) -if not smeshhomard.Compute(): raise Exception("Error when computing Mesh") +if smeshhomard.Compute() != 0: raise Exception("Error when computing Mesh") if osp.isfile(output_med_2): print("Test Uniform refinement Case 2: Error: output med file has not been removed") diff --git a/doc/examples/test_uniform_refinement.py b/doc/examples/test_uniform_refinement.py index b0e12e370..1b362b0e8 100644 --- a/doc/examples/test_uniform_refinement.py +++ b/doc/examples/test_uniform_refinement.py @@ -42,7 +42,7 @@ smeshhomard.SetLogInFile(True) smeshhomard.SetLogFile(log_file_1) smeshhomard.SetRemoveLogOnSuccess(False) smeshhomard.SetVerboseLevel(3) -if not smeshhomard.Compute(): raise Exception("Error when computing Mesh") +if smeshhomard.Compute() != 0: raise Exception("Error when computing Mesh") if osp.isfile(output_med_1): os.remove(output_med_1) @@ -85,7 +85,7 @@ smeshhomard.SetLogInFile(True) smeshhomard.SetLogFile(log_file_2) smeshhomard.SetRemoveLogOnSuccess(True) smeshhomard.SetVerboseLevel(0) -if not smeshhomard.Compute(): raise Exception("Error when computing Mesh") +if smeshhomard.Compute() != 0: raise Exception("Error when computing Mesh") if osp.isfile(output_med_2): print("Test Uniform refinement Case 2: Error: output med file has not been removed") diff --git a/test/ex30_tepal.py b/test/ex30_tepal.py deleted file mode 100644 index f8723b3e1..000000000 --- a/test/ex30_tepal.py +++ /dev/null @@ -1,98 +0,0 @@ -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2022 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# ==================================================================== -# -import os - -import salome -salome.salome_init() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() - -import SMESH, SALOMEDS -from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() - -# Parameters -# ---------- - -results = "/tmp/ZZ" - -radius = 50 -height = 200 - -# Build a cylinder -# ---------------- - -base = geompy.MakeVertex(0, 0, 0) -direction = geompy.MakeVectorDXDYDZ(0, 0, 1) - -cylinder = geompy.MakeCylinder(base, direction, radius, height) - -geompy.addToStudy(cylinder, "Cylinder") - -# Define a mesh on a geometry -# --------------------------- - -smesh.UpdateStudy() - -m = smesh.Mesh(cylinder) - -# 2D mesh with BLSURF -# ------------------- - -algo2d = m.Triangle(smeshBuilder.BLSURF) - -algo2d.SetPhysicalMesh(1) -algo2d.SetPhySize(5) - -algo2d.SetGeometricMesh(0) - -# 3D mesh with tepal -# ------------------ - -algo3d = m.Tetrahedron(smeshBuilder.GHS3DPRL) - -algo3d.SetMEDName(results) -algo3d.SetNbPart(4) -algo3d.SetBackground(False) -algo3d.SetKeepFiles(False) - -# Launch meshers -# -------------- - -status = m.Compute() -if not status: - raise Exception("Error when computing Mesh") - -# Test if ok -# ---------- - -if os.access(results+".xml", os.F_OK): - print("Ok: tepal") -else: - print("KO: tepal") - -# Update object browser -# --------------------- - -salome.sg.updateObjBrowser() diff --git a/test/tests.set b/test/tests.set index 9eecbe094..a3f3b0a00 100644 --- a/test/tests.set +++ b/test/tests.set @@ -67,7 +67,6 @@ SET(BAD_TESTS ) IF(NOT WIN32) LIST(APPEND BAD_TESTS - ex30_tepal.py test_smeshplugin_mg_tetra_parallele.py ) ENDIF(NOT WIN32) -- 2.30.2