Merge branch 'master' into fix/remove_grid_cache

Author: PProfizi

ansys/dpf/core/core.py

@@ -428,6 +428,7 @@ def get_runtime_client_config(self):
                 misc.RUNTIME_CLIENT_CONFIG = RuntimeClientConfig(
                     data_tree=data_tree.DataTree(server=self._server())
                 )
+                misc.RUNTIME_CLIENT_CONFIG._data_tree._holds_server = False
             config_to_return = misc.RUNTIME_CLIENT_CONFIG
         return config_to_return
 

ansys/dpf/core/data_tree.py

@@ -7,6 +7,7 @@
 import enum
 import traceback
 import warnings
+import weakref
 
 from ansys.dpf.core.mapping_types import types
 from ansys.dpf.core import server as server_module
@@ -64,16 +65,17 @@ class DataTree:
 
     Notes
     -----
-    Class available with server's version starting at 4.0.
+    Class available with server's version starting at 4.0 (Ansys 2022R2).
     """
 
     def __init__(self, data=None, data_tree=None, server=None):
         # __set_attr__ method has been overridden, self._common_keys is used to list the "real"
         # names used as its class attributes
         self._common_keys = ["_common_keys", "_server", "_internal_obj", "_owner_data_tree",
-                             "_dict", "_api_instance", "_deleter_func"]
+                             "_dict", "_api_instance", "_deleter_func", "_holds_server_instance",
+                             "_server_instance", "_holds_server"]
         # step 1: get server
-        self._server = server_module.get_or_create_server(server)
+        self._server_instance = server_module.get_or_create_server(server)
 
         if data_tree is None and not self._server.meet_version("4.0"):
             raise errors.DpfVersionNotSupported("4.0")
@@ -98,6 +100,24 @@ def __init__(self, data=None, data_tree=None, server=None):
         if data:
             self.add(data)
 
+        self._holds_server_instance = True
+
+    @property
+    def _holds_server(self):
+        return self._holds_server_instance
+
+    @property
+    def _server(self):
+        if isinstance(self._server_instance, weakref.ref):
+            return self._server_instance()
+        return self._server_instance
+
+    @_holds_server.setter
+    def _holds_server(self, value):
+        self._holds_server_instance = value
+        if value is False and not isinstance(self._server_instance, weakref.ref):
+            self._server_instance = weakref.ref(self._server_instance)
+
     @property
     def _api(self) -> dpf_data_tree_abstract_api.DpfDataTreeAbstractAPI:
         if not self._api_instance:
@@ -124,6 +144,7 @@ def add(self, *args, **kwargs):
         >>> data_tree.add(id=3, qualities=["nice", "funny"], name="George")
 
         """
+
         def add_data(self, key, value):
             if isinstance(value, str):
                 self._api.dpf_data_tree_set_string_attribute(self, key, value, len(value))
@@ -159,6 +180,7 @@ def add_data(self, key, value):
             else:
                 raise TypeError(f"{type(value[0]).__name__} is not a supported type, "
                                 "use lists, int, float, strings or DataTree.")
+
         for entry in args:
             for key, value in entry.items():
                 add_data(self, key, value)
@@ -468,9 +490,10 @@ def __del__(self):
 
 class _LocalDataTree(DataTree):
     def __init__(self, data_tree):
-        self._common_keys = ["_owner_data_tree", "_dict", "_common_keys"]
+        self._common_keys = ["_owner_data_tree", "_dict", "_common_keys", "_is_exited"]
         self._owner_data_tree = data_tree
         self.__cache_data__()
+        self._is_exited = False
 
     def add(self, *args, **kwargs):
         """
@@ -514,6 +537,6 @@ def __exit__(self, type_to_use, value, tb):
             print(tb)
 
     def __del__(self):
-        if not hasattr(self, "_is_exited") or not self._is_exited:
+        if not self._is_exited:
             self._is_exited = True
             self.release_data()

docs/source/conf.py

@@ -127,6 +127,8 @@ def reset_servers(gallery_conf, fname, when):
     "pypandoc": True,
     # path to your examples scripts
     "examples_dirs": ["../../examples"],
+    # abort build at first example error
+    'abort_on_example_error': True,
     # path where to save gallery generated examples
     "gallery_dirs": ["examples"],
     # Patter to search for example files

examples/00-basic/03-create_entities.py

@@ -39,7 +39,7 @@ def search_sequence_numpy(arr, seq):
 
 ###############################################################################
 # Add nodes:
-id = 1
+n_id = 1
 for i, x in enumerate(
         [
             float(i) * length / float(num_nodes_in_length)
@@ -58,8 +58,8 @@ def search_sequence_numpy(arr, seq):
                     for i in range(0, num_nodes_in_depth)
                 ]
         ):
-            mesh.nodes.add_node(id, [x, y, z])
-            id += 1
+            mesh.nodes.add_node(n_id, [x, y, z])
+            n_id += 1
 
 ###############################################################################
 # Get the nodes' coordinates field:
@@ -75,7 +75,7 @@ def search_sequence_numpy(arr, seq):
 
 ###############################################################################
 # Add solid elements (linear hexa with eight nodes):
-id = 1
+e_id = 1
 for i, x in enumerate(
         [
             float(i) * length / float(num_nodes_in_length)
@@ -111,7 +111,8 @@ def search_sequence_numpy(arr, seq):
             tmp = connectivity[6]
             connectivity[6] = connectivity[7]
             connectivity[7] = tmp
-            mesh.elements.add_solid_element(id, connectivity)
+            mesh.elements.add_solid_element(e_id, connectivity)
+            e_id += 1
 mesh.plot()
 
 ###############################################################################

tests/conftest.py

@@ -383,11 +383,6 @@ def __getitem__(self, item):
         if len(self._local_servers) <= item:
             while len(self._local_servers) <= item:
                 self._local_servers.append(core.start_local_server(as_global=False, config=conf))
-                if SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_4_0:
-                    runtime_config = core.settings.get_runtime_client_config(
-                        self._local_servers[-1]
-                    )
-                    runtime_config.cache_enabled = False
         try:
             self._local_servers[item].info
             return self._local_servers[item]