From 57a8fddba0ff9fed9df6acb192c5fd20e1bb79ca Mon Sep 17 00:00:00 2001 From: looooo Date: Mon, 4 Jun 2018 10:02:09 +0200 Subject: [PATCH] Fem: fenics: py3-fixes --- src/Mod/Fem/App/FemMeshPyImp.cpp | 4 ++-- src/Mod/Fem/femsolver/fenics/fenics_tools.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Mod/Fem/App/FemMeshPyImp.cpp b/src/Mod/Fem/App/FemMeshPyImp.cpp index b361e0dba1..67c8373737 100644 --- a/src/Mod/Fem/App/FemMeshPyImp.cpp +++ b/src/Mod/Fem/App/FemMeshPyImp.cpp @@ -929,7 +929,7 @@ PyObject* FemMeshPy::getGroupName(PyObject *args) if (!PyArg_ParseTuple(args, "i", &id)) return 0; #if PY_MAJOR_VERSION >= 3 - return PyBytes_FromString(getFemMeshPtr()->getSMesh()->GetGroup(id)->GetName()); + return PyUnicode_FromString(getFemMeshPtr()->getSMesh()->GetGroup(id)->GetName()); #else return PyString_FromString(getFemMeshPtr()->getSMesh()->GetGroup(id)->GetName()); #endif @@ -954,7 +954,7 @@ PyObject* FemMeshPy::getGroupElementType(PyObject *args) default : typeString = "Unknown"; break; } #if PY_MAJOR_VERSION >= 3 - return PyBytes_FromString(typeString); + return PyUnicode_FromString(typeString); #else return PyString_FromString(typeString); #endif diff --git a/src/Mod/Fem/femsolver/fenics/fenics_tools.py b/src/Mod/Fem/femsolver/fenics/fenics_tools.py index ba5850368b..5dea7c919c 100644 --- a/src/Mod/Fem/femsolver/fenics/fenics_tools.py +++ b/src/Mod/Fem/femsolver/fenics/fenics_tools.py @@ -50,7 +50,7 @@ else: xdmffile.read(self.mesh) self.markers = {} self.dx = {} - for (key, value) in self.group_value_dict.iteritems(): + for (key, value) in self.group_value_dict.items(): # Fenics interface here: create cell function of type int for every group # TODO: examine whether int is appropriate or this class could be generalized self.markers[key] = fenics.CellFunction("size_t", self.mesh) @@ -60,7 +60,7 @@ else: def eval_cell(self, values, x, cell): values_list = [] - for (key, func) in self.group_value_dict.iteritems(): + for (key, func) in self.group_value_dict.items(): if self.check_marked(self.markers[key][cell.index]): values_list.append(func(x)) if values_list: @@ -96,7 +96,7 @@ else: self.marked = {} self.ds = {} self.bcs = {} - for (key, value) in self.group_value_dict.iteritems(): + for (key, value) in self.group_value_dict.items(): # Fenics interface here: create facet function of type size_t (positive int) for every group # TODO: examine whether size_t is appropriate or this class could be generalized self.markers[key] = fenics.FacetFunction("size_t", self.mesh) @@ -108,7 +108,7 @@ else: def getDirichletBCs(self, vectorspace, *args, **kwargs): dbcs = [] - for (dict_key, dict_value) in self.bcs.iteritems(): + for (dict_key, dict_value) in self.bcs.items(): if dict_value["type"] == 'Dirichlet': bc = fenics.DirichletBC(vectorspace, dict_value["value"], self.markers[dict_key], dict_value.get("marked", 1), *args, **kwargs) dbcs.append(bc)