Skip to content

Commit c9f1688

Browse files
koubaaMohamed Koubaapyansys-ci-bot
authored
fix: Contact options (#733)
Co-authored-by: Mohamed Koubaa <[email protected]> Co-authored-by: pyansys-ci-bot <[email protected]>
1 parent 8ddf28f commit c9f1688

File tree

159 files changed

+115179
-11426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+115179
-11426
lines changed

‎codegen/generate.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -666,10 +666,11 @@ def get_loader():
666666

667667
def match_wildcard(keyword, wildcard):
668668
assert wildcard["type"] == "prefix"
669-
exclusions = set(wildcard.get("exclusions", []))
669+
exclusions = wildcard.get("exclusions", [])
670+
for exclusion in exclusions:
671+
if keyword.startswith(exclusion):
672+
return False
670673
for pattern in wildcard["patterns"]:
671-
if keyword in exclusions:
672-
continue
673674
if keyword.startswith(f"{pattern}"):
674675
return True
675676
return False

‎codegen/manifest.json‎

Lines changed: 91 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,20 @@
126126
{
127127
"type": "prefix",
128128
"patterns": ["CONTACT"],
129+
"exclusions": ["CONTACT_ADD_WEAR",
130+
"CONTACT_AUTO_MOVE",
131+
"CONTACT_COUPLING",
132+
"CONTACT_ENTITY",
133+
"CONTACT_EXCLUDE_INTERACTION",
134+
"CONTACT_FORCE_TRANSDUCER",
135+
"CONTACT_GEBOND",
136+
"CONTACT_GUIDED_CABLE",
137+
"CONTACT_INTERIOR",
138+
"CONTACT_RIGID_SURFACE",
139+
"CONTACT_SPG",
140+
"CONTACT_1D",
141+
"CONTACT_2D"
142+
],
129143
"generation-options": {
130144
"add-option": [
131145
{
@@ -153,6 +167,83 @@
153167
}
154168
],
155169
"option-name": "MPP"
170+
},
171+
{
172+
"card-order": 1,
173+
"title-order": 0,
174+
"cards": [
175+
{
176+
"source": "additional-cards",
177+
"card-name": "CONTACT_CARD_A"
178+
}
179+
],
180+
"option-name": "A"
181+
},
182+
{
183+
"card-order": 2,
184+
"title-order": 0,
185+
"cards": [
186+
{
187+
"source": "additional-cards",
188+
"card-name": "CONTACT_CARD_B"
189+
}
190+
],
191+
"option-name": "B"
192+
},
193+
{
194+
"card-order": 3,
195+
"title-order": 0,
196+
"cards": [
197+
{
198+
"source": "additional-cards",
199+
"card-name": "CONTACT_CARD_C"
200+
}
201+
],
202+
"option-name": "C"
203+
},
204+
{
205+
"card-order": 4,
206+
"title-order": 0,
207+
"cards": [
208+
{
209+
"source": "additional-cards",
210+
"card-name": "CONTACT_CARD_D"
211+
}
212+
],
213+
"option-name": "D"
214+
},
215+
{
216+
"card-order": 5,
217+
"title-order": 0,
218+
"cards": [
219+
{
220+
"source": "additional-cards",
221+
"card-name": "CONTACT_CARD_E"
222+
}
223+
],
224+
"option-name": "E"
225+
},
226+
{
227+
"card-order": 6,
228+
"title-order": 0,
229+
"cards": [
230+
{
231+
"source": "additional-cards",
232+
"card-name": "CONTACT_CARD_F"
233+
}
234+
],
235+
"option-name": "F"
236+
},
237+
{
238+
"card-order": 7,
239+
"title-order": 0,
240+
"cards": [
241+
{
242+
"source": "additional-cards",
243+
"card-name": "CONTACT_CARD_G"
244+
}
245+
],
246+
"option-name": "G"
156247
}
157248
]
158249
}
@@ -327,89 +418,6 @@
327418
]
328419
}
329420
},
330-
"CONTACT_TIED_SHELL_EDGE_TO_SURFACE_BEAM_OFFSET": {
331-
"generation-options": {
332-
"add-option": [
333-
{
334-
"card-order": 1,
335-
"title-order": 0,
336-
"cards": [
337-
{
338-
"source": "additional-cards",
339-
"card-name": "CONTACT_CARD_A"
340-
}
341-
],
342-
"option-name": "A"
343-
},
344-
{
345-
"card-order": 2,
346-
"title-order": 0,
347-
"cards": [
348-
{
349-
"source": "additional-cards",
350-
"card-name": "CONTACT_CARD_B"
351-
}
352-
],
353-
"option-name": "B"
354-
},
355-
{
356-
"card-order": 3,
357-
"title-order": 0,
358-
"cards": [
359-
{
360-
"source": "additional-cards",
361-
"card-name": "CONTACT_CARD_C"
362-
}
363-
],
364-
"option-name": "C"
365-
},
366-
{
367-
"card-order": 4,
368-
"title-order": 0,
369-
"cards": [
370-
{
371-
"source": "additional-cards",
372-
"card-name": "CONTACT_CARD_D"
373-
}
374-
],
375-
"option-name": "D"
376-
},
377-
{
378-
"card-order": 5,
379-
"title-order": 0,
380-
"cards": [
381-
{
382-
"source": "additional-cards",
383-
"card-name": "CONTACT_CARD_E"
384-
}
385-
],
386-
"option-name": "E"
387-
},
388-
{
389-
"card-order": 6,
390-
"title-order": 0,
391-
"cards": [
392-
{
393-
"source": "additional-cards",
394-
"card-name": "CONTACT_CARD_F"
395-
}
396-
],
397-
"option-name": "F"
398-
},
399-
{
400-
"card-order": 7,
401-
"title-order": 0,
402-
"cards": [
403-
{
404-
"source": "additional-cards",
405-
"card-name": "CONTACT_CARD_G"
406-
}
407-
],
408-
"option-name": "G"
409-
}
410-
]
411-
}
412-
},
413421
"CONTACT_AUTOMATIC_SINGLE_SURFACE": {
414422
"generation-options": {
415423
"insert-card": [

‎doc/changelog/733.miscellaneous.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fix: Contact options

0 commit comments

Comments
 (0)