From 5ec81fe69c4b7c75d21c0b486d6cea2e787283c8 Mon Sep 17 00:00:00 2001 From: oparreno Date: Thu, 7 Nov 2024 16:18:20 +0100 Subject: [PATCH 01/14] enable methods in pyDPF --- src/ansys/dpf/core/cyclic_support.py | 70 ++++++++++++++++++++ src/ansys/dpf/gate/cyclic_support_grpcapi.py | 26 ++++++++ 2 files changed, 96 insertions(+) diff --git a/src/ansys/dpf/core/cyclic_support.py b/src/ansys/dpf/core/cyclic_support.py index 4c638acbfee..59a35fb19f6 100644 --- a/src/ansys/dpf/core/cyclic_support.py +++ b/src/ansys/dpf/core/cyclic_support.py @@ -32,6 +32,7 @@ from ansys.dpf.core import server as server_module from ansys.dpf.core.scoping import Scoping +from ansys.dpf.core import field, property_field class CyclicSupport: @@ -304,6 +305,75 @@ def expand_element_id(self, element_id, sectors=None, stage_num=0): ) return Scoping(scoping=expanded_ids, server=self._server) + def cs(self): + """Coordinate system of the cyclic support. + + Examples + -------- + >>> from ansys.dpf.core import Model + >>> from ansys.dpf.core import examples + >>> multi_stage = examples.download_multi_stage_cyclic_result() + >>> cyc_support = Model(multi_stage).metadata.result_info.cyclic_support + >>> cs = cyc_support.cs() + >>> print(expanded_scoping.ids) + [12] + """ + + cs = self._api.cyclic_support_get_cs(self) + return field.Field(field=cs, server=self._server) + + def low_high_map(self, stage_num=0): + """Retrieve a property field containing node map from low to high + base sector of the given stage. + + Parameters + ---------- + stage_num : int, optional + Number of the stage required (from 0 to num_stages). + + Returns + ------- + low_high_map : PropertyField + Node correspondance between low to high in the base sector of the given stage. + + Examples + -------- + >>> from ansys.dpf.core import Model + >>> from ansys.dpf.core import examples + >>> multi_stage = examples.download_multi_stage_cyclic_result() + >>> cyc_support = Model(multi_stage).metadata.result_info.cyclic_support + >>> low_high_map = cyc_support.low_high_map(0) + + """ + low_high_map = self._api.cyclic_support_get_low_high_map(self, stage_num) + return property_field.PropertyField(property_field=low_high_map, server=self._server) + + def high_low_map(self, stage_num=0): + """Retrieve a property field containing node map from high to low + base sector of the given stage. + + Parameters + ---------- + stage_num : int, optional + Number of the stage required (from 0 to num_stages). + + Returns + ------- + low_high_map : PropertyField + Node correspondance between high to low in the base sector of the given stage. + + Examples + -------- + >>> from ansys.dpf.core import Model + >>> from ansys.dpf.core import examples + >>> multi_stage = examples.download_multi_stage_cyclic_result() + >>> cyc_support = Model(multi_stage).metadata.result_info.cyclic_support + >>> high_low_map = cyc_support.high_low_map(0) + + """ + high_low_map = self._api.cyclic_support_get_high_low_map(self, stage_num) + return property_field.PropertyField(property_field=high_low_map, server=self._server) + def __del__(self): try: self._deleter_func[0](self._deleter_func[1](self)) diff --git a/src/ansys/dpf/gate/cyclic_support_grpcapi.py b/src/ansys/dpf/gate/cyclic_support_grpcapi.py index cc89e4d0316..45c3c4fb9ec 100644 --- a/src/ansys/dpf/gate/cyclic_support_grpcapi.py +++ b/src/ansys/dpf/gate/cyclic_support_grpcapi.py @@ -75,6 +75,16 @@ def cyclic_support_get_base_elements_scoping(support, i_stage): return getattr(CyclicSupportGRPCAPI.list(support), "base_elements_scoping_"+str(i_stage)).get_ownership() + @staticmethod + def cyclic_support_get_low_high_map(support, i_stage): + return getattr(CyclicSupportGRPCAPI.list(support), + "low_high_map_"+str(i_stage)).get_ownership() + + @staticmethod + def cyclic_support_get_high_low_map(support, i_stage): + return getattr(CyclicSupportGRPCAPI.list(support), + "high_low_map_"+str(i_stage)).get_ownership() + @staticmethod def get_expanded_ids(support, request): return _get_stub(support._server).GetExpandedIds(request).expanded_ids @@ -100,3 +110,19 @@ def cyclic_support_get_expanded_element_ids(support, baseElementId, i_stage, sec request = CyclicSupportGRPCAPI.init_get_expanded_ids(support, i_stage, sectorsScoping) request.element_id = baseElementId return CyclicSupportGRPCAPI.get_expanded_ids(support, request) + + @staticmethod + def get_cs(support, request): + return _get_stub(support._server).GetCS(request).cs + + @staticmethod + def init_get_cs(support): + from ansys.grpc.dpf import cyclic_support_pb2 + request = cyclic_support_pb2.GetCSRequest() + request.support.CopyFrom(support._internal_obj) + return request + + @staticmethod + def cyclic_support_get_cs(support): + request = CyclicSupportGRPCAPI.init_get_cs(support) + return CyclicSupportGRPCAPI.get_cs(support, request) \ No newline at end of file From 04fb70a144e2f72c6f441889a75f8e9cce351015 Mon Sep 17 00:00:00 2001 From: oparreno Date: Thu, 7 Nov 2024 16:22:51 +0100 Subject: [PATCH 02/14] spelling --- src/ansys/dpf/core/cyclic_support.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ansys/dpf/core/cyclic_support.py b/src/ansys/dpf/core/cyclic_support.py index 59a35fb19f6..826e9d00b41 100644 --- a/src/ansys/dpf/core/cyclic_support.py +++ b/src/ansys/dpf/core/cyclic_support.py @@ -334,7 +334,7 @@ def low_high_map(self, stage_num=0): Returns ------- low_high_map : PropertyField - Node correspondance between low to high in the base sector of the given stage. + Node correspondence between low to high in the base sector of the given stage. Examples -------- @@ -360,7 +360,7 @@ def high_low_map(self, stage_num=0): Returns ------- low_high_map : PropertyField - Node correspondance between high to low in the base sector of the given stage. + Node correspondence between high to low in the base sector of the given stage. Examples -------- From 3c39faab18d2f31632d69cd66c8b73970e072f05 Mon Sep 17 00:00:00 2001 From: oparreno Date: Thu, 7 Nov 2024 16:51:37 +0100 Subject: [PATCH 03/14] modifs from review --- src/ansys/dpf/core/cyclic_support.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/ansys/dpf/core/cyclic_support.py b/src/ansys/dpf/core/cyclic_support.py index 826e9d00b41..096c71c8254 100644 --- a/src/ansys/dpf/core/cyclic_support.py +++ b/src/ansys/dpf/core/cyclic_support.py @@ -305,7 +305,7 @@ def expand_element_id(self, element_id, sectors=None, stage_num=0): ) return Scoping(scoping=expanded_ids, server=self._server) - def cs(self): + def cs(self) -> field.Field: """Coordinate system of the cyclic support. Examples @@ -315,25 +315,24 @@ def cs(self): >>> multi_stage = examples.download_multi_stage_cyclic_result() >>> cyc_support = Model(multi_stage).metadata.result_info.cyclic_support >>> cs = cyc_support.cs() - >>> print(expanded_scoping.ids) [12] """ cs = self._api.cyclic_support_get_cs(self) return field.Field(field=cs, server=self._server) - def low_high_map(self, stage_num=0): + def low_high_map(self, stage_num: int = 0) -> property_field.PropertyField: """Retrieve a property field containing node map from low to high base sector of the given stage. Parameters ---------- - stage_num : int, optional + stage_num: Number of the stage required (from 0 to num_stages). Returns ------- - low_high_map : PropertyField + low_high_map: Node correspondence between low to high in the base sector of the given stage. Examples @@ -348,18 +347,18 @@ def low_high_map(self, stage_num=0): low_high_map = self._api.cyclic_support_get_low_high_map(self, stage_num) return property_field.PropertyField(property_field=low_high_map, server=self._server) - def high_low_map(self, stage_num=0): + def high_low_map(self, stage_num: int = 0) -> property_field.PropertyField: """Retrieve a property field containing node map from high to low base sector of the given stage. Parameters ---------- - stage_num : int, optional + stage_num: Number of the stage required (from 0 to num_stages). Returns ------- - low_high_map : PropertyField + low_high_map: Node correspondence between high to low in the base sector of the given stage. Examples From 62df1e9b468bf3e2c313398cb899791fb69e26d9 Mon Sep 17 00:00:00 2001 From: oparreno Date: Thu, 7 Nov 2024 17:49:24 +0100 Subject: [PATCH 04/14] adding to existing test new apis --- tests/test_cyclic_support.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/test_cyclic_support.py b/tests/test_cyclic_support.py index 0d26dad6067..2c59e545d84 100644 --- a/tests/test_cyclic_support.py +++ b/tests/test_cyclic_support.py @@ -94,6 +94,9 @@ def test_cyc_support_from_model(cyclic_lin_rst): exp = cyc_support.expand_element_id(1, [0, 1, 2]) assert np.allclose(exp.ids, [1, 10, 19]) + cs = cyc_support.cs() + assert np.allclose(cs.scoping.ids, [12]) + def test_cyc_support_from_to_operator(cyclic_lin_rst, server_type): data_sources = dpf.DataSources(cyclic_lin_rst, server=server_type) @@ -184,6 +187,17 @@ def test_cyc_support_multistage(cyclic_multistage): ) assert np.allclose(cyc_support.sectors_set_for_expansion(stage_num=1).ids, list(range(0, 12))) + high_low_map = my_cyclic_support.high_low_map() + assert np.allclose(high_low_map.get_entity_data_by_id(1446), 1447) + assert np.allclose(high_low_map.get_entity_data_by_id(2946), 2948) + assert np.allclose(high_low_map.get_entity_data_by_id(1452), 1466) + + low_high_map = my_cyclic_support.low_high_map(1) + assert np.allclose(low_high_map.get_entity_data_by_id(995), 939) + assert np.allclose(low_high_map.get_entity_data_by_id(53), 54) + assert np.allclose(low_high_map.get_entity_data_by_id(70), 56) + + def test_delete_cyc_support(cyclic_lin_rst, server_type_legacy_grpc): data_sources = dpf.DataSources(cyclic_lin_rst, server=server_type_legacy_grpc) From 630355eaa9666e6d4a5740794144300651fd5791 Mon Sep 17 00:00:00 2001 From: oparreno Date: Thu, 7 Nov 2024 18:00:39 +0100 Subject: [PATCH 05/14] styling --- tests/test_cyclic_support.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/test_cyclic_support.py b/tests/test_cyclic_support.py index 2c59e545d84..da4734f028e 100644 --- a/tests/test_cyclic_support.py +++ b/tests/test_cyclic_support.py @@ -94,8 +94,8 @@ def test_cyc_support_from_model(cyclic_lin_rst): exp = cyc_support.expand_element_id(1, [0, 1, 2]) assert np.allclose(exp.ids, [1, 10, 19]) - cs = cyc_support.cs() - assert np.allclose(cs.scoping.ids, [12]) + exp = cyc_support.cs().scoping + assert np.allclose(exp.ids, [12]) def test_cyc_support_from_to_operator(cyclic_lin_rst, server_type): @@ -187,7 +187,7 @@ def test_cyc_support_multistage(cyclic_multistage): ) assert np.allclose(cyc_support.sectors_set_for_expansion(stage_num=1).ids, list(range(0, 12))) - high_low_map = my_cyclic_support.high_low_map() + high_low_map = my_cyclic_support.high_low_map(0) assert np.allclose(high_low_map.get_entity_data_by_id(1446), 1447) assert np.allclose(high_low_map.get_entity_data_by_id(2946), 2948) assert np.allclose(high_low_map.get_entity_data_by_id(1452), 1466) @@ -198,7 +198,6 @@ def test_cyc_support_multistage(cyclic_multistage): assert np.allclose(low_high_map.get_entity_data_by_id(70), 56) - def test_delete_cyc_support(cyclic_lin_rst, server_type_legacy_grpc): data_sources = dpf.DataSources(cyclic_lin_rst, server=server_type_legacy_grpc) model = dpf.Model(data_sources, server=server_type_legacy_grpc) From c6073ca56155621bf96c878eeb2efd2a8d63129a Mon Sep 17 00:00:00 2001 From: oparreno Date: Thu, 7 Nov 2024 18:08:39 +0100 Subject: [PATCH 06/14] fix example --- src/ansys/dpf/core/cyclic_support.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ansys/dpf/core/cyclic_support.py b/src/ansys/dpf/core/cyclic_support.py index 096c71c8254..4ef5be4cf32 100644 --- a/src/ansys/dpf/core/cyclic_support.py +++ b/src/ansys/dpf/core/cyclic_support.py @@ -315,7 +315,7 @@ def cs(self) -> field.Field: >>> multi_stage = examples.download_multi_stage_cyclic_result() >>> cyc_support = Model(multi_stage).metadata.result_info.cyclic_support >>> cs = cyc_support.cs() - [12] + """ cs = self._api.cyclic_support_get_cs(self) From 6076e1ab00524b20bd4bdc9bde9a213a4056e3c0 Mon Sep 17 00:00:00 2001 From: oparreno Date: Thu, 7 Nov 2024 18:45:14 +0100 Subject: [PATCH 07/14] naming error --- tests/test_cyclic_support.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_cyclic_support.py b/tests/test_cyclic_support.py index da4734f028e..fe0e0f6b1e6 100644 --- a/tests/test_cyclic_support.py +++ b/tests/test_cyclic_support.py @@ -187,12 +187,12 @@ def test_cyc_support_multistage(cyclic_multistage): ) assert np.allclose(cyc_support.sectors_set_for_expansion(stage_num=1).ids, list(range(0, 12))) - high_low_map = my_cyclic_support.high_low_map(0) + high_low_map = cyc_support.high_low_map(0) assert np.allclose(high_low_map.get_entity_data_by_id(1446), 1447) assert np.allclose(high_low_map.get_entity_data_by_id(2946), 2948) assert np.allclose(high_low_map.get_entity_data_by_id(1452), 1466) - low_high_map = my_cyclic_support.low_high_map(1) + low_high_map = cyc_support.low_high_map(1) assert np.allclose(low_high_map.get_entity_data_by_id(995), 939) assert np.allclose(low_high_map.get_entity_data_by_id(53), 54) assert np.allclose(low_high_map.get_entity_data_by_id(70), 56) From db43c7899afbfe15037e2eb05585b261ce3cf6ab Mon Sep 17 00:00:00 2001 From: oparreno Date: Fri, 8 Nov 2024 09:02:04 +0100 Subject: [PATCH 08/14] only activate tests from 24R2 --- tests/test_cyclic_support.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/tests/test_cyclic_support.py b/tests/test_cyclic_support.py index fe0e0f6b1e6..733642c7d24 100644 --- a/tests/test_cyclic_support.py +++ b/tests/test_cyclic_support.py @@ -94,9 +94,6 @@ def test_cyc_support_from_model(cyclic_lin_rst): exp = cyc_support.expand_element_id(1, [0, 1, 2]) assert np.allclose(exp.ids, [1, 10, 19]) - exp = cyc_support.cs().scoping - assert np.allclose(exp.ids, [12]) - def test_cyc_support_from_to_operator(cyclic_lin_rst, server_type): data_sources = dpf.DataSources(cyclic_lin_rst, server=server_type) @@ -187,6 +184,12 @@ def test_cyc_support_multistage(cyclic_multistage): ) assert np.allclose(cyc_support.sectors_set_for_expansion(stage_num=1).ids, list(range(0, 12))) + +@conftest.raises_for_servers_version_under("8.2") +def test_cyc_support_multistage_low_high_map(cyclic_multistage): + model = dpf.Model(cyclic_multistage) + cyc_support = model.metadata.result_info.cyclic_support + high_low_map = cyc_support.high_low_map(0) assert np.allclose(high_low_map.get_entity_data_by_id(1446), 1447) assert np.allclose(high_low_map.get_entity_data_by_id(2946), 2948) @@ -198,6 +201,18 @@ def test_cyc_support_multistage(cyclic_multistage): assert np.allclose(low_high_map.get_entity_data_by_id(70), 56) +@conftest.raises_for_servers_version_under("8.2") +def test_cyc_support_coordinate_system(cyclic_lin_rst): + data_sources = dpf.DataSources(cyclic_lin_rst) + model = dpf.Model(data_sources) + result_info = model.metadata.result_info + + cyc_support = result_info.cyclic_support + + exp = cyc_support.cs().scoping + assert np.allclose(exp.ids, [12]) + + def test_delete_cyc_support(cyclic_lin_rst, server_type_legacy_grpc): data_sources = dpf.DataSources(cyclic_lin_rst, server=server_type_legacy_grpc) model = dpf.Model(data_sources, server=server_type_legacy_grpc) From d2ab295e1447006ddff8fbb6ddd8c13193dd9a6a Mon Sep 17 00:00:00 2001 From: oparreno Date: Fri, 8 Nov 2024 09:07:33 +0100 Subject: [PATCH 09/14] import conftest and styling --- tests/test_cyclic_support.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_cyclic_support.py b/tests/test_cyclic_support.py index 733642c7d24..248beb67eba 100644 --- a/tests/test_cyclic_support.py +++ b/tests/test_cyclic_support.py @@ -24,6 +24,7 @@ import weakref import numpy as np +import conftest import pytest from ansys import dpf @@ -189,7 +190,7 @@ def test_cyc_support_multistage(cyclic_multistage): def test_cyc_support_multistage_low_high_map(cyclic_multistage): model = dpf.Model(cyclic_multistage) cyc_support = model.metadata.result_info.cyclic_support - + high_low_map = cyc_support.high_low_map(0) assert np.allclose(high_low_map.get_entity_data_by_id(1446), 1447) assert np.allclose(high_low_map.get_entity_data_by_id(2946), 2948) From e5f4f023fd1bbfdf461554f569115e8b19008085 Mon Sep 17 00:00:00 2001 From: oparreno Date: Fri, 8 Nov 2024 10:59:11 +0100 Subject: [PATCH 10/14] update version --- tests/test_cyclic_support.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_cyclic_support.py b/tests/test_cyclic_support.py index 248beb67eba..7ecc065a9c5 100644 --- a/tests/test_cyclic_support.py +++ b/tests/test_cyclic_support.py @@ -186,7 +186,7 @@ def test_cyc_support_multistage(cyclic_multistage): assert np.allclose(cyc_support.sectors_set_for_expansion(stage_num=1).ids, list(range(0, 12))) -@conftest.raises_for_servers_version_under("8.2") +@conftest.raises_for_servers_version_under("8.1") def test_cyc_support_multistage_low_high_map(cyclic_multistage): model = dpf.Model(cyclic_multistage) cyc_support = model.metadata.result_info.cyclic_support @@ -202,7 +202,7 @@ def test_cyc_support_multistage_low_high_map(cyclic_multistage): assert np.allclose(low_high_map.get_entity_data_by_id(70), 56) -@conftest.raises_for_servers_version_under("8.2") +@conftest.raises_for_servers_version_under("8.1") def test_cyc_support_coordinate_system(cyclic_lin_rst): data_sources = dpf.DataSources(cyclic_lin_rst) model = dpf.Model(data_sources) From 73cabd47b9f5443c92cc37b4b880b5f1f655ad89 Mon Sep 17 00:00:00 2001 From: oparreno Date: Fri, 8 Nov 2024 11:02:07 +0100 Subject: [PATCH 11/14] add server type --- tests/test_cyclic_support.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/test_cyclic_support.py b/tests/test_cyclic_support.py index 7ecc065a9c5..a7d0da6c780 100644 --- a/tests/test_cyclic_support.py +++ b/tests/test_cyclic_support.py @@ -186,9 +186,9 @@ def test_cyc_support_multistage(cyclic_multistage): assert np.allclose(cyc_support.sectors_set_for_expansion(stage_num=1).ids, list(range(0, 12))) -@conftest.raises_for_servers_version_under("8.1") -def test_cyc_support_multistage_low_high_map(cyclic_multistage): - model = dpf.Model(cyclic_multistage) +@conftest.raises_for_servers_version_under("8.2") +def test_cyc_support_multistage_low_high_map(cyclic_multistage, server_type): + model = dpf.Model(cyclic_multistage, server=server_type) cyc_support = model.metadata.result_info.cyclic_support high_low_map = cyc_support.high_low_map(0) @@ -202,10 +202,10 @@ def test_cyc_support_multistage_low_high_map(cyclic_multistage): assert np.allclose(low_high_map.get_entity_data_by_id(70), 56) -@conftest.raises_for_servers_version_under("8.1") -def test_cyc_support_coordinate_system(cyclic_lin_rst): - data_sources = dpf.DataSources(cyclic_lin_rst) - model = dpf.Model(data_sources) +@conftest.raises_for_servers_version_under("8.2") +def test_cyc_support_coordinate_system(cyclic_lin_rst, server_type): + data_sources = dpf.DataSources(cyclic_lin_rst, server=server_type) + model = dpf.Model(data_sources, server=server_type) result_info = model.metadata.result_info cyc_support = result_info.cyclic_support From 1bc53487a33d330e529b93fb0b391b728842b02c Mon Sep 17 00:00:00 2001 From: oparreno Date: Fri, 8 Nov 2024 11:33:10 +0100 Subject: [PATCH 12/14] rollback --- tests/test_cyclic_support.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/test_cyclic_support.py b/tests/test_cyclic_support.py index a7d0da6c780..7a98f9c4c0e 100644 --- a/tests/test_cyclic_support.py +++ b/tests/test_cyclic_support.py @@ -172,6 +172,18 @@ def test_cyc_support_from_to_workflow(cyclic_lin_rst, server_type): assert len(exp.base_nodes_scoping().ids) == 32 + + +@conftest.raises_for_servers_version_under("8.2") +def test_cyc_support_coordinate_system(cyclic_lin_rst): + data_sources = dpf.DataSources(cyclic_lin_rst) + model = dpf.Model(data_sources) + result_info = model.metadata.result_info + cyc_support = result_info.cyclic_support + exp = cyc_support.cs().scoping + assert np.allclose(exp.ids, [12]) + + def test_cyc_support_multistage(cyclic_multistage): model = dpf.Model(cyclic_multistage) cyc_support = model.metadata.result_info.cyclic_support @@ -187,8 +199,8 @@ def test_cyc_support_multistage(cyclic_multistage): @conftest.raises_for_servers_version_under("8.2") -def test_cyc_support_multistage_low_high_map(cyclic_multistage, server_type): - model = dpf.Model(cyclic_multistage, server=server_type) +def test_cyc_support_multistage_low_high_map(cyclic_multistage): + model = dpf.Model(cyclic_multistage) cyc_support = model.metadata.result_info.cyclic_support high_low_map = cyc_support.high_low_map(0) @@ -202,18 +214,6 @@ def test_cyc_support_multistage_low_high_map(cyclic_multistage, server_type): assert np.allclose(low_high_map.get_entity_data_by_id(70), 56) -@conftest.raises_for_servers_version_under("8.2") -def test_cyc_support_coordinate_system(cyclic_lin_rst, server_type): - data_sources = dpf.DataSources(cyclic_lin_rst, server=server_type) - model = dpf.Model(data_sources, server=server_type) - result_info = model.metadata.result_info - - cyc_support = result_info.cyclic_support - - exp = cyc_support.cs().scoping - assert np.allclose(exp.ids, [12]) - - def test_delete_cyc_support(cyclic_lin_rst, server_type_legacy_grpc): data_sources = dpf.DataSources(cyclic_lin_rst, server=server_type_legacy_grpc) model = dpf.Model(data_sources, server=server_type_legacy_grpc) From dedd56605258a3568b1603b8b56066b74410f172 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Fri, 8 Nov 2024 11:38:52 +0100 Subject: [PATCH 13/14] Use skipif instead of server failure Signed-off-by: paul.profizi --- tests/test_cyclic_support.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/test_cyclic_support.py b/tests/test_cyclic_support.py index 7a98f9c4c0e..7518585c4d2 100644 --- a/tests/test_cyclic_support.py +++ b/tests/test_cyclic_support.py @@ -172,9 +172,7 @@ def test_cyc_support_from_to_workflow(cyclic_lin_rst, server_type): assert len(exp.base_nodes_scoping().ids) == 32 - - -@conftest.raises_for_servers_version_under("8.2") +@pytest.mark.skipif(not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_8_2) def test_cyc_support_coordinate_system(cyclic_lin_rst): data_sources = dpf.DataSources(cyclic_lin_rst) model = dpf.Model(data_sources) @@ -198,7 +196,7 @@ def test_cyc_support_multistage(cyclic_multistage): assert np.allclose(cyc_support.sectors_set_for_expansion(stage_num=1).ids, list(range(0, 12))) -@conftest.raises_for_servers_version_under("8.2") +@pytest.mark.skipif(not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_8_2) def test_cyc_support_multistage_low_high_map(cyclic_multistage): model = dpf.Model(cyclic_multistage) cyc_support = model.metadata.result_info.cyclic_support From 9f218edc86ea0b1d658d04b06019d03b35e2d107 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Fri, 8 Nov 2024 11:55:31 +0100 Subject: [PATCH 14/14] Use skipif instead of server failure Signed-off-by: paul.profizi --- tests/test_cyclic_support.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/test_cyclic_support.py b/tests/test_cyclic_support.py index 7518585c4d2..bd19aae8f5f 100644 --- a/tests/test_cyclic_support.py +++ b/tests/test_cyclic_support.py @@ -172,7 +172,9 @@ def test_cyc_support_from_to_workflow(cyclic_lin_rst, server_type): assert len(exp.base_nodes_scoping().ids) == 32 -@pytest.mark.skipif(not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_8_2) +@pytest.mark.skipif( + not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_8_2, reason="Requires DPF 8.2 or above." +) def test_cyc_support_coordinate_system(cyclic_lin_rst): data_sources = dpf.DataSources(cyclic_lin_rst) model = dpf.Model(data_sources) @@ -196,7 +198,9 @@ def test_cyc_support_multistage(cyclic_multistage): assert np.allclose(cyc_support.sectors_set_for_expansion(stage_num=1).ids, list(range(0, 12))) -@pytest.mark.skipif(not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_8_2) +@pytest.mark.skipif( + not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_8_2, reason="Requires DPF 8.2 or above." +) def test_cyc_support_multistage_low_high_map(cyclic_multistage): model = dpf.Model(cyclic_multistage) cyc_support = model.metadata.result_info.cyclic_support