FEM: ccx writer, use the new Abaqus writer parameter and fix unit test

berndhahnebach · Nov 25, 2017 · 2ee7245 · 2ee7245
1 parent f271e52
commit 2ee7245
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/src/Mod/Fem/FemInputWriterCcx.py b/src/Mod/Fem/FemInputWriterCcx.py
@@ -77,7 +77,7 @@ def write_calculix_input_file(self):
 
     def write_calculix_one_input_file(self):
         timestart = time.clock()
-        self.femmesh.writeABAQUS(self.file_name)
+        self.femmesh.writeABAQUS(self.file_name, 1, False)
 
         # reopen file with "append" and add the analysis definition
         inpfile = open(self.file_name, 'a')
@@ -180,7 +180,7 @@ def write_calculix_splitted_input_file(self):
         name = self.file_name[:-4]
         include_name = self.main_file_name[:-4]
 
-        self.femmesh.writeABAQUS(name + "_Node_Elem_sets.inp")
+        self.femmesh.writeABAQUS(name + "_Node_Elem_sets.inp", 1, False)
         inpfileNodesElem = open(name + "_Node_Elem_sets.inp", 'a')
         inpfileNodesElem.write('\n***********************************************************\n')
         inpfileNodesElem.close()

diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py
@@ -144,7 +144,7 @@ def test_writeAbaqus_precision(self):
         seg2.addEdge([1, 2])
 
         inp_file = temp_dir + '/seg2_mesh.inp'
-        seg2.writeABAQUS(inp_file)
+        seg2.writeABAQUS(inp_file, 1, False)
 
         read_file = open(inp_file, 'r')
         read_node_line = 'line was not found'

diff --git a/src/Mod/Fem/test_files/ccx/Flow1D_thermomech.inp b/src/Mod/Fem/test_files/ccx/Flow1D_thermomech.inp
@@ -1,4 +1,5 @@
 ** written by FreeCAD inp file writer for CalculiX,Abaqus meshes
+** highest dimension mesh elements only.
 
 ** Nodes
 *Node, NSET=Nall

diff --git a/src/Mod/Fem/test_files/ccx/cube_frequency.inp b/src/Mod/Fem/test_files/ccx/cube_frequency.inp
@@ -1,4 +1,5 @@
 ** written by FreeCAD inp file writer for CalculiX,Abaqus meshes
+** highest dimension mesh elements only.
 
 ** Nodes
 *Node, NSET=Nall

diff --git a/src/Mod/Fem/test_files/ccx/cube_static.inp b/src/Mod/Fem/test_files/ccx/cube_static.inp
@@ -1,4 +1,5 @@
 ** written by FreeCAD inp file writer for CalculiX,Abaqus meshes
+** highest dimension mesh elements only.
 
 ** Nodes
 *Node, NSET=Nall

diff --git a/src/Mod/Fem/test_files/ccx/spine_thermomech.inp b/src/Mod/Fem/test_files/ccx/spine_thermomech.inp
@@ -1,4 +1,5 @@
 ** written by FreeCAD inp file writer for CalculiX,Abaqus meshes
+** highest dimension mesh elements only.
 
 ** Nodes
 *Node, NSET=Nall