REFACTOR: Solution Data (#6706)

Co-authored-by: pyansys-ci-bot <[email protected]>
Co-authored-by: Samuelopez-ansys <[email protected]>

Author: 3 people

doc/changelog.d/6706.miscellaneous.md

@@ -0,0 +1 @@
+Solution Data

src/ansys/aedt/core/extensions/hfss/shielding_effectiveness.py

@@ -435,16 +435,16 @@ def main(data: ShieldingEffectivenessExtensionData):
     frequency_units = free_space_1meter.units_sweeps["Freq"]
 
     # 1 Meter shielding
-    original_1meter = np.array(original_1meter.data_magnitude())
-    free_space_1meter = np.array(free_space_1meter.data_magnitude())
+    original_1meter = original_1meter.get_expression_data(formula="magnitude")[1]
+    free_space_1meter = np.array(free_space_1meter.get_expression_data(formula="magnitude")[1])
 
     shielding_1meter = original_1meter / free_space_1meter
 
     shielding_1meter_db = -20 * np.log10(shielding_1meter)
 
     # 3 meter shielding
-    original_3meters = np.array(original_3meters.data_magnitude())
-    free_space_3meters = np.array(free_space_3meters.data_magnitude())
+    original_3meters = np.array(original_3meters.get_expression_data(formula="magnitude")[1])
+    free_space_3meters = np.array(free_space_3meters.get_expression_data(formula="magnitude")[1])
 
     shielding_3meters = original_3meters / free_space_3meters
 

src/ansys/aedt/core/hfss.py

@@ -31,6 +31,8 @@
 from typing import Union
 import warnings
 
+import numpy as np
+
 from ansys.aedt.core.application.analysis_3d import FieldAnalysis3D
 from ansys.aedt.core.application.analysis_hf import ScatteringMethods
 from ansys.aedt.core.generic.constants import InfiniteSphereType
@@ -6266,8 +6268,10 @@ def get_antenna_data(
                 ]
 
         if frequencies is not None:
-            if not isinstance(frequencies, list):
+            if not isinstance(frequencies, (list, np.ndarray)):
                 frequencies = [frequencies]
+            elif isinstance(frequencies, np.ndarray):
+                frequencies = frequencies.tolist()
             frequencies = _units_assignment(frequencies)
         else:  # pragma: no cover
             self.logger.info("Frequencies could not be obtained.")

src/ansys/aedt/core/hfss3dlayout.py

@@ -2351,7 +2351,7 @@ def get_dcir_element_data_loop_resistance(self, setup):
         for i in terms:
             data2 = []
             for ex in [f"LoopRes({i},{j})" for j in terms]:
-                d = solution_data.data_magnitude(ex)
+                d = solution_data.get_expression_data(formula="magnitude", expression=ex)[1]
                 if d is not False:
                     data2.append(d[0])
                 else:
@@ -2389,7 +2389,7 @@ def get_dcir_element_data_current_source(self, setup):
         data = {"Voltage": []}
         for t_name in terms:
             ex = f"V({t_name})"
-            value = solution_data.data_magnitude(ex, convert_to_SI=True)
+            value = solution_data.get_expression_data(formula="magnitude", expression=ex, convert_to_SI=True)[1]
             if value is not False:
                 data["Voltage"].append(value[0])
         df = pd.DataFrame(data)
@@ -2424,7 +2424,7 @@ def get_dcir_element_data_via(self, setup):
                     tmp_via_names.append(matches[0])
 
             for ex in solution_data.expressions:
-                value = solution_data.data_magnitude(ex, convert_to_SI=True)[0]
+                value = solution_data.get_expression_data(formula="magnitude", expression=ex, convert_to_SI=True)[1][0]
                 data[cat].append(value)
 
             df_tmp = pd.DataFrame(data)

src/ansys/aedt/core/modules/solve_sweeps.py

@@ -32,6 +32,7 @@
 from ansys.aedt.core.generic.constants import unit_converter
 from ansys.aedt.core.generic.data_handlers import _dict2arg
 from ansys.aedt.core.generic.general_methods import pyaedt_function_handler
+from ansys.aedt.core.generic.numbers_utils import Quantity
 from ansys.aedt.core.generic.numbers_utils import _units_assignment
 from ansys.aedt.core.generic.settings import settings
 from ansys.aedt.core.internal.load_aedt_file import load_entire_aedt_file
@@ -177,7 +178,7 @@ def frequencies(self):
         sol = self._app._app.post.reports_by_category.standard(setup=f"{self.setup_name} : {self.name}")
         soldata = sol.get_solution_data()
         if soldata and "Freq" in soldata.intrinsics:
-            return soldata.intrinsics["Freq"]
+            return [Quantity(i, soldata.units_sweeps["Freq"]) for i in soldata.intrinsics["Freq"]]
         return []
 
     @property
@@ -694,7 +695,7 @@ def frequencies(self):
         sol = self._app._app.post.reports_by_category.standard(setup=f"{self.setup_name} : {self.name}")
         soldata = sol.get_solution_data()
         if soldata and "Freq" in soldata.intrinsics:
-            return soldata.intrinsics["Freq"]
+            return [Quantity(i, soldata.units_sweeps["Freq"]) for i in soldata.intrinsics["Freq"]]
         return []
 
     @property
@@ -923,7 +924,7 @@ def frequencies(self):
         )
         soldata = sol.get_solution_data()
         if soldata and "Freq" in soldata.intrinsics:
-            return soldata.intrinsics["Freq"]
+            return [Quantity(i, soldata.units_sweeps["Freq"]) for i in soldata.intrinsics["Freq"]]
         return []
 
     @pyaedt_function_handler()

src/ansys/aedt/core/visualization/advanced/touchstone_parser.py

@@ -94,8 +94,8 @@ def __init__(self, solution_data=None, touchstone_file=None):
                     p_b = m.group(2)
                 p_a_number = ports.index(p_a)
                 p_b_number = ports.index(p_b)
-                sdata_real = solution_data.data_real(expression, True)
-                sdata_img = solution_data.data_imag(expression, True)
+                sdata_real = solution_data.get_expression_data(expression, formula="real", convert_to_SI=True)[1]
+                sdata_img = solution_data.get_expression_data(expression, formula="imag", convert_to_SI=True)[1]
                 sdata_2d = np.array(sdata_real, dtype=complex) + 1j * np.array(sdata_img, dtype=complex)
                 sdata_3d[:, p_a_number, p_b_number] = sdata_2d
                 sdata_3d[:, p_b_number, p_a_number] = sdata_2d

src/ansys/aedt/core/visualization/plot/matplotlib.py

@@ -402,7 +402,10 @@ def car2spherical(self):
         y = np.array(self.cartesian_data[1], dtype=float)
         z = np.array(self.cartesian_data[2], dtype=float)
         r = np.sqrt(x * x + y * y + z * z)
-        theta = np.arccos(z / r) * 180 / math.pi  # to degrees
+        with np.errstate(invalid="ignore", divide="ignore"):
+            ratio = np.where(r != 0, z / r, 0)  # or np.nan if you prefer
+            ratio = np.clip(ratio, -1.0, 1.0)  # ensure valid domain for arccos
+            theta = np.arccos(ratio) * 180 / math.pi
         phi = np.arctan2(y, x) * 180 / math.pi
         self._spherical_data = [r, theta, phi]
 

src/ansys/aedt/core/visualization/post/common.py

