From ec3b79aa9d2484f4e22ef66f65b317c3ade6564a Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Fri, 6 Aug 2021 09:29:14 +0200
Subject: [PATCH] FEM: z88 tasks and writer, make use of mesh set data getter
 class

---
 src/Mod/Fem/femsolver/z88/tasks.py  | 18 ++++++++++++++++--
 src/Mod/Fem/femsolver/z88/writer.py |  4 ----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/Mod/Fem/femsolver/z88/tasks.py b/src/Mod/Fem/femsolver/z88/tasks.py
index 023e1a6eda..6568b5c4a8 100644
--- a/src/Mod/Fem/femsolver/z88/tasks.py
+++ b/src/Mod/Fem/femsolver/z88/tasks.py
@@ -38,6 +38,7 @@ from . import writer
 from .. import run
 from .. import settings
 from feminout import importZ88O2Results
+from femmesh import meshsetsgetter
 from femtools import femutils
 from femtools import membertools
 
@@ -58,11 +59,24 @@ class Prepare(run.Prepare):
 
     def run(self):
         self.pushStatus("Preparing solver input...\n")
+
+        # get mesh set data
+        # TODO see calculix tasks get mesh set data
+        mesh_obj = membertools.get_mesh_to_solve(self.analysis)[0]  # pre check done already
+        meshdatagetter = meshsetsgetter.MeshSetsGetter(
+            self.analysis,
+            self.solver,
+            mesh_obj,
+            membertools.AnalysisMember(self.analysis),
+        )
+        meshdatagetter.get_mesh_sets()
+
+        # write solver input
         w = writer.FemInputWriterZ88(
             self.analysis,
             self.solver,
-            membertools.get_mesh_to_solve(self.analysis)[0],  # pre check has been done already
-            membertools.AnalysisMember(self.analysis),
+            mesh_obj,
+            meshdatagetter.member,
             self.directory
         )
         path = w.write_solver_input()
diff --git a/src/Mod/Fem/femsolver/z88/writer.py b/src/Mod/Fem/femsolver/z88/writer.py
index 289434c08d..21412d4b25 100644
--- a/src/Mod/Fem/femsolver/z88/writer.py
+++ b/src/Mod/Fem/femsolver/z88/writer.py
@@ -142,8 +142,6 @@ class FemInputWriterZ88(writerbase.FemInputWriter):
         constraints_data = []  # will be a list of tuple for better sorting
 
         # fixed constraints
-        # get nodes
-        self.get_constraints_fixed_nodes()
         # write nodes to constraints_data (different from writing to file in ccxInpWriter
         for femobj in self.fixed_objects:
             for n in femobj["Nodes"]:
@@ -152,8 +150,6 @@ class FemInputWriterZ88(writerbase.FemInputWriter):
                 constraints_data.append((n, "{}  3  2  0\n".format(n)))
 
         # forces constraints
-        # check shape type of reference shape and get node loads
-        self.get_constraints_force_nodeloads()
         # write node loads to constraints_data
         # a bit different from writing to file for ccxInpWriter
         for femobj in self.force_objects: