Skip to content

Fix JMAG Naming Issue #345

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

Merged
dmnewman3 merged 5 commits into from
Jun 21, 2024
Merged

Fix JMAG Naming Issue #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6cf4d38
add code to specify geometry to avoid naming issues
dmnewman3 May 22, 2024
342969d
Fix Stator ID in imag_2d
noguchi-takahiro May 28, 2024
bb254eb
Uncomment codes to rename parts
noguchi-takahiro May 28, 2024
15665b9
make changes based on feedback:
dmnewman3 May 29, 2024
4498941
fix SynR and flux linkage analyzer for JMAG23
dmnewman3 May 30, 2024
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
11 changes: 9 additions & 2 deletions mach_eval/analyzers/electromagnetic/SynR/SynR_em_analyzer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def analyze(self, problem):
model.SetName(self.project_name)
model.SetDescription(self.show(self.project_name, toString=True))

valid_design = self.pre_process(model)
valid_design = self.pre_process(app, model)

if not valid_design:
raise InvalidDesign
Expand Down Expand Up @@ -403,7 +403,7 @@ def show(self, name, toString=False):
"%s = %s" % item for item in tuple_list
)

def pre_process(self, model):
def pre_process(self, app, model):
# pre-process : you can select part by coordinate!
"""Group"""

Expand All @@ -427,6 +427,13 @@ def group(name, id_list):

group("Coils", partIDRange_Coil)

# """ Set Parts names """

app.GetModel(0).SetPartName(id_rotorCore, u"RotorCore")
app.GetModel(0).SetPartName(id_shaft, u"Shaft")
app.GetModel(0).SetPartName(id_statorCore, u"StatorCore")


""" Add Part to Set for later references """

def add_part_to_set(name, x, y, ID=None):
Expand Down
10 changes: 8 additions & 2 deletions mach_eval/analyzers/electromagnetic/SynR/SynR_inductance_analyzer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def analyze(self, problem):
model.SetName(self.project_name)
model.SetDescription(self.show(self.project_name, toString=True))

valid_design = self.pre_process(model)
valid_design = self.pre_process(app, model)

if not valid_design:
raise InvalidDesign
Expand Down Expand Up @@ -385,7 +385,7 @@ def show(self, name, toString=False):
"%s = %s" % item for item in tuple_list
)

def pre_process(self, model):
def pre_process(self, app, model):
# pre-process : you can select part by coordinate!
"""Group"""

Expand All @@ -409,6 +409,12 @@ def group(name, id_list):

group("Coils", partIDRange_Coil)

# """ Set Parts names """

app.GetModel(0).SetPartName(id_rotorCore, u"RotorCore")
app.GetModel(0).SetPartName(id_shaft, u"Shaft")
app.GetModel(0).SetPartName(id_statorCore, u"StatorCore")

""" Add Part to Set for later references """

def add_part_to_set(name, x, y, ID=None):
Expand Down
8 changes: 7 additions & 1 deletion mach_eval/analyzers/electromagnetic/bspm/jmag_2d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ def group(name, id_list):
id_shaft = part_ID_list[1]
partIDRange_Magnet = part_ID_list[2 : int(2 + self.machine_variant.p * 2)]
# id_sleeve = part_ID_list[int(2 + self.machine_variant.p * 2)]
id_statorCore = part_ID_list[int(2 + self.machine_variant.p * 2) + 1]
id_statorCore = part_ID_list[int(2 + self.machine_variant.p * 2)]
partIDRange_Coil = part_ID_list[
int(1 + self.machine_variant.p * 2)
+ 2 : int(2 + self.machine_variant.p * 2)
Expand All @@ -318,6 +318,12 @@ def group(name, id_list):
group("Magnet", partIDRange_Magnet)
group("Coils", partIDRange_Coil)

# """ Set Parts names """

app.GetModel(0).SetPartName(id_backiron, u"NotchedRotor")
app.GetModel(0).SetPartName(id_shaft, u"Shaft")
app.GetModel(0).SetPartName(id_statorCore, u"StatorCore")

""" Add Part to Set for later references """

def add_part_to_set(name, x, y, ID=None):
Expand Down