Skip to content

Commit 364445a

Browse files
committed
Merge branch 'main' into release/0.21
2 parents 56c68f4 + c04f065 commit 364445a

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

doc/changelog.d/6726.fixed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update Report type according to Solution Type in CreateOutputVariable
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update CHANGELOG for v0.21.1

doc/changelog.d/6779.fixed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update extension directory path handling in add_script_to_menu function

src/ansys/aedt/core/application/design_solutions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,29 +89,29 @@
8989
"DCConduction": {
9090
"name": "DCConduction",
9191
"options": "XY",
92-
"report_type": None,
92+
"report_type": "DCConduction",
9393
"default_setup": 58,
9494
"default_adaptive": "LastAdaptive",
9595
},
9696
"DC Conduction": {
9797
"name": "DCConduction",
9898
"options": "XY",
99-
"report_type": None,
99+
"report_type": "DC Conduction",
100100
"default_setup": 58,
101101
"default_adaptive": "LastAdaptive",
102102
},
103103
"ACConduction": {
104104
"name": "ACConduction",
105105
"options": "XY",
106-
"report_type": None,
106+
"report_type": "ACConduction",
107107
"default_setup": 59,
108108
"default_adaptive": "LastAdaptive",
109109
"intrinsics": ["Freq", "Phase"],
110110
},
111111
"AC Conduction": {
112112
"name": "ACConduction",
113113
"options": "XY",
114-
"report_type": None,
114+
"report_type": "AC Conduction",
115115
"default_setup": 59,
116116
"default_adaptive": "LastAdaptive",
117117
"intrinsics": ["Freq", "Phase"],

src/ansys/aedt/core/extensions/customize_automation_tab.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,8 +397,8 @@ def add_script_to_menu(
397397
build_file_data = build_file_data.replace("##JUPYTER_EXE##", str(jupyter_executable))
398398
build_file_data = build_file_data.replace("##TOOLKIT_NAME##", str(name))
399399
build_file_data = build_file_data.replace("##EXTENSION_TEMPLATES##", str(templates_dir))
400-
if copy_to_personal_lib and dest_script_path:
401-
extension_dir = dest_script_path.parent
400+
if dest_script_path:
401+
extension_dir = Path(dest_script_path).parent
402402
else:
403403
extension_dir = Path(ansys.aedt.core.extensions.__file__).parent / "installer"
404404
build_file_data = build_file_data.replace("##BASE_EXTENSION_LOCATION##", str(extension_dir))

0 commit comments

Comments
 (0)