From 5146ec5432f299909ebc57519a3f788c104a1cb7 Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Fri, 24 Apr 2020 08:58:15 +0200
Subject: [PATCH] FEM: ccx input writer, splitted, improve pressure constraint

---
 src/Mod/Fem/femsolver/calculix/writer.py      | 30 +++++++++++--------
 .../ccx/constraint_contact_solid_solid.inp    |  2 +-
 src/Mod/Fem/femtest/data/ccx/cube_static.inp  |  2 +-
 src/Mod/Fem/femtest/data/ccx/mat_multiple.inp |  2 +-
 .../Fem/femtest/data/ccx/mat_nonlinear.inp    |  2 +-
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/Mod/Fem/femsolver/calculix/writer.py b/src/Mod/Fem/femsolver/calculix/writer.py
index 32d37eec1a..294cfd41cd 100644
--- a/src/Mod/Fem/femsolver/calculix/writer.py
+++ b/src/Mod/Fem/femsolver/calculix/writer.py
@@ -229,16 +229,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter):
         self.write_constraints_displacement(inpfileMain)
         self.write_constraints_selfweight(inpfileMain)
         self.write_constraints_force(inpfileMain, True)
-
-        if self.pressure_objects:
-            inpfileMain.write("\n***********************************************************\n")
-            inpfileMain.write("** Element + CalculiX face + load in [MPa]\n")
-            inpfileMain.write("** written by write_constraints_pressure\n")
-            inpfileMain.write("*INCLUDE,INPUT=" + self.mesh_name + "_Pressure.inp \n")
-            inpfilePressure = open(self.include + "_Pressure.inp", "w")
-            self.write_constraints_pressure(inpfilePressure)
-            inpfilePressure.close()
-
+        self.write_constraints_pressure(inpfileMain, True)
         self.write_constraints_temperature(inpfileMain)
 
         if self.analysis_type == "thermomech" and self.heatflux_objects:
@@ -1213,7 +1204,7 @@ class FemInputWriterCcx(writerbase.FemInputWriter):
                 f.write("\n")
             f.write("\n")
 
-    def write_constraints_pressure(self, f):
+    def write_constraints_pressure(self, f, splitted=None):
         if not self.pressure_objects:
             return
         if not (self.analysis_type == "static" or self.analysis_type == "thermomech"):
@@ -1222,10 +1213,23 @@ class FemInputWriterCcx(writerbase.FemInputWriter):
         # get the faces and face numbers
         self.get_constraints_pressure_faces()
 
-        # write face loads to file
+        write_name = "constraints_pressure_element_face_loads"
         f.write("\n***********************************************************\n")
-        f.write("** Element + CalculiX face + load in [MPa]\n")
+        f.write("** {}\n".format(write_name.replace("_", " ")))
         f.write("** written by {} function\n".format(sys._getframe().f_code.co_name))
+
+        if splitted is True:
+            file_name_splitt = self.mesh_name + "_" + write_name + ".inp"
+            f.write("** {}\n".format(write_name.replace("_", " ")))
+            f.write("*INCLUDE,INPUT={}\n".format(file_name_splitt))
+            inpfile_splitt = open(join(self.dir_name, file_name_splitt), "w")
+            self.write_faceloads_constraints_pressure(inpfile_splitt)
+            inpfile_splitt.close()
+        else:
+            self.write_faceloads_constraints_pressure(f)
+
+    def write_faceloads_constraints_pressure(self, f):
+        # write face loads to file
         for femobj in self.pressure_objects:
             # femobj --> dict, FreeCAD document object is femobj["Object"]
             prs_obj = femobj["Object"]
diff --git a/src/Mod/Fem/femtest/data/ccx/constraint_contact_solid_solid.inp b/src/Mod/Fem/femtest/data/ccx/constraint_contact_solid_solid.inp
index 57d3aa4ca5..1e99dbb9cd 100644
--- a/src/Mod/Fem/femtest/data/ccx/constraint_contact_solid_solid.inp
+++ b/src/Mod/Fem/femtest/data/ccx/constraint_contact_solid_solid.inp
@@ -5081,7 +5081,7 @@ ConstraintFixed,3
 
 
 ***********************************************************
-** Element + CalculiX face + load in [MPa]
+** constraints pressure element face loads
 ** written by write_constraints_pressure function
 ** ConstraintPressure
 *DLOAD
diff --git a/src/Mod/Fem/femtest/data/ccx/cube_static.inp b/src/Mod/Fem/femtest/data/ccx/cube_static.inp
index f886615828..27d37eaf9e 100644
--- a/src/Mod/Fem/femtest/data/ccx/cube_static.inp
+++ b/src/Mod/Fem/femtest/data/ccx/cube_static.inp
@@ -559,7 +559,7 @@ FemConstraintFixed,3
 
 
 ***********************************************************
-** Element + CalculiX face + load in [MPa]
+** constraints pressure element face loads
 ** written by write_constraints_pressure function
 ** FemConstraintPressure
 *DLOAD
diff --git a/src/Mod/Fem/femtest/data/ccx/mat_multiple.inp b/src/Mod/Fem/femtest/data/ccx/mat_multiple.inp
index aa87ef3771..763991a0bf 100644
--- a/src/Mod/Fem/femtest/data/ccx/mat_multiple.inp
+++ b/src/Mod/Fem/femtest/data/ccx/mat_multiple.inp
@@ -1251,7 +1251,7 @@ ConstraintFixed,3
 
 
 ***********************************************************
-** Element + CalculiX face + load in [MPa]
+** constraints pressure element face loads
 ** written by write_constraints_pressure function
 ** ConstraintPressure
 *DLOAD
diff --git a/src/Mod/Fem/femtest/data/ccx/mat_nonlinear.inp b/src/Mod/Fem/femtest/data/ccx/mat_nonlinear.inp
index 349f0b98c5..54d65aa482 100644
--- a/src/Mod/Fem/femtest/data/ccx/mat_nonlinear.inp
+++ b/src/Mod/Fem/femtest/data/ccx/mat_nonlinear.inp
@@ -20024,7 +20024,7 @@ ConstraintFixed,3
 
 
 ***********************************************************
-** Element + CalculiX face + load in [MPa]
+** constraints pressure element face loads
 ** written by write_constraints_pressure function
 ** ConstraintPressure
 *DLOAD