fix: Fix BOUNDARY_PRESCRIBED_MOTION and CONSTRAINED_BEAM_IN_SOLID (#668)

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

codegen/generate.py

@@ -100,12 +100,17 @@ class Insertion:
     card: typing.Dict = None
 
 
-def get_card(source: str, identity: str):
-    if source != "additional-cards":
-        # TODO - allow getting option from elsewhere, like a given keywords/card index
-        #        or a new location entirely
-        raise Exception()
-    return ADDITIONAL_CARDS[identity]
+def get_card(setting: typing.Dict[str, str]):
+    source = setting["source"]
+    if source == "kwd-data":
+        data = KWDM_INSTANCE.get_keyword_data_dict(setting["keyword-name"])
+        card = data[setting["card-index"]]
+        return card
+
+    if source == "additional-cards":
+        return ADDITIONAL_CARDS[setting["card-name"]]
+
+    raise Exception()
 
 
 def get_classname(keyword: str):
@@ -190,15 +195,15 @@ def handle_card_sets(kwd_data, settings):
 def handle_replace_cards(kwd_data, settings):
     for card_settings in settings:
         index = card_settings["index"]
-        replacement = get_card(card_settings["card"]["source"], card_settings["card"]["card-name"])
+        replacement = get_card(card_settings["card"])
         replacement["index"] = index
         kwd_data["cards"][index] = replacement
 
 
 def handle_insert_cards(kwd_data, settings):
     for card_settings in settings:
         index = card_settings["index"]
-        card = get_card(card_settings["card"]["source"], card_settings["card"]["card-name"])
+        card = get_card(card_settings["card"])
         insertion = Insertion(index, "", card)
         kwd_data["card_insertions"].append(insertion)
 
@@ -280,6 +285,8 @@ def handle_override_field(kwd_data, settings):
                     field["default"] = setting["default"]
                 if "options" in setting:
                     field["options"] = setting["options"]
+                if "new-name" in setting:
+                    field["name"] = setting["new-name"]
 
 def handle_rename_property(kwd_data, settings):
     for setting in settings:
@@ -311,7 +318,7 @@ def handle_override_subkeyword(kwd_data, settings) -> None:
 
 def handle_add_option(kwd_data, settings):
     def expand(card):
-        card = get_card(card["source"], card["card-name"])
+        card = get_card(card)
         if "active" in card:
             card["func"] = card["active"]
         return card
@@ -672,7 +679,10 @@ def get_loader():
 
 def match_wildcard(keyword, wildcard):
     assert wildcard["type"] == "prefix"
+    exclusions = set(wildcard.get("exclusions", []))
     for pattern in wildcard["patterns"]:
+        if keyword in exclusions:
+            continue
         if keyword.startswith(f"{pattern}"):
             return True
     return False

codegen/manifest.json

@@ -19,6 +19,19 @@
                 ]
             }
         },
+        {
+            "type": "prefix",
+            "patterns": ["BOUNDARY_PRESCRIBED_MOTION"],
+            "exclusions": ["BOUNDARY_PRESCRIBED_MOTION_SET_SEGMENT"],
+            "generation-options": {
+                "conditional-card": [
+                    {
+                        "index": 1,
+                        "func": "abs(self.dof) in [9, 10, 11] or self.vad==4"
+                    }
+                ]
+            }
+        },
         {
             "type": "prefix",
             "patterns": ["CONSTRAINED_NODAL_RIGID_BODY"],
@@ -95,6 +108,33 @@
             }
         }
     ],
+    "CONSTRAINED_BEAM_IN_SOLID": {
+        "generation-options": {
+            "add-option": [
+                {
+                    "card-order": 1,
+                    "title-order": 0,
+                    "cards": [
+                        {
+                            "source": "kwd-data",
+                            "keyword-name": "CONSTRAINED_BEAM_IN_SOLID",
+                            "card-index": 0
+                        }
+                    ],
+                    "option-name": "ID"
+                }
+            ],
+            "skip-card": 0,
+            "override-field": [
+                {
+                    "index": 1,
+                    "name": "ncoup ",
+                    "new-name": "ncoup"
+                }
+            ]
+        },
+        "comment": "TODO - the option name is either ID or TITLE, but there is no way in pydyna to have a union option"
+    },
     "DEFINE_TRANSFORMATION": {
         "generation-options": {
             "duplicate-card": [

doc/changelog/668.fixed.md

@@ -0,0 +1 @@
+fix: Fix BOUNDARY_PRESCRIBED_MOTION and CONSTRAINED_BEAM_IN_SOLID

src/ansys/dyna/core/keywords/keyword_classes/auto/boundary_prescribed_motion.py

@@ -132,6 +132,7 @@ def __init__(self, **kwargs):
                         kwargs.get("node2", 0 if use_lspp_defaults() else None)
                     ),
                 ],
+                lambda: abs(self.dof) in [9, 10, 11] or self.vad==4,
             ),
         ]
 

src/ansys/dyna/core/keywords/keyword_classes/auto/boundary_prescribed_motion_edge_uvw.py

@@ -132,6 +132,7 @@ def __init__(self, **kwargs):
                         kwargs.get("node2", 0 if use_lspp_defaults() else None)
                     ),
                 ],
