Skip to content

Change UI to use forward and aft #193

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

Open
aushe02 wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

Change UI to use forward and aft #193

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
10 changes: 5 additions & 5 deletions motorlib/grain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ class PerforatedGrain(Grain):
geomName = 'perfGrain'
def __init__(self):
super().__init__()
self.props['inhibitedEnds'] = EnumProperty('Inhibited ends', ['Neither', 'Top', 'Bottom', 'Both'])
self.props['inhibitedEnds'] = EnumProperty('Inhibited ends', ['Neither', 'Forward', 'Aft', 'Both'])
self.wallWeb = 0 # Max distance from the core to the wall

def getEndPositions(self, regDist):
if self.props['inhibitedEnds'].getValue() == 'Neither': # Neither
return [regDist, self.props['length'].getValue() - regDist]
if self.props['inhibitedEnds'].getValue() == 'Top': # Top
if self.props['inhibitedEnds'].getValue() == 'Forward': # Top
return [0, self.props['length'].getValue() - regDist]
if self.props['inhibitedEnds'].getValue() == 'Bottom': # Bottom
if self.props['inhibitedEnds'].getValue() == 'Aft': # Bottom
return [regDist, self.props['length'].getValue()]
if self.props['inhibitedEnds'].getValue() == 'Both':
return [0, self.props['length'].getValue()]
Expand Down Expand Up @@ -145,7 +145,7 @@ def getSurfaceAreaAtRegression(self, regDist):
coreArea = self.getCoreSurfaceArea(regDist)

exposedFaces = 2
if self.props['inhibitedEnds'].getValue() == 'Top' or self.props['inhibitedEnds'].getValue() == 'Bottom':
if self.props['inhibitedEnds'].getValue() == 'Forward' or self.props['inhibitedEnds'].getValue() == 'Aft':
exposedFaces = 1
if self.props['inhibitedEnds'].getValue() == 'Both':
exposedFaces = 0
Expand All @@ -172,7 +172,7 @@ def getMassFlux(self, massIn, dTime, regDist, dRegDist, position, density):
# If a position in the grain is queried, the mass flow is the input mass, from the top face,
# and from the tube up to the point. The diameter is the core.
if position <= endPos[1]:
if self.props['inhibitedEnds'].getValue() == 'Top': # Top inhibited
if self.props['inhibitedEnds'].getValue() == 'Forward': # Top inhibited
top = 0
countedCoreLength = position
else:
Expand Down