ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-06-06 03:17:50 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for Windows (thanks to Nabil)

Browse Source
This commit is contained in:
Christophe Bourcier 2022-11-21 14:26:17 +01:00
parent f965fc00ca
commit 9a135df699
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -2861,14 +2861,15 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateDualMesh(SMESH::SMESH_IDSource_ptr mesh
ats = "False"; ats = "False";
std::string cmd="import salome.smesh.smesh_tools as smt\n"; std::string cmd="import salome.smesh.smesh_tools as smt\n";
cmd +="smt.smesh_create_dual_mesh(\"" + mesh_ior + "\", \"" + cmd +="smt.smesh_create_dual_mesh(\"" + mesh_ior + "\", r\"" +
dual_mesh_file.string() + "\", mesh_name=\"" + mesh_name + "\", adapt_to_shape=" + ats + ")"; dual_mesh_file.string() + "\", mesh_name=\"" + mesh_name + "\", adapt_to_shape=" + ats + ")";
MESSAGE(cmd); MESSAGE(cmd);
PyObject *py_main = PyImport_AddModule("__main__"); PyObject *py_main = PyImport_AddModule("__main__");
PyObject *py_dict = PyModule_GetDict(py_main); PyObject *py_dict = PyModule_GetDict(py_main);
PyObject *local_dict = PyDict_New();
PyRun_String(cmd.c_str(), Py_file_input, py_dict, py_dict); PyRun_String(cmd.c_str(), Py_file_input, py_dict, local_dict);
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
// Restrieving python error // Restrieving python error

2
test/SMESH_create_dual_mesh_adapt.py
View File

@ -85,6 +85,8 @@ dual_Mesh_1 = smesh.CreateDualMesh(Mesh_1, 'dual_Mesh_1', True)
#Comparing volumes #Comparing volumes
dual_volume = dual_Mesh_1.GetVolume() dual_volume = dual_Mesh_1.GetVolume()
dual_raw_volume = dual_Mesh_raw_1.GetVolume() dual_raw_volume = dual_Mesh_raw_1.GetVolume()
tetra_volume = Mesh_1.GetVolume()
print("tetra_volume: ", tetra_volume)
print("dual_volume: ", dual_volume) print("dual_volume: ", dual_volume)
print("dual_raw_volume: ", dual_raw_volume) print("dual_raw_volume: ", dual_raw_volume)

4
test/SMESH_create_dual_mesh_tpipe.py
View File

@ -106,7 +106,7 @@ assert dual_Mesh_raw_1.NbPolyhedrons() == dual_Mesh_raw_1.NbVolumes()
# Check dual mesh volume # Check dual mesh volume
dual_raw_volume = dual_Mesh_raw_1.GetVolume() dual_raw_volume = dual_Mesh_raw_1.GetVolume()
assert abs(dual_raw_volume-shape_volume)/shape_volume < 0.12 assert abs(dual_raw_volume-shape_volume)/shape_volume < 0.14
# Check groups # Check groups
dual_Mesh_raw_groups = dual_Mesh_raw_1.GetGroups() dual_Mesh_raw_groups = dual_Mesh_raw_1.GetGroups()
@ -125,7 +125,7 @@ print("dual_volume: ", dual_volume)
print("dual_raw_volume: ", dual_raw_volume) print("dual_raw_volume: ", dual_raw_volume)
assert (dual_volume >= dual_raw_volume) assert (dual_volume >= dual_raw_volume)
assert abs(dual_volume-shape_volume)/shape_volume < 0.12 assert abs(dual_volume-shape_volume)/shape_volume < 0.14
# Check groups # Check groups
dual_Mesh_groups = dual_Mesh_1.GetGroups() dual_Mesh_groups = dual_Mesh_1.GetGroups()