From 0c1636b108f30ab16952906e7cb06812b1121124 Mon Sep 17 00:00:00 2001 From: Giulia Malinverno Date: Fri, 1 Mar 2024 09:13:21 +0100 Subject: [PATCH 1/4] fix export_field_file on grid --- pyaedt/modules/PostProcessor.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pyaedt/modules/PostProcessor.py b/pyaedt/modules/PostProcessor.py index 84505b7a5f8..c6af435ccab 100644 --- a/pyaedt/modules/PostProcessor.py +++ b/pyaedt/modules/PostProcessor.py @@ -2456,8 +2456,15 @@ def get_scalar_field_value( elif object_type == "point": self.ofieldsreporter.EnterPoint(obj_list) self.ofieldsreporter.CalcOp(scalar_function) + if not variation_dict: - variation_dict = self._app.available_variations.nominal_w_values + variation_dict = self._app.available_variations.nominal_w_values_dict + + variation = [] + for el, value in variation_dict.items(): + variation.append(el + ":=") + variation.append(value) + if intrinsics: if "Transient" in solution: variation_dict.append("Time:=") @@ -2600,8 +2607,15 @@ def export_field_file_on_grid( else: self.logger.error("Error in the type of the grid.") return False + if not variation_dict: - variation_dict = self._app.available_variations.nominal_w_values + variation_dict = self._app.available_variations.nominal_w_values_dict + + variation = [] + for el, value in variation_dict.items(): + variation.append(el + ":=") + variation.append(value) + if intrinsics: if "Transient" in solution: variation_dict.append("Time:=") From e8c1b65c6e6f6ab5edfff9716b39ba57ab52b4bf Mon Sep 17 00:00:00 2001 From: Giulia Malinverno Date: Fri, 1 Mar 2024 11:28:25 +0100 Subject: [PATCH 2/4] fix var dict --- pyaedt/modules/PostProcessor.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pyaedt/modules/PostProcessor.py b/pyaedt/modules/PostProcessor.py index 816cc591df5..713942b49b4 100644 --- a/pyaedt/modules/PostProcessor.py +++ b/pyaedt/modules/PostProcessor.py @@ -2467,19 +2467,19 @@ def get_scalar_field_value( if intrinsics: if "Transient" in solution: - variation_dict.append("Time:=") - variation_dict.append(intrinsics) + variation.append("Time:=") + variation.append(intrinsics) else: - variation_dict.append("Freq:=") - variation_dict.append(intrinsics) - variation_dict.append("Phase:=") + variation.append("Freq:=") + variation.append(intrinsics) + variation.append("Phase:=") if phase: - variation_dict.append(phase) + variation.append(phase) else: - variation_dict.append("0deg") + variation.append("0deg") file_name = os.path.join(self._app.working_directory, generate_unique_name("temp_fld") + ".fld") - self.ofieldsreporter.CalculatorWrite(file_name, ["Solution:=", solution], variation_dict) + self.ofieldsreporter.CalculatorWrite(file_name, ["Solution:=", solution], variation) value = None if os.path.exists(file_name) or settings.remote_rpc_session: with open_file(file_name, "r") as f: @@ -2618,16 +2618,16 @@ def export_field_file_on_grid( if intrinsics: if "Transient" in solution: - variation_dict.append("Time:=") - variation_dict.append(intrinsics) + variation.append("Time:=") + variation.append(intrinsics) else: - variation_dict.append("Freq:=") - variation_dict.append(intrinsics) - variation_dict.append("Phase:=") + variation.append("Freq:=") + variation.append(intrinsics) + variation.append("Phase:=") if phase: - variation_dict.append(phase) + variation.append(phase) else: - variation_dict.append("0deg") + variation.append("0deg") self.ofieldsreporter.ExportOnGrid( filename, @@ -2635,7 +2635,7 @@ def export_field_file_on_grid( grid_stop_wu, grid_step_wu, solution, - variation_dict, + variation, True, gridtype, grid_center, From 0906ecf0f85d61399c2c84eed57354d2de78fbbb Mon Sep 17 00:00:00 2001 From: Giulia Malinverno Date: Fri, 1 Mar 2024 14:47:58 +0100 Subject: [PATCH 3/4] fix tests --- _unittest/test_12_1_PostProcessing.py | 6 +++--- _unittest/test_12_PostProcessing.py | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/_unittest/test_12_1_PostProcessing.py b/_unittest/test_12_1_PostProcessing.py index e299a1ca96d..609f128c44c 100644 --- a/_unittest/test_12_1_PostProcessing.py +++ b/_unittest/test_12_1_PostProcessing.py @@ -221,7 +221,7 @@ def test_07_export_fields_from_Calculator(self): self.aedtapp.post.export_field_file_on_grid( "E", "Setup1 : LastAdaptive", - self.aedtapp.available_variations.nominal_w_values, + self.aedtapp.available_variations.nominal_w_values_dict, os.path.join(self.local_scratch.path, "Efield.fld"), grid_stop=[5, 5, 5], grid_step=[0.5, 0.5, 0.5], @@ -233,7 +233,7 @@ def test_07_export_fields_from_Calculator(self): self.aedtapp.post.export_field_file_on_grid( "Mag_E", "Setup1 : LastAdaptive", - self.aedtapp.available_variations.nominal_w_values, + self.aedtapp.available_variations.nominal_w_values_dict, os.path.join(self.local_scratch.path, "MagEfieldSph.fld"), gridtype="Spherical", grid_stop=[5, 300, 300], @@ -246,7 +246,7 @@ def test_07_export_fields_from_Calculator(self): self.aedtapp.post.export_field_file_on_grid( "Mag_E", "Setup1 : LastAdaptive", - self.aedtapp.available_variations.nominal_w_values, + self.aedtapp.available_variations.nominal_w_values_dict, os.path.join(self.local_scratch.path, "MagEfieldCyl.fld"), gridtype="Cylindrical", grid_stop=[5, 300, 5], diff --git a/_unittest/test_12_PostProcessing.py b/_unittest/test_12_PostProcessing.py index aecad589e2d..080f5cb128f 100644 --- a/_unittest/test_12_PostProcessing.py +++ b/_unittest/test_12_PostProcessing.py @@ -291,7 +291,7 @@ def test_17_circuit(self, circuit_test): assert len(data2.data_magnitude()) > 0 context = {"algorithm": "FFT", "max_frequency": "100MHz", "time_stop": "200ns", "test": ""} data3 = circuit_test.post.get_solution_data(["V(net_11)"], "Transient", "Spectral", context=context) - assert data3.units_sweeps["Spectrum"] == "GHz" + assert data3.units_sweeps["Spectrum"] == "MHz" assert len(data3.data_real()) > 0 new_report = circuit_test.post.reports_by_category.spectral(["dB(V(net_11))"], "Transient") new_report.window = "Hanning" @@ -898,7 +898,7 @@ def test_76_ipk_get_scalar_field_value(self, icepak_post): "Heat_Flow_Rate", scalar_function="Integrate", solution=None, - variation_dict=["power_block:=", ["0.25W"], "power_source:=", ["0.075W"]], + variation_dict={"power_block": "0.25W", "power_source": "0.075W"}, isvector=False, intrinsics=None, phase=None, @@ -910,7 +910,7 @@ def test_76_ipk_get_scalar_field_value(self, icepak_post): "Heat_Flow_Rate", scalar_function="Integrate", solution=None, - variation_dict=["power_block:=", ["0.6W"], "power_source:=", ["0.15W"]], + variation_dict={"power_block": "0.6W", "power_source": "0.15W"}, isvector=False, intrinsics=None, phase=None, @@ -922,7 +922,7 @@ def test_76_ipk_get_scalar_field_value(self, icepak_post): "Heat_Flow_Rate", scalar_function="Integrate", solution=None, - variation_dict=["power_block:=", ["0.6W"], "power_source:=", ["0.15W"]], + variation_dict={"power_block": "0.6W", "power_source": "0.15W"}, isvector=False, intrinsics=None, phase=None, @@ -934,7 +934,7 @@ def test_76_ipk_get_scalar_field_value(self, icepak_post): "Temperature", scalar_function="Maximum", solution=None, - variation_dict=["power_block:=", ["0.6W"], "power_source:=", ["0.15W"]], + variation_dict={"power_block": "0.6W", "power_source": "0.15W"}, isvector=False, intrinsics=None, phase=None, @@ -946,7 +946,7 @@ def test_76_ipk_get_scalar_field_value(self, icepak_post): "Temperature", scalar_function="Maximum", solution=None, - variation_dict=["power_block:=", ["0.6W"], "power_source:=", ["0.15W"]], + variation_dict={"power_block": "0.6W", "power_source": "0.15W"}, isvector=False, intrinsics=None, phase=None, From 6ee5c63216d252e9831da289134f42d2ae0d9e90 Mon Sep 17 00:00:00 2001 From: Giulia Malinverno Date: Mon, 4 Mar 2024 09:54:35 +0100 Subject: [PATCH 4/4] fix test --- _unittest/test_12_PostProcessing.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_unittest/test_12_PostProcessing.py b/_unittest/test_12_PostProcessing.py index 080f5cb128f..8e3a906e7ab 100644 --- a/_unittest/test_12_PostProcessing.py +++ b/_unittest/test_12_PostProcessing.py @@ -291,7 +291,7 @@ def test_17_circuit(self, circuit_test): assert len(data2.data_magnitude()) > 0 context = {"algorithm": "FFT", "max_frequency": "100MHz", "time_stop": "200ns", "test": ""} data3 = circuit_test.post.get_solution_data(["V(net_11)"], "Transient", "Spectral", context=context) - assert data3.units_sweeps["Spectrum"] == "MHz" + assert data3.units_sweeps["Spectrum"] == circuit_test.odesktop.GetDefaultUnit("Frequency") assert len(data3.data_real()) > 0 new_report = circuit_test.post.reports_by_category.spectral(["dB(V(net_11))"], "Transient") new_report.window = "Hanning" @@ -320,7 +320,6 @@ def test_17_circuit(self, circuit_test): new_report.time_stop = "190ns" new_report.plot_continous_spectrum = True assert new_report.create() - pass @pytest.mark.skipif(is_linux, reason="Crashing on Linux") def test_18_diff_plot(self, diff_test):