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

FEM: ccx input writer, check for string type instead of the specific string Eall

Browse Source
This commit is contained in:
Bernd Hahnebach
2017-06-06 16:56:22 +01:00
committed by Yorik van Havre
parent 6321a2c10d
commit ffb956f267
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ import sys
import time
import FemMeshTools
import FemInputWriter
import six
class FemInputWriterCcx(FemInputWriter.FemInputWriter):
@@ -369,7 +370,7 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter):
# TODO: some elemetIDs are collected for 1D-Flow calculation, this should be a def somewhere else, preferable inside the get_ccx_elsets_... methods
for ccx_elset in self.ccx_elsets:
if ccx_elset['ccx_elset'] and ccx_elset['ccx_elset'] != self.ccx_eall:
if ccx_elset['ccx_elset'] and not isinstance(ccx_elset['ccx_elset'], six.string_types): # use six to be sure to be Python 2.7 and 3.x compatible
if 'fluidsection_obj'in ccx_elset:
fluidsec_obj = ccx_elset['fluidsection_obj']
if fluidsec_obj.SectionType == 'Liquid':
@@ -388,8 +389,8 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter):
for ccx_elset in self.ccx_elsets:
f.write('*ELSET,ELSET=' + ccx_elset['ccx_elset_name'] + '\n')
if ccx_elset['ccx_elset']:
if ccx_elset['ccx_elset'] == self.ccx_eall:
f.write(self.ccx_eall + '\n')
if isinstance(ccx_elset['ccx_elset'], six.string_types): # use six to be sure to be Python 2.7 and 3.x compatible
f.write(ccx_elset['ccx_elset'] + '\n')
else:
for elid in ccx_elset['ccx_elset']:
f.write(str(elid) + ',\n')