Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

using self. instead of __dict__ and keyword to get class attributes #86

Merged
merged 1 commit into from
Apr 26, 2024
Merged

using self. instead of __dict__ and keyword to get class attributes #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 26 additions & 30 deletions src/geouned/GEOUNED/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,36 +311,33 @@ def Start(self):
code_setting = self.__dict__
if code_setting is None:
raise ValueError("Cannot run the code. Input are missing")
if code_setting["stepFile"] == "":
if self.stepFile == "":
raise ValueError("Cannot run the code. Step file name is missing")

stepfile = code_setting["stepFile"]
matfile = code_setting["matFile"]

if isinstance(stepfile, (tuple, list)):
for stp in stepfile:
if isinstance(self.stepFile, (tuple, list)):
for stp in self.stepFile:
if not path.isfile(stp):
raise FileNotFoundError(f"Step file {stp} not found.\nStop.")
else:
if not path.isfile(stepfile):
raise FileNotFoundError(f"Step file {stepfile} not found.\nStop.")
if not path.isfile(self.stepFile):
raise FileNotFoundError(f"Step file {self.stepFile} not found.\nStop.")

startTime = datetime.now()

if isinstance(stepfile, (list, tuple)):
if isinstance(self.stepFile, (list, tuple)):
MetaChunk = []
EnclosureChunk = []
for stp in stepfile:
for stp in self.stepFile:
print("read step file : {}".format(stp))
Meta, Enclosure = Load.LoadCAD(stp, matfile)
Meta, Enclosure = Load.LoadCAD(stp, self.matFile)
MetaChunk.append(Meta)
EnclosureChunk.append(Enclosure)
MetaList = joinMetaLists(MetaChunk)
EnclosureList = joinMetaLists(EnclosureChunk)
else:
print("read step file : {}".format(stepfile))
print("read step file : {}".format(self.stepFile))
MetaList, EnclosureList = Load.LoadCAD(
stepfile, matfile, code_setting["voidMat"], code_setting["compSolids"]
self.stepFile, self.matFile, self.voidMat, self.compSolids
)

print("End of loading phase")
Expand All @@ -349,22 +346,22 @@ def Start(self):
tempTime = datetime.now()

# Select a specific solid range from original STEP solids
if code_setting["cellRange"]:
if self.cellRange:
MetaList = MetaList[
code_setting["cellRange"][0] : code_setting["cellRange"][1]
self.cellRange[0] : self.cellRange[1]
]

# export in STEP format solids read from input file
# terminate excution
if code_setting["exportSolids"] != "":
if self.exportSolids != "":
solids = []
for m in MetaList:
if m.IsEnclosure:
continue
solids.extend(m.Solids)
Part.makeCompound(solids).exportStep(code_setting["exportSolids"])
Part.makeCompound(solids).exportStep(self.exportSolids)
msg = (
f'Solids exported in file {code_setting["exportSolids"]}\n'
f'Solids exported in file {self.exportSolids}\n'
"GEOUNED Finish. No solid translation performed."
)
raise ValueError(msg)
Expand All @@ -376,8 +373,7 @@ def Start(self):
UniverseBox = getUniverse(MetaList)
Comsolids = []

surfOffset = code_setting["startSurf"] - 1
Surfaces = UF.Surfaces_dict(offset=surfOffset)
Surfaces = UF.Surfaces_dict(offset=self.startSurf - 1)

warnSolids = []
warnEnclosures = []
Expand All @@ -391,7 +387,7 @@ def Start(self):
)

# decompose Enclosure solids
if code_setting["voidGen"] and EnclosureList:
if self.voidGen and EnclosureList:
warningEnclosureList = DecomposeSolids(
EnclosureList, Surfaces, UniverseBox, code_setting, False
)
Expand Down Expand Up @@ -419,7 +415,7 @@ def Start(self):
else:
translate(MetaList, Surfaces, UniverseBox, code_setting)
# decompose Enclosure solids
if code_setting["voidGen"] and EnclosureList:
if self.voidGen and EnclosureList:
warningEnclosureList = DecomposeSolids(
EnclosureList, Surfaces, UniverseBox, code_setting, False
)
Expand All @@ -429,7 +425,7 @@ def Start(self):

# building enclosure solids

if code_setting["voidGen"] and EnclosureList:
if self.voidGen and EnclosureList:
for j, m in enumerate(EnclosureList):
print("Building Enclosure Cell: ", j + 1)
cones = Conv.cellDef(m, Surfaces, UniverseBox)
Expand All @@ -442,13 +438,13 @@ def Start(self):

# void generation phase
MetaVoid = []
if code_setting["voidGen"]:
if self.voidGen:
print("Build Void")
print(code_setting["voidExclude"])
if not code_setting["voidExclude"]:
print(self.voidExclude)
if not self.voidExclude:
MetaReduced = MetaList
else:
MetaReduced = excludeCells(MetaList, code_setting["voidExclude"])
MetaReduced = excludeCells(MetaList, self.voidExclude)

if MetaList:
init = MetaList[-1].__id__ - len(EnclosureList)
Expand All @@ -459,7 +455,7 @@ def Start(self):
)

# if code_setting['simplify'] == 'full' and not Options.forceNoOverlap:
if code_setting["simplify"] == "full":
if self.simplify == "full":
Surfs = {}
for lst in Surfaces.values():
for s in lst:
Expand All @@ -485,8 +481,8 @@ def Start(self):

print(datetime.now() - startTime)

cellOffSet = code_setting["startCell"] - 1
if EnclosureList and code_setting["sortEnclosure"]:
cellOffSet = self.startCell - 1
if EnclosureList and self.sortEnclosure:
# sort group solid cell / void cell sequence in each for each enclosure
# if a solid belong to several enclosure, its definition will be written
# for the highest enclosure level or if same enclosure level in the first
Expand Down