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

This commit is contained in:
Bernd Hahnebach 2016-09-25 19:36:18 +01:00 committed by Yorik van Havre
parent 33b8593438
commit 33efb04d47
4 changed files with 20 additions and 20 deletions

View File

@ -325,18 +325,18 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter):
# write material properties # write material properties
f.write('** FreeCAD material name: ' + mat_info_name + '\n') f.write('** FreeCAD material name: ' + mat_info_name + '\n')
f.write('*MATERIAL, NAME=' + mat_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)) 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): 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('*DENSITY\n')
f.write('{0:.3e}, \n'.format(density_in_tonne_per_mm3)) f.write('{0:.3e}\n'.format(density_in_tonne_per_mm3))
if self.analysis_type == "thermomech": if self.analysis_type == "thermomech":
f.write('*CONDUCTIVITY \n') f.write('*CONDUCTIVITY\n')
f.write('{0:.3f}, \n'.format(TC_in_WmK)) f.write('{0:.3f}\n'.format(TC_in_WmK))
f.write('*EXPANSION \n') f.write('*EXPANSION\n')
f.write('{0:.3e}, \n'.format(TEC_in_mmK)) f.write('{0:.3e}\n'.format(TEC_in_mmK))
f.write('*SPECIFIC HEAT \n') f.write('*SPECIFIC HEAT\n')
f.write('{0:.3e}, \n'.format(SH_in_JkgK)) f.write('{0:.3e}\n'.format(SH_in_JkgK))
def write_constraints_initialtemperature(self, f): def write_constraints_initialtemperature(self, f):
f.write('\n***********************************************************\n') f.write('\n***********************************************************\n')

View File

@ -471,10 +471,10 @@ Eall
** Density's unit is t/mm^3 ** Density's unit is t/mm^3
** FreeCAD material name: Steel-Generic ** FreeCAD material name: Steel-Generic
*MATERIAL, NAME=MechanicalMaterial *MATERIAL, NAME=MechanicalMaterial
*ELASTIC *ELASTIC
200000, 0.300 200000, 0.300
*DENSITY *DENSITY
7.900e-09, 7.900e-09
*********************************************************** ***********************************************************
** Sections ** Sections

View File

@ -470,7 +470,7 @@ Eall
** Young's modulus unit is MPa = N/mm2 ** Young's modulus unit is MPa = N/mm2
** FreeCAD material name: Steel-Generic ** FreeCAD material name: Steel-Generic
*MATERIAL, NAME=MechanicalMaterial *MATERIAL, NAME=MechanicalMaterial
*ELASTIC *ELASTIC
200000, 0.300 200000, 0.300
*********************************************************** ***********************************************************

View File

@ -102,14 +102,14 @@ Eall
** Specific Heat unit is kJ/t/K = mm^2/s^2/K ** Specific Heat unit is kJ/t/K = mm^2/s^2/K
** FreeCAD material name: Steel-Generic ** FreeCAD material name: Steel-Generic
*MATERIAL, NAME=MechanicalMaterial *MATERIAL, NAME=MechanicalMaterial
*ELASTIC *ELASTIC
200000, 0.300 200000, 0.300
*CONDUCTIVITY *CONDUCTIVITY
43.270, 43.270
*EXPANSION *EXPANSION
1.200e-05, 1.200e-05
*SPECIFIC HEAT *SPECIFIC HEAT
5.000e+08, 5.000e+08
*********************************************************** ***********************************************************
** Initial temperature constraint ** Initial temperature constraint