Skip to content

Commit 5fdc47b

Browse files
davidrudlstorferdavidrudlstorfer
authored
Merge pull request #302 from davidrudlstorfer/convert_dat_files_to_yaml
Convert dat files to yaml
2 parents 01959f9 + 749799a commit 5fdc47b

File tree

217 files changed

+30609
-26217
lines changed

Some content is hidden

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

217 files changed

+30609
-26217
lines changed

‎.github/workflows/testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
with:
9898
source-command: "source python-workflow-venv/bin/activate"
9999
install-command: "-e .[dev]"
100-
additional-pytest-flags: "--4C --ArborX --cov-fail-under=93"
100+
additional-pytest-flags: "--4C --ArborX --cov-fail-under=60" # TODO raise minimum coverage after yaml switch
101101
- name: Upload test results on failure
102102
if: failure()
103103
uses: actions/upload-artifact@v4

‎pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Issues = "https://github.com/imcs-compsim/meshpy/issues/"
5151

5252
[tool.pytest.ini_options]
5353
testpaths = ["tests"]
54-
addopts = "-p pytest_cov --cov-report=term --cov-report=html --cov-fail-under=90 --cov=src/meshpy/"
54+
addopts = "-p pytest_cov --cov-report=term --cov-report=html --cov-fail-under=50 --cov=src/meshpy/" # TODO raise minimum coverage after yaml switch
5555
markers = [
5656
"fourc: tests in combination with 4C",
5757
"arborx: tests in combination with ArborX",

‎tests/reference-files/4C_input_solid_cuboid.4C.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
MATERIALS:
2+
- MAT: 1
3+
MAT_Struct_StVenantKirchhoff:
4+
YOUNG: 1e+09
5+
NUE: 0
6+
DENS: 7.8e-06
7+
NODE COORDS:
8+
- NODE 1 COORD -0.5 -1 1.5
9+
- NODE 2 COORD -0.5 -1 -1.5
10+
- NODE 3 COORD -0.5 1 -1.5
11+
- NODE 4 COORD -0.5 1 1.5
12+
- NODE 5 COORD 0.5 -1 1.5
13+
- NODE 6 COORD 0.5 -1 -1.5
14+
- NODE 7 COORD 0.5 1 -1.5
15+
- NODE 8 COORD 0.5 1 1.5
16+
STRUCTURE ELEMENTS:
17+
- 1 SOLIDH8 HEX8 1 2 3 4 5 6 7 8 MAT 1 KINEM nonlinear EAS none

‎tests/reference-files/4C_input_solid_cuboid.dat

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎tests/reference-files/test_cosserat_curve_mesh.4C.yaml

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
MATERIALS: []
2+
NODE COORDS:
3+
- NODE 1 COORD -1.8 0 15
4+
- NODE 2 COORD -1.8 0 13.5
5+
- NODE 3 COORD 0 -1.8 13.5
6+
- NODE 4 COORD 0 -1.8 15
7+
- NODE 5 COORD -2 0 15
8+
- NODE 6 COORD -2 0 13.5
9+
- NODE 7 COORD 0 -2 13.5
10+
- NODE 8 COORD 0 -2 15
11+
- NODE 9 COORD -1.8 0 12
12+
- NODE 10 COORD 0 -1.8 12
13+
- NODE 11 COORD -2 0 12
14+
- NODE 12 COORD 0 -2 12
15+
- NODE 13 COORD -1.8 0 10.5
16+
- NODE 14 COORD 0 -1.8 10.5
17+
- NODE 15 COORD -2 0 10.5
18+
- NODE 16 COORD 0 -2 10.5
19+
- NODE 17 COORD -1.8 0 9
20+
- NODE 18 COORD 0 -1.8 9
21+
- NODE 19 COORD -2 0 9
22+
- NODE 20 COORD 0 -2 9
23+
- NODE 21 COORD -1.8 0 7.5
24+
- NODE 22 COORD 0 -1.8 7.5
25+
- NODE 23 COORD -2 0 7.5
26+
- NODE 24 COORD 0 -2 7.5
27+
- NODE 25 COORD -1.8 0 6
28+
- NODE 26 COORD 0 -1.8 6
29+
- NODE 27 COORD -2 0 6
30+
- NODE 28 COORD 0 -2 6
31+
- NODE 29 COORD -1.8 0 4.5
32+
- NODE 30 COORD 0 -1.8 4.5
33+
- NODE 31 COORD -2 0 4.5
34+
- NODE 32 COORD 0 -2 4.5
35+
- NODE 33 COORD -1.8 0 3
36+
- NODE 34 COORD 0 -1.8 3
37+
- NODE 35 COORD -2 0 3
38+
- NODE 36 COORD 0 -2 3
39+
- NODE 37 COORD -1.8 0 1.5
40+
- NODE 38 COORD 0 -1.8 1.5
41+
- NODE 39 COORD -2 0 1.5
42+
- NODE 40 COORD 0 -2 1.5
43+
- NODE 41 COORD -1.8 0 0
44+
- NODE 42 COORD 0 -1.8 0
45+
- NODE 43 COORD -2 0 0
46+
- NODE 44 COORD 0 -2 0
47+
- NODE 45 COORD 1.8 0 13.5
48+
- NODE 46 COORD 1.8 0 15
49+
- NODE 47 COORD 2 0 13.5
50+
- NODE 48 COORD 2 0 15
51+
- NODE 49 COORD 1.8 0 12
52+
- NODE 50 COORD 2 0 12
53+
- NODE 51 COORD 1.8 0 10.5
54+
- NODE 52 COORD 2 0 10.5
55+
- NODE 53 COORD 1.8 0 9
56+
- NODE 54 COORD 2 0 9
57+
- NODE 55 COORD 1.8 0 7.5
58+
- NODE 56 COORD 2 0 7.5
59+
- NODE 57 COORD 1.8 0 6
60+
- NODE 58 COORD 2 0 6
61+
- NODE 59 COORD 1.8 0 4.5
62+
- NODE 60 COORD 2 0 4.5
63+
- NODE 61 COORD 1.8 0 3
64+
- NODE 62 COORD 2 0 3
65+
- NODE 63 COORD 1.8 0 1.5
66+
- NODE 64 COORD 2 0 1.5
67+
- NODE 65 COORD 1.8 0 0
68+
- NODE 66 COORD 2 0 0
69+
- NODE 67 COORD 0 1.8 13.5
70+
- NODE 68 COORD 0 1.8 15
71+
- NODE 69 COORD 0 2 13.5
72+
- NODE 70 COORD 0 2 15
73+
- NODE 71 COORD 0 1.8 12
74+
- NODE 72 COORD 0 2 12
75+
- NODE 73 COORD 0 1.8 10.5
76+
- NODE 74 COORD 0 2 10.5
77+
- NODE 75 COORD 0 1.8 9
78+
- NODE 76 COORD 0 2 9
79+
- NODE 77 COORD 0 1.8 7.5
80+
- NODE 78 COORD 0 2 7.5
81+
- NODE 79 COORD 0 1.8 6
82+
- NODE 80 COORD 0 2 6
83+
- NODE 81 COORD 0 1.8 4.5
84+
- NODE 82 COORD 0 2 4.5
85+
- NODE 83 COORD 0 1.8 3
86+
- NODE 84 COORD 0 2 3
87+
- NODE 85 COORD 0 1.8 1.5
88+
- NODE 86 COORD 0 2 1.5
89+
- NODE 87 COORD 0 1.8 0
90+
- NODE 88 COORD 0 2 0
91+
STRUCTURE ELEMENTS:
92+
- 1 SOLIDH8 HEX8 1 2 3 4 5 6 7 8 MAT 1 KINEM nonlinear EAS none
93+
- 2 SOLIDH8 HEX8 2 9 10 3 6 11 12 7 MAT 1 KINEM nonlinear EAS none
94+
- 3 SOLIDH8 HEX8 9 13 14 10 11 15 16 12 MAT 1 KINEM nonlinear EAS none
95+
- 4 SOLIDH8 HEX8 13 17 18 14 15 19 20 16 MAT 1 KINEM nonlinear EAS none
96+
- 5 SOLIDH8 HEX8 17 21 22 18 19 23 24 20 MAT 1 KINEM nonlinear EAS none
97+
- 6 SOLIDH8 HEX8 21 25 26 22 23 27 28 24 MAT 1 KINEM nonlinear EAS none
98+
- 7 SOLIDH8 HEX8 25 29 30 26 27 31 32 28 MAT 1 KINEM nonlinear EAS none
99+
- 8 SOLIDH8 HEX8 29 33 34 30 31 35 36 32 MAT 1 KINEM nonlinear EAS none
100+
- 9 SOLIDH8 HEX8 33 37 38 34 35 39 40 36 MAT 1 KINEM nonlinear EAS none
101+
- 10 SOLIDH8 HEX8 37 41 42 38 39 43 44 40 MAT 1 KINEM nonlinear EAS none
102+
- 11 SOLIDH8 HEX8 4 3 45 46 8 7 47 48 MAT 1 KINEM nonlinear EAS none
103+
- 12 SOLIDH8 HEX8 3 10 49 45 7 12 50 47 MAT 1 KINEM nonlinear EAS none
104+
- 13 SOLIDH8 HEX8 10 14 51 49 12 16 52 50 MAT 1 KINEM nonlinear EAS none
105+
- 14 SOLIDH8 HEX8 14 18 53 51 16 20 54 52 MAT 1 KINEM nonlinear EAS none
106+
- 15 SOLIDH8 HEX8 18 22 55 53 20 24 56 54 MAT 1 KINEM nonlinear EAS none
107+
- 16 SOLIDH8 HEX8 22 26 57 55 24 28 58 56 MAT 1 KINEM nonlinear EAS none
108+
- 17 SOLIDH8 HEX8 26 30 59 57 28 32 60 58 MAT 1 KINEM nonlinear EAS none
109+
- 18 SOLIDH8 HEX8 30 34 61 59 32 36 62 60 MAT 1 KINEM nonlinear EAS none
110+
- 19 SOLIDH8 HEX8 34 38 63 61 36 40 64 62 MAT 1 KINEM nonlinear EAS none
111+
- 20 SOLIDH8 HEX8 38 42 65 63 40 44 66 64 MAT 1 KINEM nonlinear EAS none
112+
- 21 SOLIDH8 HEX8 46 45 67 68 48 47 69 70 MAT 1 KINEM nonlinear EAS none
113+
- 22 SOLIDH8 HEX8 45 49 71 67 47 50 72 69 MAT 1 KINEM nonlinear EAS none
114+
- 23 SOLIDH8 HEX8 49 51 73 71 50 52 74 72 MAT 1 KINEM nonlinear EAS none
115+
- 24 SOLIDH8 HEX8 51 53 75 73 52 54 76 74 MAT 1 KINEM nonlinear EAS none
116+
- 25 SOLIDH8 HEX8 53 55 77 75 54 56 78 76 MAT 1 KINEM nonlinear EAS none
117+
- 26 SOLIDH8 HEX8 55 57 79 77 56 58 80 78 MAT 1 KINEM nonlinear EAS none
118+
- 27 SOLIDH8 HEX8 57 59 81 79 58 60 82 80 MAT 1 KINEM nonlinear EAS none
119+
- 28 SOLIDH8 HEX8 59 61 83 81 60 62 84 82 MAT 1 KINEM nonlinear EAS none
120+
- 29 SOLIDH8 HEX8 61 63 85 83 62 64 86 84 MAT 1 KINEM nonlinear EAS none
121+
- 30 SOLIDH8 HEX8 63 65 87 85 64 66 88 86 MAT 1 KINEM nonlinear EAS none
122+
- 31 SOLIDH8 HEX8 68 67 2 1 70 69 6 5 MAT 1 KINEM nonlinear EAS none
123+
- 32 SOLIDH8 HEX8 67 71 9 2 69 72 11 6 MAT 1 KINEM nonlinear EAS none
124+
- 33 SOLIDH8 HEX8 71 73 13 9 72 74 15 11 MAT 1 KINEM nonlinear EAS none
125+
- 34 SOLIDH8 HEX8 73 75 17 13 74 76 19 15 MAT 1 KINEM nonlinear EAS none
126+
- 35 SOLIDH8 HEX8 75 77 21 17 76 78 23 19 MAT 1 KINEM nonlinear EAS none
127+
- 36 SOLIDH8 HEX8 77 79 25 21 78 80 27 23 MAT 1 KINEM nonlinear EAS none
128+
- 37 SOLIDH8 HEX8 79 81 29 25 80 82 31 27 MAT 1 KINEM nonlinear EAS none
129+
- 38 SOLIDH8 HEX8 81 83 33 29 82 84 35 31 MAT 1 KINEM nonlinear EAS none
130+
- 39 SOLIDH8 HEX8 83 85 37 33 84 86 39 35 MAT 1 KINEM nonlinear EAS none
131+
- 40 SOLIDH8 HEX8 85 87 41 37 86 88 43 39 MAT 1 KINEM nonlinear EAS none

‎tests/reference-files/test_cosserat_curve_mesh.dat

Lines changed: 0 additions & 131 deletions
This file was deleted.

0 commit comments

Comments
 (0)