Merge branch 'meshsizefilename' into 'master'

add meshsizefilename to python meshingparameters

See merge request !47
This commit is contained in:
Joachim Schöberl 2017-05-18 08:21:34 +02:00
commit f72a247815

View File

@ -687,7 +687,7 @@ DLL_HEADER void ExportNetgenMeshing(py::module &m)
.def(py::init<>()) .def(py::init<>())
.def("__init__", .def("__init__",
[](MP *instance, double maxh, bool quad_dominated, int optsteps2d, int optsteps3d, [](MP *instance, double maxh, bool quad_dominated, int optsteps2d, int optsteps3d,
MESHING_STEP perfstepsend, int only3D_domain) MESHING_STEP perfstepsend, int only3D_domain, const string & meshsizefilename)
{ {
new (instance) MeshingParameters; new (instance) MeshingParameters;
instance->maxh = maxh; instance->maxh = maxh;
@ -696,6 +696,7 @@ DLL_HEADER void ExportNetgenMeshing(py::module &m)
instance->optsteps3d = optsteps3d; instance->optsteps3d = optsteps3d;
instance->only3D_domain_nr = only3D_domain; instance->only3D_domain_nr = only3D_domain;
instance->perfstepsend = perfstepsend; instance->perfstepsend = perfstepsend;
instance->meshsizefilename = meshsizefilename;
}, },
py::arg("maxh")=1000, py::arg("maxh")=1000,
py::arg("quad_dominated")=false, py::arg("quad_dominated")=false,
@ -703,6 +704,7 @@ DLL_HEADER void ExportNetgenMeshing(py::module &m)
py::arg("optsteps3d") = 3, py::arg("optsteps3d") = 3,
py::arg("perfstepsend") = MESHCONST_OPTVOLUME, py::arg("perfstepsend") = MESHCONST_OPTVOLUME,
py::arg("only3D_domain") = 0, py::arg("only3D_domain") = 0,
py::arg("meshsizefilename") = "",
"create meshing parameters" "create meshing parameters"
) )
.def("__str__", &ToString<MP>) .def("__str__", &ToString<MP>)