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

FEM: ccx inputwriter, get rid of a duplicate in 1DFlow section

Browse Source
This commit is contained in:
Bernd Hahnebach
2017-06-06 16:56:15 +01:00
committed by Yorik van Havre
parent 55b03fdb85
commit 81830ac844
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Mod/Fem/FemInputWriterCcx.py
View File

@@ -107,15 +107,7 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter):
self.write_femelementsets(inpfile)
# Fluid section: Inlet and Outlet requires special element definition
if self.fluidsection_objects:
InOuttest = False
for ccx_elset in self.ccx_elsets:
if ccx_elset['ccx_elset']:
if 'fluidsection_obj'in ccx_elset: # fluid mesh
fluidsec_obj = ccx_elset['fluidsection_obj']
if fluidsec_obj.SectionType == "Liquid":
if (fluidsec_obj.LiquidSectionType == "PIPE INLET") or (fluidsec_obj.LiquidSectionType == "PIPE OUTLET"):
InOuttest = True
if InOuttest is True:
if is_fluid_section_inlet_outlet(self.ccx_elsets) is True:
inpfile.close()
FemMeshTools.use_correct_fluidinout_ele_def(self.FluidInletoutlet_ele, self.file_name)
inpfile = open(self.file_name, 'a')
@@ -267,15 +259,7 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter):
self.write_femelementsets(inpfileMain)
# Fluid section: Inlet and Outlet requires special element definition
if self.fluidsection_objects:
InOuttest = False
for ccx_elset in self.ccx_elsets:
if ccx_elset['ccx_elset']:
if 'fluidsection_obj'in ccx_elset: # fluid mesh
fluidsec_obj = ccx_elset['fluidsection_obj']
if fluidsec_obj.SectionType == "Liquid":
if (fluidsec_obj.LiquidSectionType == "PIPE INLET") or (fluidsec_obj.LiquidSectionType == "PIPE OUTLET"):
InOuttest = True
if InOuttest is True:
if is_fluid_section_inlet_outlet(self.ccx_elsets) is True:
FemMeshTools.use_correct_fluidinout_ele_def(self.FluidInletoutlet_ele, name + "_Node_Elem_sets.inp")
# constraints independent from steps
@@ -1317,6 +1301,19 @@ def get_ccx_elset_solid_name(mat_name, solid_name=None, mat_short_name=None):
return mat_name + solid_name
def is_fluid_section_inlet_outlet(ccx_elsets):
''' Fluid section: Inlet and Outlet requires special element definition
'''
for ccx_elset in ccx_elsets:
if ccx_elset['ccx_elset']:
if 'fluidsection_obj'in ccx_elset: # fluid mesh
fluidsec_obj = ccx_elset['fluidsection_obj']
if fluidsec_obj.SectionType == "Liquid":
if (fluidsec_obj.LiquidSectionType == "PIPE INLET") or (fluidsec_obj.LiquidSectionType == "PIPE OUTLET"):
return True
return False
def liquid_section_def(obj, section_type):
if section_type == 'PIPE MANNING':
manning_area = str(obj.ManningArea.getValueAs('mm^2').Value)