Skip to content

Commit

Permalink
Merge pull request #94 from imcs-compsim/delete-solidnurbs27
Browse files Browse the repository at this point in the history 
Delete S0NURBS27
  • Loading branch information
@eulovi
eulovi authored Aug 22, 2024
2 parents 7c9e526 + 3d25b70 commit 74ccc7a
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 32 deletions.
3 changes: 1 addition & 2 deletions meshpy/nurbs_patch.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,10 +320,9 @@ def get_ids_ctrlpts_volume(knot_span_u, knot_span_v, knot_span_w):
)

patch_elements.append(
"{} SONURBS{} NURBS{} {} MAT {} {}".format(
"{} SOLID NURBS{} {} MAT {} {}".format(
self.n_global + increment_ele,
num_cp_in_element,
num_cp_in_element,
string_cps,
self.material.n_global,
self.element_description,
Expand Down
6 changes: 3 additions & 3 deletions tests/reference-files/test_meshpy_nurbs_import_reference.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -659,9 +659,9 @@ NODE 62 COORD -0.25 0.1 0.85
NODE 63 COORD -0.25 0.3 0.85
NODE 64 COORD -0.25 0.5 0.85
--------------------------------------------------------------STRUCTURE ELEMENTS
1 SONURBS27 NURBS27 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 MAT 1 GP 3 3 3
2 SONURBS27 NURBS27 3 28 29 6 30 31 9 32 33 12 34 35 15 36 37 18 38 39 21 40 41 24 42 43 27 44 45 MAT 1 GP 3 3 3
3 SONURBS27 NURBS27 29 46 1 31 47 4 33 48 7 35 49 10 37 50 13 39 51 16 41 52 19 43 53 22 45 54 25 MAT 1 GP 3 3 3
1 SOLID NURBS27 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 MAT 1 GP 3 3 3
2 SOLID NURBS27 3 28 29 6 30 31 9 32 33 12 34 35 15 36 37 18 38 39 21 40 41 24 42 43 27 44 45 MAT 1 GP 3 3 3
3 SOLID NURBS27 29 46 1 31 47 4 33 48 7 35 49 10 37 50 13 39 51 16 41 52 19 43 53 22 45 54 25 MAT 1 GP 3 3 3
4 BEAM3R HERM2LINE3 55 57 56 MAT 2 TRIADS 0 0 0 0 0 0 0 0 0
5 BEAM3R HERM2LINE3 57 59 58 MAT 2 TRIADS 0 0 0 0 0 0 0 0 0
6 BEAM3R HERM2LINE3 60 62 61 MAT 2 TRIADS 1.20919957616 1.20919957616 1.20919957616 1.20919957616 1.20919957616 1.20919957616 1.20919957616 1.20919957616 1.20919957616
Expand Down
6 changes: 3 additions & 3 deletions tests/reference-files/test_meshpy_nurbs_import_solid_mesh.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ CP 52 COORD +5.19615242e-01 +3.00000000e-01 +1.00000000e+00 +5.0000
CP 53 COORD +4.33012702e-01 +2.50000000e-01 +1.00000000e+00 +5.000000000000e-01
CP 54 COORD +3.46410162e-01 +2.00000000e-01 +1.00000000e+00 +5.000000000000e-01
--------------------------------------------------------STRUCTURE ELEMENTS
1 SONURBS27 NURBS27 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 MAT 1 GP 3 3 3
2 SONURBS27 NURBS27 3 28 29 6 30 31 9 32 33 12 34 35 15 36 37 18 38 39 21 40 41 24 42 43 27 44 45 MAT 1 GP 3 3 3
3 SONURBS27 NURBS27 29 46 1 31 47 4 33 48 7 35 49 10 37 50 13 39 51 16 41 52 19 43 53 22 45 54 25 MAT 1 GP 3 3 3
1 SOLID NURBS27 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 MAT 1 GP 3 3 3
2 SOLID NURBS27 3 28 29 6 30 31 9 32 33 12 34 35 15 36 37 18 38 39 21 40 41 24 42 43 27 44 45 MAT 1 GP 3 3 3
3 SOLID NURBS27 29 46 1 31 47 4 33 48 7 35 49 10 37 50 13 39 51 16 41 52 19 43 53 22 45 54 25 MAT 1 GP 3 3 3
-----------------------------------------------------------------------END
48 changes: 24 additions & 24 deletions tests/reference-files/test_nurbs_brick_reference.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,28 +508,28 @@ CP 118 COORD -0.375 1.5 1.2 1.0
CP 119 COORD 0.375 1.5 1.2 1.0
CP 120 COORD 0.75 1.5 1.2 1.0
--------------------------------------------------------------STRUCTURE ELEMENTS
1 SONURBS27 NURBS27 1 2 3 5 6 7 9 10 11 21 22 23 25 26 27 29 30 31 41 42 43 45 46 47 49 50 51 MAT 1 GP 3 3 3
2 SONURBS27 NURBS27 2 3 4 6 7 8 10 11 12 22 23 24 26 27 28 30 31 32 42 43 44 46 47 48 50 51 52 MAT 1 GP 3 3 3
3 SONURBS27 NURBS27 5 6 7 9 10 11 13 14 15 25 26 27 29 30 31 33 34 35 45 46 47 49 50 51 53 54 55 MAT 1 GP 3 3 3
4 SONURBS27 NURBS27 6 7 8 10 11 12 14 15 16 26 27 28 30 31 32 34 35 36 46 47 48 50 51 52 54 55 56 MAT 1 GP 3 3 3
5 SONURBS27 NURBS27 9 10 11 13 14 15 17 18 19 29 30 31 33 34 35 37 38 39 49 50 51 53 54 55 57 58 59 MAT 1 GP 3 3 3
6 SONURBS27 NURBS27 10 11 12 14 15 16 18 19 20 30 31 32 34 35 36 38 39 40 50 51 52 54 55 56 58 59 60 MAT 1 GP 3 3 3
7 SONURBS27 NURBS27 21 22 23 25 26 27 29 30 31 41 42 43 45 46 47 49 50 51 61 62 63 65 66 67 69 70 71 MAT 1 GP 3 3 3
8 SONURBS27 NURBS27 22 23 24 26 27 28 30 31 32 42 43 44 46 47 48 50 51 52 62 63 64 66 67 68 70 71 72 MAT 1 GP 3 3 3
9 SONURBS27 NURBS27 25 26 27 29 30 31 33 34 35 45 46 47 49 50 51 53 54 55 65 66 67 69 70 71 73 74 75 MAT 1 GP 3 3 3
10 SONURBS27 NURBS27 26 27 28 30 31 32 34 35 36 46 47 48 50 51 52 54 55 56 66 67 68 70 71 72 74 75 76 MAT 1 GP 3 3 3
11 SONURBS27 NURBS27 29 30 31 33 34 35 37 38 39 49 50 51 53 54 55 57 58 59 69 70 71 73 74 75 77 78 79 MAT 1 GP 3 3 3
12 SONURBS27 NURBS27 30 31 32 34 35 36 38 39 40 50 51 52 54 55 56 58 59 60 70 71 72 74 75 76 78 79 80 MAT 1 GP 3 3 3
13 SONURBS27 NURBS27 41 42 43 45 46 47 49 50 51 61 62 63 65 66 67 69 70 71 81 82 83 85 86 87 89 90 91 MAT 1 GP 3 3 3
14 SONURBS27 NURBS27 42 43 44 46 47 48 50 51 52 62 63 64 66 67 68 70 71 72 82 83 84 86 87 88 90 91 92 MAT 1 GP 3 3 3
15 SONURBS27 NURBS27 45 46 47 49 50 51 53 54 55 65 66 67 69 70 71 73 74 75 85 86 87 89 90 91 93 94 95 MAT 1 GP 3 3 3
16 SONURBS27 NURBS27 46 47 48 50 51 52 54 55 56 66 67 68 70 71 72 74 75 76 86 87 88 90 91 92 94 95 96 MAT 1 GP 3 3 3
17 SONURBS27 NURBS27 49 50 51 53 54 55 57 58 59 69 70 71 73 74 75 77 78 79 89 90 91 93 94 95 97 98 99 MAT 1 GP 3 3 3
18 SONURBS27 NURBS27 50 51 52 54 55 56 58 59 60 70 71 72 74 75 76 78 79 80 90 91 92 94 95 96 98 99 100 MAT 1 GP 3 3 3
19 SONURBS27 NURBS27 61 62 63 65 66 67 69 70 71 81 82 83 85 86 87 89 90 91 101 102 103 105 106 107 109 110 111 MAT 1 GP 3 3 3
20 SONURBS27 NURBS27 62 63 64 66 67 68 70 71 72 82 83 84 86 87 88 90 91 92 102 103 104 106 107 108 110 111 112 MAT 1 GP 3 3 3
21 SONURBS27 NURBS27 65 66 67 69 70 71 73 74 75 85 86 87 89 90 91 93 94 95 105 106 107 109 110 111 113 114 115 MAT 1 GP 3 3 3
22 SONURBS27 NURBS27 66 67 68 70 71 72 74 75 76 86 87 88 90 91 92 94 95 96 106 107 108 110 111 112 114 115 116 MAT 1 GP 3 3 3
23 SONURBS27 NURBS27 69 70 71 73 74 75 77 78 79 89 90 91 93 94 95 97 98 99 109 110 111 113 114 115 117 118 119 MAT 1 GP 3 3 3
24 SONURBS27 NURBS27 70 71 72 74 75 76 78 79 80 90 91 92 94 95 96 98 99 100 110 111 112 114 115 116 118 119 120 MAT 1 GP 3 3 3
1 SOLID NURBS27 1 2 3 5 6 7 9 10 11 21 22 23 25 26 27 29 30 31 41 42 43 45 46 47 49 50 51 MAT 1 GP 3 3 3
2 SOLID NURBS27 2 3 4 6 7 8 10 11 12 22 23 24 26 27 28 30 31 32 42 43 44 46 47 48 50 51 52 MAT 1 GP 3 3 3
3 SOLID NURBS27 5 6 7 9 10 11 13 14 15 25 26 27 29 30 31 33 34 35 45 46 47 49 50 51 53 54 55 MAT 1 GP 3 3 3
4 SOLID NURBS27 6 7 8 10 11 12 14 15 16 26 27 28 30 31 32 34 35 36 46 47 48 50 51 52 54 55 56 MAT 1 GP 3 3 3
5 SOLID NURBS27 9 10 11 13 14 15 17 18 19 29 30 31 33 34 35 37 38 39 49 50 51 53 54 55 57 58 59 MAT 1 GP 3 3 3
6 SOLID NURBS27 10 11 12 14 15 16 18 19 20 30 31 32 34 35 36 38 39 40 50 51 52 54 55 56 58 59 60 MAT 1 GP 3 3 3
7 SOLID NURBS27 21 22 23 25 26 27 29 30 31 41 42 43 45 46 47 49 50 51 61 62 63 65 66 67 69 70 71 MAT 1 GP 3 3 3
8 SOLID NURBS27 22 23 24 26 27 28 30 31 32 42 43 44 46 47 48 50 51 52 62 63 64 66 67 68 70 71 72 MAT 1 GP 3 3 3
9 SOLID NURBS27 25 26 27 29 30 31 33 34 35 45 46 47 49 50 51 53 54 55 65 66 67 69 70 71 73 74 75 MAT 1 GP 3 3 3
10 SOLID NURBS27 26 27 28 30 31 32 34 35 36 46 47 48 50 51 52 54 55 56 66 67 68 70 71 72 74 75 76 MAT 1 GP 3 3 3
11 SOLID NURBS27 29 30 31 33 34 35 37 38 39 49 50 51 53 54 55 57 58 59 69 70 71 73 74 75 77 78 79 MAT 1 GP 3 3 3
12 SOLID NURBS27 30 31 32 34 35 36 38 39 40 50 51 52 54 55 56 58 59 60 70 71 72 74 75 76 78 79 80 MAT 1 GP 3 3 3
13 SOLID NURBS27 41 42 43 45 46 47 49 50 51 61 62 63 65 66 67 69 70 71 81 82 83 85 86 87 89 90 91 MAT 1 GP 3 3 3
14 SOLID NURBS27 42 43 44 46 47 48 50 51 52 62 63 64 66 67 68 70 71 72 82 83 84 86 87 88 90 91 92 MAT 1 GP 3 3 3
15 SOLID NURBS27 45 46 47 49 50 51 53 54 55 65 66 67 69 70 71 73 74 75 85 86 87 89 90 91 93 94 95 MAT 1 GP 3 3 3
16 SOLID NURBS27 46 47 48 50 51 52 54 55 56 66 67 68 70 71 72 74 75 76 86 87 88 90 91 92 94 95 96 MAT 1 GP 3 3 3
17 SOLID NURBS27 49 50 51 53 54 55 57 58 59 69 70 71 73 74 75 77 78 79 89 90 91 93 94 95 97 98 99 MAT 1 GP 3 3 3
18 SOLID NURBS27 50 51 52 54 55 56 58 59 60 70 71 72 74 75 76 78 79 80 90 91 92 94 95 96 98 99 100 MAT 1 GP 3 3 3
19 SOLID NURBS27 61 62 63 65 66 67 69 70 71 81 82 83 85 86 87 89 90 91 101 102 103 105 106 107 109 110 111 MAT 1 GP 3 3 3
20 SOLID NURBS27 62 63 64 66 67 68 70 71 72 82 83 84 86 87 88 90 91 92 102 103 104 106 107 108 110 111 112 MAT 1 GP 3 3 3
21 SOLID NURBS27 65 66 67 69 70 71 73 74 75 85 86 87 89 90 91 93 94 95 105 106 107 109 110 111 113 114 115 MAT 1 GP 3 3 3
22 SOLID NURBS27 66 67 68 70 71 72 74 75 76 86 87 88 90 91 92 94 95 96 106 107 108 110 111 112 114 115 116 MAT 1 GP 3 3 3
23 SOLID NURBS27 69 70 71 73 74 75 77 78 79 89 90 91 93 94 95 97 98 99 109 110 111 113 114 115 117 118 119 MAT 1 GP 3 3 3
24 SOLID NURBS27 70 71 72 74 75 76 78 79 80 90 91 92 94 95 96 98 99 100 110 111 112 114 115 116 118 119 120 MAT 1 GP 3 3 3
-----------------------------------------------------------------------------END

0 comments on commit 74ccc7a

Please sign in to comment.