FEM: ccx input file, remove trailing whitspaces and not needed comma

FreeCAD · Sep 27, 2016 · 33efb04 · 33efb04
1 parent 33b8593
commit 33efb04
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/src/Mod/Fem/FemInputWriterCcx.py b/src/Mod/Fem/FemInputWriterCcx.py
@@ -325,18 +325,18 @@ def write_materials(self, f):
             # write material properties
             f.write('** FreeCAD material name: ' + mat_info_name + '\n')
             f.write('*MATERIAL, NAME=' + mat_name + '\n')
-            f.write('*ELASTIC \n')
+            f.write('*ELASTIC\n')
             f.write('{0:.0f}, {1:.3f}\n'.format(YM_in_MPa, PR))
             if self.analysis_type == "frequency" or self.selfweight_objects or (self.analysis_type == "thermomech" and not self.solver_obj.ThermoMechSteadyState):
-                f.write('*DENSITY \n')
-                f.write('{0:.3e}, \n'.format(density_in_tonne_per_mm3))
+                f.write('*DENSITY\n')
+                f.write('{0:.3e}\n'.format(density_in_tonne_per_mm3))
             if self.analysis_type == "thermomech":
-                f.write('*CONDUCTIVITY \n')
-                f.write('{0:.3f}, \n'.format(TC_in_WmK))
-                f.write('*EXPANSION \n')
-                f.write('{0:.3e}, \n'.format(TEC_in_mmK))
-                f.write('*SPECIFIC HEAT \n')
-                f.write('{0:.3e}, \n'.format(SH_in_JkgK))
+                f.write('*CONDUCTIVITY\n')
+                f.write('{0:.3f}\n'.format(TC_in_WmK))
+                f.write('*EXPANSION\n')
+                f.write('{0:.3e}\n'.format(TEC_in_mmK))
+                f.write('*SPECIFIC HEAT\n')
+                f.write('{0:.3e}\n'.format(SH_in_JkgK))
 
     def write_constraints_initialtemperature(self, f):
         f.write('\n***********************************************************\n')

diff --git a/src/Mod/Fem/test_files/ccx/cube_frequency.inp b/src/Mod/Fem/test_files/ccx/cube_frequency.inp
@@ -471,10 +471,10 @@ Eall
 ** Density's unit is t/mm^3
 ** FreeCAD material name: Steel-Generic
 *MATERIAL, NAME=MechanicalMaterial
-*ELASTIC 
+*ELASTIC
 200000, 0.300
-*DENSITY 
-7.900e-09, 
+*DENSITY
+7.900e-09
 
 ***********************************************************
 ** Sections

diff --git a/src/Mod/Fem/test_files/ccx/cube_static.inp b/src/Mod/Fem/test_files/ccx/cube_static.inp
@@ -470,7 +470,7 @@ Eall
 ** Young's modulus unit is MPa = N/mm2
 ** FreeCAD material name: Steel-Generic
 *MATERIAL, NAME=MechanicalMaterial
-*ELASTIC 
+*ELASTIC
 200000, 0.300
 
 ***********************************************************

diff --git a/src/Mod/Fem/test_files/ccx/spine_thermomech.inp b/src/Mod/Fem/test_files/ccx/spine_thermomech.inp
@@ -102,14 +102,14 @@ Eall
 ** Specific Heat unit is kJ/t/K = mm^2/s^2/K
 ** FreeCAD material name: Steel-Generic
 *MATERIAL, NAME=MechanicalMaterial
-*ELASTIC 
+*ELASTIC
 200000, 0.300
-*CONDUCTIVITY 
-43.270, 
-*EXPANSION 
-1.200e-05, 
-*SPECIFIC HEAT 
-5.000e+08, 
+*CONDUCTIVITY
+43.270
+*EXPANSION
+1.200e-05
+*SPECIFIC HEAT
+5.000e+08
 
 ***********************************************************
 ** Initial temperature constraint