kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: ccx tools, remove setting analysis type with the analysis tools, is done in solver object

Browse Source
This commit is contained in:
Bernd Hahnebach
2018-02-07 13:32:16 +01:00
committed by wmayer
parent b99cc55a6b
commit d0b5798ae4
8 changed files with 21 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Fem/femsolver/calculix/tasks.py
View File

@@ -67,7 +67,7 @@ class Prepare(run.Prepare):
c.pressure_constraints, c.temperature_constraints,
c.heatflux_constraints, c.initialtemperature_constraints,
c.beam_sections, c.beam_rotations, c.shell_thicknesses, c.fluid_sections,
self.solver.AnalysisType, self.directory)
self.directory)
path = w.write_calculix_input_file()
# report to user if task succeeded
if path is not None:

4
src/Mod/Fem/femsolver/calculix/writer.py
View File

@@ -46,7 +46,7 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter):
selfweight_obj, force_obj, pressure_obj,
temperature_obj, heatflux_obj, initialtemperature_obj,
beamsection_obj, beamrotation_obj, shellthickness_obj, fluidsection_obj,
analysis_type=None, dir_name=None
dir_name=None
):
FemInputWriter.FemInputWriter.__init__(
@@ -58,7 +58,7 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter):
selfweight_obj, force_obj, pressure_obj,
temperature_obj, heatflux_obj, initialtemperature_obj,
beamsection_obj, beamrotation_obj, shellthickness_obj, fluidsection_obj,
analysis_type, dir_name)
dir_name)
# self.dir_name does have a slash at the end
self.main_file_name = self.mesh_object.Name + '.inp'
self.file_name = self.dir_name + self.main_file_name

4
src/Mod/Fem/femsolver/writerbase.py
View File

@@ -41,10 +41,11 @@ class FemInputWriter():
selfweight_obj, force_obj, pressure_obj,
temperature_obj, heatflux_obj, initialtemperature_obj,
beamsection_obj, beamrotation_obj, shellthickness_obj, fluidsection_obj,
analysis_type, dir_name
dir_name
):
self.analysis = analysis_obj
self.solver_obj = solver_obj
self.analysis_type = self.solver_obj.AnalysisType
self.mesh_object = mesh_obj
self.material_objects = matlin_obj
self.material_nonlinear_objects = matnonlin_obj
@@ -63,7 +64,6 @@ class FemInputWriter():
self.beamrotation_objects = beamrotation_obj
self.fluidsection_objects = fluidsection_obj
self.shellthickness_objects = shellthickness_obj
self.analysis_type = analysis_type
self.dir_name = dir_name
if not dir_name:
print('Error: FemInputWriter has no working_dir --> we are going to make a temporary one!')

2
src/Mod/Fem/femsolver/z88/tasks.py
View File

@@ -65,7 +65,7 @@ class Prepare(run.Prepare):
c.pressure_constraints, c.temperature_constraints,
c.heatflux_constraints, c.initialtemperature_constraints,
c.beam_sections, c.beam_rotations, c.shell_thicknesses, c.fluid_sections,
self.solver.AnalysisType, self.directory)
self.directory)
path = w.write_z88_input()
# report to user if task succeeded
if path is not None:

4
src/Mod/Fem/femsolver/z88/writer.py
View File

@@ -43,7 +43,7 @@ class FemInputWriterZ88(FemInputWriter.FemInputWriter):
selfweight_obj, force_obj, pressure_obj,
temperature_obj, heatflux_obj, initialtemperature_obj,
beamsection_obj, beamrotation_obj, shellthickness_obj, fluidsection_obj,
analysis_type=None, dir_name=None
dir_name=None
):
FemInputWriter.FemInputWriter.__init__(
@@ -55,7 +55,7 @@ class FemInputWriterZ88(FemInputWriter.FemInputWriter):
selfweight_obj, force_obj, pressure_obj,
temperature_obj, heatflux_obj, initialtemperature_obj,
beamsection_obj, beamrotation_obj, shellthickness_obj, fluidsection_obj,
analysis_type, dir_name)
dir_name)
# self.dir_name does have a slash at the end
self.file_name = self.dir_name + 'z88'
print('FemInputWriterZ88 --> self.dir_name --> ' + self.dir_name)