Improved setup assignment for Hfss solution type. (#1236)

* Improved setup assignment for Hfss solution type.

* fixed UT

* fixed UT

Co-authored-by: maxcapodi78 <Shark78>

Author: maxcapodi78

pyaedt/application/Analysis.py

@@ -111,7 +111,6 @@ def __init__(
         self._setup = None
         if setup_name:
             self.analysis_setup = setup_name
-        self.solution_type = solution_type
         self._materials = Materials(self)
         self.logger.info("Materials Loaded")
         self._available_variations = self.AvailableVariations(self)

pyaedt/application/AnalysisEmit.py

@@ -54,7 +54,6 @@ def __init__(
             port=machine,
             aedt_process_id=aedt_process_id,
         )
-        self.solution_type = solution_type
         self._modeler = ModelerEmit(self)
         self._couplings = CouplingsEmit(self)
 

pyaedt/application/AnalysisMaxwellCircuit.py

@@ -72,7 +72,6 @@ def __init__(
             port,
             aedt_process_id,
         )
-        self.solution_type = None
         self._modeler = ModelerMaxwellCircuit(self)
 
     @property

pyaedt/application/AnalysisTwinBuilder.py

@@ -73,7 +73,6 @@ def __init__(
             port,
             aedt_process_id,
         )
-        self.solution_type = solution_type
         self._modeler = ModelerTwinBuilder(self)
         self._post = CircuitPostProcessor(self)
 

pyaedt/application/Design.py

@@ -203,9 +203,6 @@ def __init__(
         self.odesign = design_name
         AedtObjects.__init__(self, is_inherithed=True)
 
-        self.design_solutions._odesign = self.odesign
-        if solution_type:
-            self.design_solutions.solution_type = solution_type
         self._variable_manager = VariableManager(self)
         self._project_datasets = []
         self._design_datasets = []
@@ -792,14 +789,20 @@ def odesign(self, des_name):
         if des_name:
             if self._assert_consistent_design_type(des_name) == des_name:
                 self._insert_design(self._design_type, design_name=des_name)
+            self.design_solutions._odesign = self.odesign
         else:
             activedes, warning_msg = self._find_design()
             if activedes:
                 self._odesign = self.oproject.SetActiveDesign(activedes)
                 self.logger.info(warning_msg)
+                self.design_solutions._odesign = self.odesign
+
             else:
                 self.logger.info(warning_msg)
                 self._insert_design(self._design_type)
+                self.design_solutions._odesign = self.odesign
+                if self._temp_solution_type:
+                    self.design_solutions.solution_type = self._temp_solution_type
 
     @property
     def oproject(self):

pyaedt/application/design_solutions.py

@@ -274,7 +274,7 @@
             "default_adaptive": "LastAdaptive",
         },
         "Terminal": {
-            "name": "HFSS Hybrid Terminal Network",
+            "name": "HFSS Terminal Network",
             "options": None,
             "report_type": "Terminal Solution Data",
             "default_setup": 1,
@@ -475,8 +475,8 @@ def __init__(self, odesign, design_type, aedt_version):
         self._solution_options = copy.deepcopy(solutions_types[design_type])
         self._design_type = design_type
         if design_type == "HFSS" and aedt_version >= "2021.2":
-            self._solution_options["Modal"]["name"] = "HFSS Hybrid Modal Network"
-            self._solution_options["Terminal"]["name"] = "HFSS Hybrid Terminal Network"
+            self._solution_options["Modal"]["name"] = "HFSS Modal Network"
+            self._solution_options["Terminal"]["name"] = "HFSS Terminal Network"
         self._solution_type = None
 
     @property
@@ -553,8 +553,8 @@ def design_types(self):
 class HFSSDesignSolution(DesignSolution, object):
     def __init__(self, odesign, design_type, aedt_version):
         DesignSolution.__init__(self, odesign, design_type, aedt_version)
-        self._composite = None
-        self._hybrid = None
+        self._composite = False
+        self._hybrid = False
 
     @property
     def solution_type(self):
@@ -606,10 +606,10 @@ def solution_type(self, value):
             if value == "Transient":
                 value = "Transient Network"
                 self._solution_type = "Transient Network"
-            elif value == "DrivenModal":
+            elif "Modal" in value:
                 value = "Modal"
                 self._solution_type = "Modal"
-            elif value == "DrivenTerminal":
+            elif "Terminal" in value:
                 value = "Terminal"
                 self._solution_type = "Terminal"
             else: