Support section data from RST

src/ansys/dpf/composites/_composite_model_impl.py

@@ -174,6 +174,7 @@ def __init__(
             data_sources=self.data_sources,
             material_operators=self.material_operators,
             unit_system=self._unit_system,
+            rst_stream_provider=self._get_rst_streams_provider()
         )
 
         if version_equal_or_later(self._server, "8.0"):
@@ -189,6 +190,7 @@ def __init__(
         self._element_info_provider = get_element_info_provider(
             mesh=self.get_mesh(),
             stream_provider_or_data_source=self._get_rst_streams_provider(),
+            material_provider=self.material_operators.material_provider,
         )
         self._layup_properties_provider = LayupPropertiesProvider(
             layup_provider=self._layup_provider, mesh=self.get_mesh()
@@ -246,8 +248,8 @@ def material_names(self) -> dict[str, int]:
         material_ids = string_field.scoping.ids
 
         names = {}
-        for mat_id in material_ids:
-            names[string_field.data[string_field.scoping.index(mat_id)]] = mat_id
+        for dpf_mat_id in material_ids:
+            names[string_field.data[string_field.scoping.index(dpf_mat_id)]] = dpf_mat_id
 
         return names
 
@@ -355,7 +357,9 @@ def evaluate_failure_criteria(
         chunking_generator = dpf.Operator("composite::scope_generator")
         chunking_generator.inputs.stream_provider(self._get_rst_streams_provider())
         chunking_generator.inputs.data_tree(chunking_data_tree)
-        chunking_generator.inputs.data_sources(self.data_sources.composite)
+        if self.data_sources.composite:
+            chunking_generator.inputs.data_sources(self.data_sources.composite)
+
         if element_scope_in:
             element_scope = dpf.Scoping(location="elemental")
             element_scope.ids = element_scope_in

src/ansys/dpf/composites/_indexer.py

@@ -85,10 +85,15 @@ class FieldIndexerNoDataPointer:
 
     def __init__(self, field: Field):
         """Create indexer and get data."""
-        index_by_id = setup_index_by_id(field.scoping)
-        self._indices = index_by_id.mapping
-        self._max_id = index_by_id.max_id
-        self._data: NDArray[np.double] = np.array(field.data, dtype=np.double)
+        if field.scoping.size > 0:
+            index_by_id = setup_index_by_id(field.scoping)
+            self._indices = index_by_id.mapping
+            self._max_id = index_by_id.max_id
+            self._data: NDArray[np.double] = np.array(field.data, dtype=np.double)
+        else:
+            self._indices = np.array([], dtype=np.int64)
+            self._max_id = 0
+            self._data = np.array([], dtype=np.double)
 
     def by_id(self, entity_id: int) -> Optional[np.double]:
         """Get index by id.
@@ -110,9 +115,15 @@ class PropertyFieldIndexerNoDataPointerNoBoundsCheck:
 
     def __init__(self, field: PropertyField):
         """Create indexer and get data."""
-        index_by_id = setup_index_by_id(field.scoping)
-        self._indices = index_by_id.mapping
-        self._data: NDArray[np.int64] = np.array(field.data, dtype=np.int64)
+        if field.scoping.size > 0:
+            index_by_id = setup_index_by_id(field.scoping)
+            self._indices = index_by_id.mapping
+            self._data: NDArray[np.int64] = np.array(field.data, dtype=np.int64)
+            self._max_id = index_by_id.max_id
+        else:
+            self._indices = np.array([], dtype=np.int64)
+            self._data = np.array([], dtype=np.int64)
+            self._max_id = 0
 
     def by_id(self, entity_id: int) -> Optional[np.int64]:
         """Get index by id.
@@ -121,24 +132,34 @@ def by_id(self, entity_id: int) -> Optional[np.int64]:
         ----------
         entity_id
         """
-        return cast(np.int64, self._data[self._indices[entity_id]])
+        if entity_id > self._max_id:
+            return None
+        else:
+            return cast(np.int64, self._data[self._indices[entity_id]])
 
 
 class PropertyFieldIndexerWithDataPointer:
     """Indexer for a property field with data pointer."""
 
     def __init__(self, field: PropertyField):
         """Create indexer and get data."""
-        index_by_id = setup_index_by_id(field.scoping)
-        self._indices = index_by_id.mapping
-        self._max_id = index_by_id.max_id
-
-        self._data: NDArray[np.int64] = np.array(field.data, dtype=np.int64)
-        self._n_components = field.component_count
-
-        self._data_pointer: NDArray[np.int64] = np.append(
-            field._data_pointer, len(self._data) * self._n_components
-        )
+        if field.scoping.size > 0:
+            index_by_id = setup_index_by_id(field.scoping)
+            self._indices = index_by_id.mapping
+            self._max_id = index_by_id.max_id
+
+            self._data: NDArray[np.int64] = np.array(field.data, dtype=np.int64)
+            self._n_components = field.component_count
+
+            self._data_pointer: NDArray[np.int64] = np.append(
+                field._data_pointer, len(self._data) * self._n_components
+            )
+        else:
+            self._max_id = 0
+            self._indices = np.array([], dtype=np.int64)
+            self._data = np.array([], dtype=np.int64)
+            self._n_components = 0
+            self._data_pointer = np.array([], dtype=np.int64)
 
     def by_id(self, entity_id: int) -> Optional[NDArray[np.int64]]:
         """Get index by id.
@@ -166,18 +187,26 @@ def by_id(self, entity_id: int) -> Optional[NDArray[np.int64]]:
 class FieldIndexerWithDataPointer:
     """Indexer for a dpf field with data pointer."""
 
+
     def __init__(self, field: Field):
         """Create indexer and get data."""
-        index_by_id = setup_index_by_id(field.scoping)
-        self._indices = index_by_id.mapping
-        self._max_id = index_by_id.max_id
-
-        self._data: NDArray[np.double] = np.array(field.data, dtype=np.double)
-        self._n_components = field.component_count
-
-        self._data_pointer: NDArray[np.int64] = np.append(
-            field._data_pointer, len(self._data) * self._n_components
-        )
+        if field.scoping.size > 0:
+            index_by_id = setup_index_by_id(field.scoping)
+            self._indices = index_by_id.mapping
+            self._max_id = index_by_id.max_id
+
+            self._data: NDArray[np.double] = np.array(field.data, dtype=np.double)
+            self._n_components = field.component_count
+
+            self._data_pointer: NDArray[np.int64] = np.append(
+                field._data_pointer, len(self._data) * self._n_components
+            )
+        else:
+            self._max_id = 0
+            self._indices = np.array([], dtype=np.int64)
+            self._data = np.array([], dtype=np.double)
+            self._n_components = 0
+            self._data_pointer = np.array([], dtype=np.int64)
 
     def by_id(self, entity_id: int) -> Optional[NDArray[np.double]]:
         """Get index by id.
@@ -207,16 +236,21 @@ class PropertyFieldIndexerWithDataPointerNoBoundsCheck:
 
     def __init__(self, field: PropertyField):
         """Create indexer and get data."""
-        index_by_id = setup_index_by_id(field.scoping)
-        self._indices = index_by_id.mapping
-
-        self._data: NDArray[np.int64] = np.array(field.data, dtype=np.int64)
-
-        self._n_components = field.component_count
-
-        self._data_pointer: NDArray[np.int64] = np.append(
-            field._data_pointer, len(self._data) * self._n_components
-        )
+        if field.scoping.size > 0:
+            index_by_id = setup_index_by_id(field.scoping)
+            self._indices = index_by_id.mapping
+
+            self._data: NDArray[np.int64] = np.array(field.data, dtype=np.int64)
+            self._n_components = field.component_count
+
+            self._data_pointer: NDArray[np.int64] = np.append(
+                field._data_pointer, len(self._data) * self._n_components
+            )
+        else:
+            self._indices = np.array([], dtype=np.int64)
+            self._data = np.array([], dtype=np.int64)
+            self._n_components = 0
+            self._data_pointer = np.array([], dtype=np.int64)
 
     def by_id(self, entity_id: int) -> Optional[NDArray[np.int64]]:
         """Get index by id.

src/ansys/dpf/composites/data_sources.py

@@ -149,14 +149,14 @@ def _get_rst_list(value: Union[list[_PATH], _PATH]) -> list[_PATH]:
         return value  # type: ignore
 
 
-# roosre June 2023: todo add deprecation warning where composite definition label is used
 @dataclass(frozen=True)
 class CompositeDataSources:
     """Provides data sources related to the composite lay-up.
 
     Parameters
     ----------
     rst:
+        Result file. Currently only RST (MAPDL) is supported.
 
     material_support:
         NOTE: The 'material_support' is explicitly listed since it is currently not
@@ -165,6 +165,7 @@ class CompositeDataSources:
         material support from the first RST file. This is a workaround until the
         support for distributed RST is added.
     engineering_data:
+        File with the material properties.
 
     old_composite_sources:
         This member is used to support assemblies in combination with the old
@@ -175,7 +176,7 @@ class CompositeDataSources:
 
     rst: DataSources
     material_support: DataSources
-    composite: DataSources
+    composite: Optional[DataSources]
     engineering_data: DataSources
 
     old_composite_sources: dict[str, DataSources]
@@ -542,7 +543,6 @@ def get_composites_data_sources(
     old_composite_data_sources = {}
 
     for key, composite_files in continuous_composite_files.composite.items():
-        old_datasource = DataSources()
         if set_part_key:
             composite_data_source.add_file_path_for_specified_result(
                 composite_files.definition, _LAYUPFILE_INDEX_KEY, key
@@ -567,6 +567,10 @@ def get_composites_data_sources(
 
         old_composite_data_sources[key] = old_datasource
 
+    # Reset composite data source if no composite files are provided because a data source cannot be empty
+    if len(continuous_composite_files.composite) == 0:
+        composite_data_source = None
+
     return CompositeDataSources(
         rst=rst_data_source,
         material_support=material_support_data_source,

src/ansys/dpf/composites/layup_info/_add_layup_info_to_mesh.py

@@ -11,12 +11,16 @@
 
 def _get_composite_data_sources_for_layup_provider(
     data_sources: CompositeDataSources, composite_definition_label: Optional[str] = None
-) -> DataSources:
+) -> Optional[DataSources]:
     """
     Prepare DataSources of composite for the DPF server.
 
     Ensure that DataSources object is compatible with the version of the layup provider.
     """
+
+    if data_sources.composite is None:
+        return None
+
     # import is here because of circular dependencies
     from ..server_helpers import version_older_than
 
@@ -50,6 +54,7 @@ def add_layup_info_to_mesh(
     mesh: MeshedRegion,
     unit_system: Optional[UnitSystemProvider] = None,
     composite_definition_label: Optional[str] = None,
+    rst_stream_provider: Optional[Operator] = None,
 ) -> Operator:
     """Add lay-up information to the mesh.
 
@@ -71,21 +76,28 @@ def add_layup_info_to_mesh(
         dictionary key in the :attr:`.ContinuousFiberCompositesFiles.composite`
         attribute. This parameter is only required for assemblies.
         See the note about assemblies in the description for the :class:`.CompositeModel` class.
+    rst_stream_provider:
+        Pass RST stream to load section data directly from the RST file. Support with DPF 2024R2
+        (8.0) and later.
+
     Returns
     -------
     :
         Lay-up provider operator.
     """
-    composite_data_sources = _get_composite_data_sources_for_layup_provider(
-        data_sources, composite_definition_label
-    )
-
     # Set up the lay-up provider.
     # Reads the composite definition file and enriches the mesh
     # with the composite lay-up information.
     layup_provider = Operator("composite::layup_provider_operator")
     layup_provider.inputs.mesh(mesh)
-    layup_provider.inputs.data_sources(composite_data_sources)
+
+    composite_data_sources = _get_composite_data_sources_for_layup_provider(
+        data_sources, composite_definition_label
+    )
+
+    if composite_data_sources:
+        layup_provider.inputs.data_sources(composite_data_sources)
+
     layup_provider.inputs.abstract_field_support(
         material_operators.material_support_provider.outputs.abstract_field_support
     )
@@ -101,6 +113,12 @@ def add_layup_info_to_mesh(
         unit_system = material_operators.result_info_provider
 
     layup_provider.inputs.unit_system(unit_system)
+
+    if rst_stream_provider:
+        from ..server_helpers import version_equal_or_later
+        if version_equal_or_later(layup_provider._server, "8.0"):
+            layup_provider.inputs.rst_stream(rst_stream_provider)
+
     layup_provider.run()
 
     return layup_provider