+                lambda: abs(self.dof) in [9, 10, 11] or self.vad==4,
             ),
             Card(
                 [

src/ansys/dyna/core/keywords/keyword_classes/auto/boundary_prescribed_motion_face_xyz.py

@@ -132,6 +132,7 @@ def __init__(self, **kwargs):
                         kwargs.get("node2", 0 if use_lspp_defaults() else None)
                     ),
                 ],
+                lambda: abs(self.dof) in [9, 10, 11] or self.vad==4,
             ),
             Card(
                 [

src/ansys/dyna/core/keywords/keyword_classes/auto/boundary_prescribed_motion_node.py

@@ -132,6 +132,7 @@ def __init__(self, **kwargs):
                         kwargs.get("node2", 0 if use_lspp_defaults() else None)
                     ),
                 ],
+                lambda: abs(self.dof) in [9, 10, 11] or self.vad==4,
             ),
         ]
 

src/ansys/dyna/core/keywords/keyword_classes/auto/boundary_prescribed_motion_point_uvw.py

@@ -132,6 +132,7 @@ def __init__(self, **kwargs):
                         kwargs.get("node2", 0 if use_lspp_defaults() else None)
                     ),
                 ],
+                lambda: abs(self.dof) in [9, 10, 11] or self.vad==4,
             ),
             Card(
                 [

src/ansys/dyna/core/keywords/keyword_classes/auto/boundary_prescribed_motion_rigid.py

@@ -132,6 +132,7 @@ def __init__(self, **kwargs):
                         kwargs.get("node2", 0 if use_lspp_defaults() else None)
                     ),
                 ],
+                lambda: abs(self.dof) in [9, 10, 11] or self.vad==4,
             ),
         ]
 

src/ansys/dyna/core/keywords/keyword_classes/auto/boundary_prescribed_motion_rigid_bndout2dynain.py

@@ -132,6 +132,7 @@ def __init__(self, **kwargs):
                         kwargs.get("node2", 0 if use_lspp_defaults() else None)
                     ),
                 ],
+                lambda: abs(self.dof) in [9, 10, 11] or self.vad==4,
             ),
             Card(
                 [

src/ansys/dyna/core/keywords/keyword_classes/auto/boundary_prescribed_motion_rigid_local.py

@@ -132,6 +132,7 @@ def __init__(self, **kwargs):
                         kwargs.get("node2", 0 if use_lspp_defaults() else None)
                     ),
                 ],
+                lambda: abs(self.dof) in [9, 10, 11] or self.vad==4,
             ),
         ]
 

src/ansys/dyna/core/keywords/keyword_classes/auto/boundary_prescribed_motion_rigid_local_bndout2dynain.py

@@ -132,6 +132,7 @@ def __init__(self, **kwargs):
                         kwargs.get("node2", 0 if use_lspp_defaults() else None)
                     ),
                 ],
+                lambda: abs(self.dof) in [9, 10, 11] or self.vad==4,
             ),
             Card(
                 [

src/ansys/dyna/core/keywords/keyword_classes/auto/boundary_prescribed_motion_set.py

@@ -132,6 +132,7 @@ def __init__(self, **kwargs):
                         kwargs.get("node2", 0 if use_lspp_defaults() else None)
                     ),
                 ],
+                lambda: abs(self.dof) in [9, 10, 11] or self.vad==4,
             ),
         ]
 

src/ansys/dyna/core/keywords/keyword_classes/auto/boundary_prescribed_motion_set_box.py

@@ -118,6 +118,7 @@ def __init__(self, **kwargs):
                         kwargs.get("lcbchk", 0 if use_lspp_defaults() else None)
                     ),
                 ],
+                lambda: abs(self.dof) in [9, 10, 11] or self.vad==4,
             ),
             Card(
                 [

src/ansys/dyna/core/keywords/keyword_classes/auto/boundary_prescribed_motion_set_edge_uvw.py

@@ -132,6 +132,7 @@ def __init__(self, **kwargs):
                         kwargs.get("node2", 0 if use_lspp_defaults() else None)
                     ),
                 ],
+                lambda: abs(self.dof) in [9, 10, 11] or self.vad==4,
             ),
             Card(
                 [

src/ansys/dyna/core/keywords/keyword_classes/auto/boundary_prescribed_motion_set_face_xyz.py

@@ -132,6 +132,7 @@ def __init__(self, **kwargs):
                         kwargs.get("node2", 0 if use_lspp_defaults() else None)
                     ),
                 ],
+                lambda: abs(self.dof) in [9, 10, 11] or self.vad==4,
             ),
             Card(
                 [

src/ansys/dyna/core/keywords/keyword_classes/auto/boundary_prescribed_motion_set_line.py

@@ -132,6 +132,7 @@ def __init__(self, **kwargs):
                         kwargs.get("node2", 0 if use_lspp_defaults() else None)
                     ),
                 ],
+                lambda: abs(self.dof) in [9, 10, 11] or self.vad==4,
             ),
             Card(
                 [

src/ansys/dyna/core/keywords/keyword_classes/auto/boundary_prescribed_motion_set_point_uvw.py

@@ -132,6 +132,7 @@ def __init__(self, **kwargs):
                         kwargs.get("node2", 0 if use_lspp_defaults() else None)
                     ),
                 ],
+                lambda: abs(self.dof) in [9, 10, 11] or self.vad==4,
             ),
             Card(
                 [