Skip to content

Commit 4325604

Browse files
authored
Merge pull request #107 from danielwolff1/fix-element-data-in-exo-section
Remove ELEMENT_DATA from exo section
2 parents 69623a9 + a4b825b commit 4325604

File tree

3 files changed

+18
-24
lines changed

3 files changed

+18
-24
lines changed

src/cubitpy/cubit_to_fourc_input.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,7 @@ def add_exodus_geometry_section(cubit, input_file, rel_exo_file_path):
148148
# add block id, fourc element name and element data string to the element block dictionary
149149
element_block_dict = {
150150
"ID": cur_block_id,
151-
"ELEMENT_DATA": {
152-
four_c_element_name: {cubit_element_name: cur_block_data[1]},
153-
},
151+
four_c_element_name: {cubit_element_name: cur_block_data[1]},
154152
}
155153
# append the dictionary with the element block information to the element block list
156154
input_file[cur_geometry_section_key]["ELEMENT_BLOCKS"].append(

tests/input-files-ref/test_yaml_with_exo_export.4C.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,12 @@ STRUCTURE GEOMETRY:
9393
SHOW_INFO: "detailed_summary"
9494
ELEMENT_BLOCKS:
9595
- ID: 1
96-
ELEMENT_DATA:
97-
SOLID:
98-
HEX8:
99-
MAT: 1
100-
KINEM: "nonlinear"
96+
SOLID:
97+
HEX8:
98+
MAT: 1
99+
KINEM: "nonlinear"
101100
- ID: 27
102-
ELEMENT_DATA:
103-
SOLID:
104-
HEX8:
105-
MAT: 2
106-
KINEM: "nonlinear"
101+
SOLID:
102+
HEX8:
103+
MAT: 2
104+
KINEM: "nonlinear"

tests/input-files-ref/test_yaml_with_exo_export_fsi.4C.yaml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,17 @@ STRUCTURE GEOMETRY:
1010
SHOW_INFO: "detailed_summary"
1111
ELEMENT_BLOCKS:
1212
- ID: 1
13-
ELEMENT_DATA:
14-
SOLID:
15-
HEX8:
16-
MAT: 1
17-
KINEM: "nonlinear"
18-
TECH: "eas_full"
13+
SOLID:
14+
HEX8:
15+
MAT: 1
16+
KINEM: "nonlinear"
17+
TECH: "eas_full"
1918
FLUID GEOMETRY:
2019
FILE: "test_yaml_with_exo_export_fsi.exo"
2120
SHOW_INFO: "detailed_summary"
2221
ELEMENT_BLOCKS:
2322
- ID: 2
24-
ELEMENT_DATA:
25-
FLUID:
26-
HEX8:
27-
MAT: 2
28-
NA: "ALE"
23+
FLUID:
24+
HEX8:
25+
MAT: 2
26+
NA: "ALE"

0 commit comments

Comments
 (0)