fix: Contact mpp fix (#744)

Co-authored-by: Mohamed Koubaa <[email protected]>
Co-authored-by: pyansys-ci-bot <[email protected]>

Author: 3 people

doc/changelog/744.documentation.md

@@ -0,0 +1 @@
+fix: Contact mpp fix

src/ansys/dyna/core/lib/card.py

@@ -56,21 +56,31 @@ def _convert_fields_to_long_format(self) -> typing.List[Field]:
         return fields
 
     def read(self, buf: typing.TextIO, parameter_set: ParameterSet = None) -> bool:
-        if not self._is_active():
+        if not self.active:
             return False
         line, to_exit = read_line(buf)
         if to_exit:
             return True
         self._load(line, parameter_set)
         return False
 
+    def _get_format_spec(self, fields):
+        format_spec = []
+        for field in fields:
+            if field._is_flag():
+                field_type = field._value
+            else:
+                field_type = field.type
+            format_spec.append((field.offset, field.width, field_type))
+        return format_spec
+
     def _load(self, data_line: str, parameter_set: ParameterSet) -> None:
         """loads the card data from a list of strings"""
         fields = self._fields
         if self.format == format_type.long:
             fields = self._convert_fields_to_long_format()
-        format = [(field.offset, field.width, field.type) for field in fields]
-        values = load_dataline(format, data_line, parameter_set)
+        format_spec = self._get_format_spec(fields)
+        values = load_dataline(format_spec, data_line, parameter_set)
         num_fields = len(fields)
         for field_index in range(num_fields):
             self._fields[field_index].value = values[field_index]
@@ -85,15 +95,16 @@ def write(
             format = self._format_type
 
         def _write(buf: typing.TextIO):
-            if self._is_active():
+            if self.active:
                 if comment:
                     write_comment_line(buf, self._fields, format)
                     buf.write("\n")
                 write_fields(buf, self._fields, None, format)
 
         return write_or_return(buf, _write)
 
-    def _is_active(self) -> bool:
+    @property
+    def active(self) -> bool:
         if self._active_func == None:
             return True
         return True if self._active_func() else False

src/ansys/dyna/core/lib/card_interface.py

@@ -37,6 +37,8 @@ def __subclasshook__(cls, subclass):
             and callable(subclass.write)
             and hasattr(subclass, "read")
             and callable(subclass.read)
+            and hasattr(subclass, "active")
+            and callable(subclass.active)
         )
 
     @abc.abstractmethod
@@ -65,3 +67,9 @@ def format(self) -> format_type:
     def format(self, value: format_type) -> None:
         """Set the card format type."""
         raise NotImplementedError
+
+    @property
+    @abc.abstractmethod
+    def active(self) -> bool:
+        """Return whether the card is active."""
+        raise NotImplementedError

src/ansys/dyna/core/lib/card_set.py

@@ -70,7 +70,7 @@ def _items(self, value: typing.List[Cards]) -> None:
     def _initialize(self):
         if self._initialized:
             return
-        if self._bounded and self._active:
+        if self._bounded and self.active:
             self._initialize_data(self._length_func())
         self._initialized = True
 
@@ -82,7 +82,7 @@ def option_specs(self):
         return self._option_specs
 
     @property
-    def _active(self) -> bool:
+    def active(self) -> bool:
         if self._active_func == None:
             return True
         return self._active_func()

src/ansys/dyna/core/lib/cards.py

@@ -23,6 +23,7 @@
 """Base class for cards and I/O."""
 
 import typing
+import warnings
 
 from ansys.dyna.core.lib.card_interface import CardInterface
 from ansys.dyna.core.lib.card_writer import write_cards
@@ -188,12 +189,28 @@ def _try_read_options_with_no_title(self, buf: typing.TextIO) -> None:
         if not any_options_read:
             buf.seek(pos)
 
+    def _read_card(self, card: CardInterface, buf: typing.TextIO, parameters: ParameterSet) -> bool:
+        pos = buf.tell()
+        with warnings.catch_warnings(record=True) as w:
+            card.read(buf, parameters)
+            caught = list(w)
+
+        # the card is not active after reading it. THat means we should *not* read it. Rewinding back to the buffer
+        # start position. In this case any warnings caused by reading the card can be ignored.
+        if not card.active:
+            buf.seek(pos)
+        else:
+            # emit warnings caught while reading the card
+            for caught_warning in caught:
+                warnings.warn(caught_warning.message)
+        return True
+
     def _read_data(self, buf: typing.TextIO, parameters: ParameterSet) -> None:
         for card in self._get_pre_option_cards():
-            card.read(buf, parameters)
+            self._read_card(card, buf, parameters)
         for card in self._get_non_option_cards():
-            card.read(buf, parameters)
+            self._read_card(card, buf, parameters)
         for card in self._get_post_option_cards():
-            card.read(buf, parameters)
+            self._read_card(card, buf, parameters)
 
         self._try_read_options_with_no_title(buf)

src/ansys/dyna/core/lib/cards_/special/include_card.py

@@ -73,7 +73,7 @@ def write(
             format = self._format_type
 
         def _write(buf: typing.TextIO):
-            if self._is_active():
+            if self.active:
                 if comment:
                     write_comment_line(buf, self._fields, format)
                     buf.write("\n")

src/ansys/dyna/core/lib/field.py

@@ -24,8 +24,6 @@
 import dataclasses
 import typing
 
-import pandas as pd
-
 from ansys.dyna.core.lib.config import use_lspp_defaults
 
 
@@ -52,8 +50,15 @@ def __init__(self, name: str, type: type, offset: int, width: int, /, value: typ
         else:
             self._value = kwargs.get(name, value) if use_lspp_defaults() else None
 
+    def _is_flag(self) -> bool:
+        return type(self._value) == Flag
+
     def __repr__(self) -> str:
-        return f"Field({self.name}, {self.type}, {self.offset}, {self.width}, {self.value})"
+        if self._is_flag():
+            valuestr = f"Flag({self.value})"
+        else:
+            valuestr = self.value
+        return f"Field({self.name}, {self.type}, {self.offset}, {self.width}, {valuestr})"
 
     @property
     def name(self) -> str:
@@ -89,28 +94,20 @@ def width(self, value: int) -> None:
 
     @property
     def value(self) -> typing.Any:
-        if type(self._value) == Flag:
+        if self._is_flag():
             return self._value.value
         return self._value
 
-    def _truthy_value(self, value) -> bool:
-        if pd.isna(value):
-            return False
-        return True if value else False
-
-    def _no_value_flag(self, value) -> bool:
-        return self._truthy_value(value) and type(value) is Flag
-
     @value.setter
     def value(self, value: typing.Any) -> None:
-        if type(self._value) == Flag:
+        if self._is_flag():
             self._value.value = value
         else:
             self._value = value
 
     def io_info(self) -> typing.Tuple[str, typing.Type]:
         """Return the value and type used for io."""
-        if type(self._value) == Flag:
+        if self._is_flag():
             if self._value.value:
                 return self._value.true_value, str
             else:

src/ansys/dyna/core/lib/series_card.py

@@ -171,7 +171,8 @@ def __get_null_value(self):
             return math.nan
         return None
 
-    def _is_active(self) -> bool:
+    @property
+    def active(self) -> bool:
         if self._active_func == None:
             return True
         return self._active_func()
@@ -299,7 +300,7 @@ def write(
         if format == None:
             format = self._format_type
         output = ""
-        if self._is_active():
+        if self.active:
             lines = [row for row in self._get_lines(format, comment) if row]
             output = "\n".join(lines)
         if buf == None:

src/ansys/dyna/core/lib/table_card.py

@@ -267,7 +267,7 @@ def bounded(self) -> bool:
         return self._bounded
 
     def _num_rows(self) -> int:
-        if not self._is_active():
+        if not self.active:
             return 0
         return self._length_func()
 

src/ansys/dyna/core/lib/table_card_group.py

@@ -136,7 +136,7 @@ def write(
         buf: typing.Optional[typing.TextIO] = None,
         comment: typing.Optional[bool] = True,
     ) -> str:
-        if self._is_active():
+        if self.active:
             self._initialize()
             self._propagate()
 
@@ -190,7 +190,8 @@ def _get_index_of_given_card(self, overall_index: int) -> int:
         index into the card given by _get_index_of_which_card"""
         return math.floor(overall_index / len(self._get_active_cards()))
 
-    def _is_active(self) -> bool:
+    @property
+    def active(self) -> bool:
         if self._active_func == None:
             return True
         return self._active_func()
@@ -214,7 +215,7 @@ def bounded(self) -> bool:
         return self._bounded
 
     def _num_rows(self) -> int:
-        if not self._is_active():
+        if not self.active:
             return 0
         num_active_cards = len(self._get_active_cards())
         return self._length_func() * num_active_cards