@@ -229,7 +229,10 @@ def available_quantities_categories(
             context = ""
 
         if solution and report_category and display_type:
-            return list(self.oreportsetup.GetAllCategories(report_category, display_type, solution, context))
+            try:
+                return list(self.oreportsetup.GetAllCategories(report_category, display_type, solution, context))
+            except Exception:  # pragma: no cover
+                return []
         return []  # pragma: no cover
 
     @pyaedt_function_handler()
@@ -466,16 +469,31 @@ def get_all_report_quantities(
             third key the report categories.
         """
         rep_quantities = {}
+        if not context and self._app.design_type in [
+            "HFSS",
+            "Maxwell 3D",
+            "Maxwell 2D",
+            "Q3D Extractor",
+            "2D Extractor",
+            "Icepak",
+            "Mechanical",
+        ]:
+            if not context and "2D" in self._app.modeler.design_type:
+                if self._app.modeler.point_names:
+                    context = self._app.modeler.point_names[0]
+            elif not context:
+                if self._app.modeler.line_names:
+                    context = self._app.modeler.line_names[0]
         for rep in self.available_report_types:
             rep_quantities[rep] = {}
             solutions = [solution] if isinstance(solution, str) else self.available_report_solutions(rep)
-            for solution in solutions:
-                rep_quantities[rep][solution] = {}
+            for sol in solutions:
+                rep_quantities[rep][sol] = {}
                 for quant in self.available_quantities_categories(
-                    rep, context=context, solution=solution, is_siwave_dc=is_siwave_dc
+                    rep, context=context, solution=sol, is_siwave_dc=is_siwave_dc
                 ):
-                    rep_quantities[rep][solution][quant] = self.available_report_quantities(
-                        rep, quantities_category=quant, context=context, solution=solution, is_siwave_dc=is_siwave_dc
+                    rep_quantities[rep][sol][quant] = self.available_report_quantities(
+                        rep, quantities_category=quant, context=context, solution=sol, is_siwave_dc=is_siwave_dc
                     )
 
         return rep_quantities
@@ -1122,6 +1140,56 @@ def _get_report_inputs(
             ]
         return [plot_name, modal_data, plot_type, setup_sweep_name, ctxt, families_input, arg]
 
+    @pyaedt_function_handler()
+    def _check_category_context(self, expression, report_category, context):
+        field_ctx = context
+        if self._app.design_type in [
+            "HFSS",
+            "Maxwell 3D",
+            "Maxwell 2D",
+            "Q3D Extractor",
+            "2D Extractor",
+            "Icepak",
+            "Mechanical",
+        ]:
+            if not field_ctx and "2D" in self._app.modeler.design_type:
+                if self._app.modeler.point_names:
+                    field_ctx = self._app.modeler.point_names[0]
+            elif not field_ctx:
+                if self._app.modeler.line_names:
+                    field_ctx = self._app.modeler.line_names[0]
+        if not report_category:
+            sols = self.get_all_report_quantities(context=field_ctx)
+            for cat, sol in sols.items():
+                for s, q in sol.items():
+                    for _, v in q.items():
+                        if any([i in expression for i in v]):
+                            report_category = cat
+                            self._app.logger.warning(f"No report category provided. Automatically identified {cat}")
+                            break
+                    if report_category:
+                        break
+                if report_category:
+                    break
+        if not context:
+            if report_category == "Far Fields" and not context:
+                for setup in self._app.field_setups:
+                    if setup.type == "FarFieldSphere":
+                        context = setup.name
+                        self._app.logger.warning(f"No Far Fields infinite sphere provided. Assigned setup: {context}")
+
+                        break
+            elif report_category == "Near Fields" and not context:
+                for setup in self._app.field_setups:
+                    if setup.type.startswith("NearField"):
+                        context = setup.name
+                        self._app.logger.warning(f"No Near Fields setup provided. Assigned setup: {context}")
+                        break
+            elif report_category == "Fields" and not context:
+                context = field_ctx
+                self._app.logger.warning(f"No context provided for Fields. Assigned object: {context}")
+        return report_category, context
+
     @pyaedt_function_handler()
     def _get_report_object(
         self,
@@ -1177,6 +1245,7 @@ def _get_report_object(
             ]
         elif isinstance(expressions, str):
             expressions = [expressions]
+        report_category, context = self._check_category_context(expressions[0], report_category, context)
 
         # Report Category
         if domain in ["Spectral", "Spectrum"]:
@@ -1826,7 +1895,7 @@ def _report_plotter(self, report):
                     props["symbol_style"] = markers[pp["symbol_style"]]
                 except KeyError:
                     pass
-            report_plotter.add_trace([sw, sols.data_real(curve)], 0, properties=props, name=curve)
+            report_plotter.add_trace([sw, sols.get_expression_data(curve)[1]], 0, properties=props, name=curve)
         for name, line in report._legacy_props.get("limitLines", {}).items():
             props = {}
             try: