From 2a9d260eed760d85548c639f962b83691b22b23c Mon Sep 17 00:00:00 2001 From: IreneWoyna Date: Fri, 24 Nov 2023 15:36:52 +0100 Subject: [PATCH 1/2] added "DecadeCount" "OctaveCount" "ExponentialCount" in parametric sweep, removed unit from "step" --- pyaedt/modules/DesignXPloration.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pyaedt/modules/DesignXPloration.py b/pyaedt/modules/DesignXPloration.py index ad92519a253..56093905a34 100644 --- a/pyaedt/modules/DesignXPloration.py +++ b/pyaedt/modules/DesignXPloration.py @@ -894,7 +894,8 @@ def add_variation(self, sweep_var, start_point, end_point=None, step=100, unit=N unit : str, optional Variation units. Default is `None`. variation_type : float or int - Variation Type. Admitted values are `"LinearCount"`, `"LinearStep"`, `"LogScale"`, `"SingleValue"`. + Variation Type. Admitted values are `"SingleValue", `"LinearCount"`, `"LinearStep"`, `"LogScale"`, + `"DecadeCount"`, `"OctaveCount"`, `"ExponentialCount"`. Returns ------- @@ -919,7 +920,13 @@ def add_variation(self, sweep_var, start_point, end_point=None, step=100, unit=N elif variation_type == "LinearStep": sweep_range = "LIN {} {} {}".format(start_point, end_point, self._app.value_with_units(step, unit)) elif variation_type == "LogScale": - sweep_range = "DEC {} {} {}".format(start_point, end_point, self._app.value_with_units(step, unit)) + sweep_range = "DEC {} {} {}".format(start_point, end_point, step) + elif variation_type == "DecadeCount": + sweep_range = "DEC {} {} {}".format(start_point, end_point, step) + elif variation_type == "OctaveCount": + sweep_range = "OCT {} {} {}".format(start_point, end_point, step) + elif variation_type == "ExponentialCount": + sweep_range = "ESTP {} {} {}".format(start_point, end_point, step) elif variation_type == "SingleValue": sweep_range = "{}".format(self._app.value_with_units(start_point, unit)) if not sweep_range: From d84c5eab4915511eb4c4da6bbe9b33020c7d7c52 Mon Sep 17 00:00:00 2001 From: Giulia Malinverno Date: Wed, 6 Dec 2023 11:40:38 +0100 Subject: [PATCH 2/2] add UT and fix docstring --- _unittest/test_11_Setup.py | 3 +++ pyaedt/modules/DesignXPloration.py | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/_unittest/test_11_Setup.py b/_unittest/test_11_Setup.py index 761205dc6d2..2aed0a2bb64 100644 --- a/_unittest/test_11_Setup.py +++ b/_unittest/test_11_Setup.py @@ -117,6 +117,9 @@ def test_25a_create_parametrics(self): assert setup1.add_variation("w2", "0.1mm", 10, 11) assert setup1.add_variation("w2", start_point="0.2mm", variation_type="SingleValue") assert setup1.add_variation("w1", start_point="0.3mm", end_point=5, step=0.2, variation_type="LinearStep") + assert setup1.add_variation("w1", start_point="0.3mm", end_point=5, step=1, variation_type="DecadeCount") + assert setup1.add_variation("w1", start_point="0.3mm", end_point=5, step=1, variation_type="OctaveCount") + assert setup1.add_variation("w1", start_point="0.3mm", end_point=5, step=1, variation_type="ExponentialCount") assert setup1.add_calculation( calculation="dB(S(1,1))", ranges={"Freq": "3.5GHz"}, solution="My_HFSS_Setup : LastAdaptive" ) diff --git a/pyaedt/modules/DesignXPloration.py b/pyaedt/modules/DesignXPloration.py index 56093905a34..6ed683ccd80 100644 --- a/pyaedt/modules/DesignXPloration.py +++ b/pyaedt/modules/DesignXPloration.py @@ -894,7 +894,7 @@ def add_variation(self, sweep_var, start_point, end_point=None, step=100, unit=N unit : str, optional Variation units. Default is `None`. variation_type : float or int - Variation Type. Admitted values are `"SingleValue", `"LinearCount"`, `"LinearStep"`, `"LogScale"`, + Variation Type. Admitted values are `"SingleValue", `"LinearCount"`, `"LinearStep"`, `"DecadeCount"`, `"OctaveCount"`, `"ExponentialCount"`. Returns @@ -919,8 +919,6 @@ def add_variation(self, sweep_var, start_point, end_point=None, step=100, unit=N sweep_range = "LINC {} {} {}".format(start_point, end_point, step) elif variation_type == "LinearStep": sweep_range = "LIN {} {} {}".format(start_point, end_point, self._app.value_with_units(step, unit)) - elif variation_type == "LogScale": - sweep_range = "DEC {} {} {}".format(start_point, end_point, step) elif variation_type == "DecadeCount": sweep_range = "DEC {} {} {}".format(start_point, end_point, step) elif variation_type == "OctaveCount":