diff --git a/_unittest/example_models/T12/coax_setup_solved_231.aedtz b/_unittest/example_models/T12/coax_setup_solved_231.aedtz index 72ab5f470d8..7470fa2d89f 100644 Binary files a/_unittest/example_models/T12/coax_setup_solved_231.aedtz and b/_unittest/example_models/T12/coax_setup_solved_231.aedtz differ diff --git a/_unittest/test_12_1_PostProcessing.py b/_unittest/test_12_1_PostProcessing.py index 2349af9db82..7ec9f86a4b2 100644 --- a/_unittest/test_12_1_PostProcessing.py +++ b/_unittest/test_12_1_PostProcessing.py @@ -88,6 +88,7 @@ def test_01B_Field_Plot(self): ) assert len(self.aedtapp.setups[0].sweeps[0].frequencies) > 0 assert isinstance(self.aedtapp.setups[0].sweeps[0].basis_frequencies, list) + assert len(self.aedtapp.setups[0].sweeps[1].basis_frequencies) == 2 @pytest.mark.skipif(is_linux or sys.version_info < (3, 8), reason="Not running in ironpython") def test_01_Animate_plt(self): diff --git a/pyaedt/modules/SolveSweeps.py b/pyaedt/modules/SolveSweeps.py index 8679d371f0f..bde54e41770 100644 --- a/pyaedt/modules/SolveSweeps.py +++ b/pyaedt/modules/SolveSweeps.py @@ -9,6 +9,7 @@ from pyaedt import pyaedt_function_handler from pyaedt.generic.DataHandlers import _dict2arg from pyaedt.generic.LoadAEDTFile import load_entire_aedt_file +from pyaedt.generic.constants import unit_converter from pyaedt.modules.SetupTemplates import Sweep3DLayout from pyaedt.modules.SetupTemplates import SweepHfss3D from pyaedt.modules.SetupTemplates import SweepSiwave @@ -166,6 +167,12 @@ def basis_frequencies(self): try: new_list = [float(i) for i in v["Fields"]["IDDblMap"][1::2]] new_list.sort() + new_list = unit_converter( + values=new_list, + unit_system="Freq", + input_units="Hz", + output_units=self._app._app.odesktop.GetDefaultUnit("Frequency"), + ) fr.append(new_list) except (KeyError, NameError, IndexError): pass @@ -697,9 +704,15 @@ def basis_frequencies(self): solutions = load_entire_aedt_file(solutions_file) for k, v in solutions.items(): if "SolutionBlock" in k and "SolutionName" in v and v["SolutionName"] == self.name and "Fields" in v: - try: + try: # pragma: no cover new_list = [float(i) for i in v["Fields"]["IDDblMap"][1::2]] new_list.sort() + new_list = unit_converter( + values=new_list, + unit_system="Freq", + input_units="Hz", + output_units=self._app._app.odesktop.GetDefaultUnit("Frequency"), + ) fr.append(new_list) except (KeyError, NameError, IndexError): pass