diff --git a/meshpy/container.py b/meshpy/container.py index 3d3a7332..f3ab3944 100644 --- a/meshpy/container.py +++ b/meshpy/container.py @@ -49,9 +49,6 @@ class GeometryName(OrderedDict): functions. The sets can be accessed by a unique name. There is no distinction between different types of geometry, every name can only be used once -> use meaningful names. - OrderedDict is used as base class so that the test cases can compare the - output string without special implementation (this should not cost much - performance). """ def __setitem__(self, key, value): diff --git a/meshpy/mesh.py b/meshpy/mesh.py index cf080ff6..5aef053d 100644 --- a/meshpy/mesh.py +++ b/meshpy/mesh.py @@ -174,9 +174,12 @@ def add_geometry_set(self, geometry_set): self.geometry_sets.append(geometry_set.geometry_type, geometry_set) def add_geometry_name(self, geometry_name): - """Add a set of geometry sets to this mesh.""" - for _key, value in geometry_name.items(): - self.add(value) + """Add a set of geometry sets to this mesh. Sort by the keys here to create + a deterministic ordering, especially for testing purposes""" + keys = list(geometry_name.keys()) + keys.sort() + for key in keys: + self.add(geometry_name[key]) def replace_node(self, old_node, new_node): """Replace the first node with the second node.""" diff --git a/meshpy/mesh_creation_functions/nurbs_generic.py b/meshpy/mesh_creation_functions/nurbs_generic.py index b1c6c1ee..191c4f65 100644 --- a/meshpy/mesh_creation_functions/nurbs_generic.py +++ b/meshpy/mesh_creation_functions/nurbs_generic.py @@ -296,48 +296,42 @@ def get_patch_vertices(return_set, num_cps_uvw, nurbs_dimension, element): def get_patch_lines(return_set, num_cps_uvw, nurbs_dimension, element): """Get the control points positioned over the lines of a patch""" - control_points_line_1 = [] - control_points_line_2 = [] - control_points_line_3 = [] - control_points_line_4 = [] - if nurbs_dimension == 2: - # Fill line 1 and line 3 with their control points - for i in range(num_cps_uvw[0]): - # Line 1 has the control points on u = [0,1], v = 0 - cpgid_l1 = num_cps_uvw[0] * 0 + i - control_points_line_1.append(element.nodes[cpgid_l1]) - - # Line 3 has the control points on u = [0,1], v = 1 - cpgid_l3 = num_cps_uvw[0] * (num_cps_uvw[1] - 1) + i - control_points_line_3.append(element.nodes[cpgid_l3]) - - # Fill line 2 and line 4 with their control points - for j in range(num_cps_uvw[1]): - # Line 2 has the control points on u = 1, v = [0,1] - cpgid_l2 = num_cps_uvw[0] * j + (num_cps_uvw[0] - 1) - control_points_line_2.append(element.nodes[cpgid_l2]) - - # Line 4 has the control points on u = 0, v = [0,1] - cpgid_l4 = num_cps_uvw[0] * j + 0 - control_points_line_4.append(element.nodes[cpgid_l4]) - - # Create geometric sets for lines - return_set["line_v_min"] = GeometrySetNodes( - mpy.geo.line, nodes=control_points_line_1 - ) - return_set["line_u_max"] = GeometrySetNodes( - mpy.geo.line, nodes=control_points_line_2 - ) - return_set["line_v_max"] = GeometrySetNodes( - mpy.geo.line, nodes=control_points_line_3 - ) - return_set["line_u_min"] = GeometrySetNodes( - mpy.geo.line, nodes=control_points_line_4 - ) + name_dir = ["v", "u"] + name_other_dir = ["min", "min_next", "max_next", "max"] + + for i_dir, i_other_dir in ((0, 1), (1, 0)): + n_cp_dir = num_cps_uvw[i_dir] + n_cp_other_dir = num_cps_uvw[i_other_dir] + factor_dir = 1 if i_dir == 0 else n_cp_other_dir + factor_other_dir = n_cp_dir if i_dir == 0 else 1 + + for index, i_along_other_dir in enumerate( + ( + 0, + 1, + n_cp_other_dir - 2, + n_cp_other_dir - 1, + ) + ): + cp_indices = [] + for i_along_dir in range(n_cp_dir): + cp_indices.append( + i_along_other_dir * factor_other_dir + + i_along_dir * factor_dir + ) + set_name = f"line_{name_dir[i_dir]}_{name_other_dir[index]}" + return_set[set_name] = GeometrySetNodes( + mpy.geo.line, + nodes=[element.nodes[i_node] for i_node in cp_indices], + ) elif nurbs_dimension == 3: # Define the rest of the lines to define a volume + control_points_line_1 = [] + control_points_line_2 = [] + control_points_line_3 = [] + control_points_line_4 = [] control_points_line_5 = [] control_points_line_6 = [] control_points_line_7 = [] diff --git a/tests/reference-files/test_mesh_creation_functions_curve_2d_sin_reference.dat b/tests/reference-files/test_mesh_creation_functions_curve_2d_sin_reference.dat index 3455573d..0d9e326c 100644 --- a/tests/reference-files/test_mesh_creation_functions_curve_2d_sin_reference.dat +++ b/tests/reference-files/test_mesh_creation_functions_curve_2d_sin_reference.dat @@ -9,8 +9,8 @@ -----------------------------------------------------------------------MATERIALS MAT 1 MAT_BeamReissnerElastHyper YOUNG -1.0 POISSONRATIO 0.0 DENS 0.0 CROSSAREA 3.141592653589793 SHEARCORR 1 MOMINPOL 1.5707963267948966 MOMIN2 0.7853981633974483 MOMIN3 0.7853981633974483 -------------------------------------------------------------DNODE-NODE TOPOLOGY -NODE 1 DNODE 1 -NODE 17 DNODE 2 +NODE 17 DNODE 1 +NODE 1 DNODE 2 -------------------------------------------------------------DLINE-NODE TOPOLOGY NODE 1 DLINE 1 NODE 2 DLINE 1 diff --git a/tests/reference-files/test_mesh_creation_functions_curve_3d_curve_rotation_reference.dat b/tests/reference-files/test_mesh_creation_functions_curve_3d_curve_rotation_reference.dat index 06dbaca8..93adf51d 100644 --- a/tests/reference-files/test_mesh_creation_functions_curve_3d_curve_rotation_reference.dat +++ b/tests/reference-files/test_mesh_creation_functions_curve_3d_curve_rotation_reference.dat @@ -9,8 +9,8 @@ -----------------------------------------------------------------------MATERIALS MAT 1 MAT_BeamReissnerElastHyper YOUNG -1.0 POISSONRATIO 0.0 DENS 0.0 CROSSAREA 3.141592653589793 SHEARCORR 1 MOMINPOL 1.5707963267948966 MOMIN2 0.7853981633974483 MOMIN3 0.7853981633974483 -------------------------------------------------------------DNODE-NODE TOPOLOGY -NODE 1 DNODE 1 -NODE 9 DNODE 2 +NODE 9 DNODE 1 +NODE 1 DNODE 2 -------------------------------------------------------------DLINE-NODE TOPOLOGY NODE 1 DLINE 1 NODE 2 DLINE 1 diff --git a/tests/reference-files/test_mesh_creation_functions_curve_3d_helix_reference.dat b/tests/reference-files/test_mesh_creation_functions_curve_3d_helix_reference.dat index 5270378a..ddc14549 100644 --- a/tests/reference-files/test_mesh_creation_functions_curve_3d_helix_reference.dat +++ b/tests/reference-files/test_mesh_creation_functions_curve_3d_helix_reference.dat @@ -9,8 +9,8 @@ -----------------------------------------------------------------------MATERIALS MAT 1 MAT_BeamReissnerElastHyper YOUNG -1.0 POISSONRATIO 0.0 DENS 0.0 CROSSAREA 3.141592653589793 SHEARCORR 1 MOMINPOL 1.5707963267948966 MOMIN2 0.7853981633974483 MOMIN3 0.7853981633974483 -------------------------------------------------------------DNODE-NODE TOPOLOGY -NODE 1 DNODE 1 -NODE 11 DNODE 2 +NODE 11 DNODE 1 +NODE 1 DNODE 2 -------------------------------------------------------------DLINE-NODE TOPOLOGY NODE 1 DLINE 1 NODE 2 DLINE 1 diff --git a/tests/reference-files/test_mesh_creation_functions_curve_3d_line_reference.dat b/tests/reference-files/test_mesh_creation_functions_curve_3d_line_reference.dat index 437a1a8c..80b33c22 100644 --- a/tests/reference-files/test_mesh_creation_functions_curve_3d_line_reference.dat +++ b/tests/reference-files/test_mesh_creation_functions_curve_3d_line_reference.dat @@ -9,10 +9,10 @@ -----------------------------------------------------------------------MATERIALS MAT 1 MAT_BeamReissnerElastHyper YOUNG 207.0 POISSONRATIO 0.0 DENS 0.0 CROSSAREA 0.031415926535897934 SHEARCORR 1.1 MOMINPOL 0.00015707963267948968 MOMIN2 7.853981633974484e-05 MOMIN3 7.853981633974484e-05 -------------------------------------------------------------DNODE-NODE TOPOLOGY -NODE 1 DNODE 1 -NODE 7 DNODE 2 -NODE 8 DNODE 3 -NODE 14 DNODE 4 +NODE 7 DNODE 1 +NODE 1 DNODE 2 +NODE 14 DNODE 3 +NODE 8 DNODE 4 -------------------------------------------------------------DLINE-NODE TOPOLOGY NODE 1 DLINE 1 NODE 2 DLINE 1 diff --git a/tests/reference-files/test_mesh_creation_functions_fibers_in_rectangle_return_set_reference.dat b/tests/reference-files/test_mesh_creation_functions_fibers_in_rectangle_return_set_reference.dat index 173f7b17..f6b0297b 100644 --- a/tests/reference-files/test_mesh_creation_functions_fibers_in_rectangle_return_set_reference.dat +++ b/tests/reference-files/test_mesh_creation_functions_fibers_in_rectangle_return_set_reference.dat @@ -9,13 +9,13 @@ -----------------------------------------------------------------------MATERIALS MAT 1 MAT_BeamKirchhoffTorsionFreeElastHyper YOUNG -1.0 DENS 0.0 CROSSAREA 3.141592653589793 MOMIN 0.7853981633974483 -------------------------------------------------------------DNODE-NODE TOPOLOGY -NODE 5 DNODE 1 -NODE 10 DNODE 1 -NODE 18 DNODE 1 -NODE 23 DNODE 1 -NODE 28 DNODE 1 -NODE 31 DNODE 1 -NODE 13 DNODE 2 +NODE 13 DNODE 1 +NODE 5 DNODE 2 +NODE 10 DNODE 2 +NODE 18 DNODE 2 +NODE 23 DNODE 2 +NODE 28 DNODE 2 +NODE 31 DNODE 2 NODE 1 DNODE 3 NODE 6 DNODE 3 NODE 11 DNODE 3 @@ -113,4 +113,4 @@ NODE 31 COORD 0.590811690796 1 0 23 BEAM3EB LINE2 29 30 MAT 1 24 BEAM3EB LINE2 30 31 MAT 1 ------------------------------------------------------------------FLUID ELEMENTS ------------------------------------------------------------------------------END +-----------------------------------------------------------------------------END \ No newline at end of file diff --git a/tests/reference-files/test_mesh_creation_functions_wire_reference.dat b/tests/reference-files/test_mesh_creation_functions_wire_reference.dat index e7551bd1..d53fa567 100644 --- a/tests/reference-files/test_mesh_creation_functions_wire_reference.dat +++ b/tests/reference-files/test_mesh_creation_functions_wire_reference.dat @@ -9,82 +9,82 @@ -----------------------------------------------------------------------MATERIALS MAT 1 MAT_BeamKirchhoffTorsionFreeElastHyper YOUNG -1.0 DENS 0.0 CROSSAREA 0.007853981633974483 MOMIN 4.9087385212340526e-06 -------------------------------------------------------------DNODE-NODE TOPOLOGY -NODE 1 DNODE 1 -NODE 4 DNODE 1 -NODE 7 DNODE 1 -NODE 10 DNODE 1 -NODE 13 DNODE 1 -NODE 16 DNODE 1 -NODE 19 DNODE 1 -NODE 22 DNODE 1 -NODE 25 DNODE 1 -NODE 28 DNODE 1 -NODE 31 DNODE 1 -NODE 34 DNODE 1 -NODE 37 DNODE 1 -NODE 40 DNODE 1 -NODE 43 DNODE 1 -NODE 46 DNODE 1 -NODE 49 DNODE 1 -NODE 52 DNODE 1 -NODE 55 DNODE 1 -NODE 3 DNODE 2 -NODE 6 DNODE 2 -NODE 9 DNODE 2 -NODE 12 DNODE 2 -NODE 15 DNODE 2 -NODE 18 DNODE 2 -NODE 21 DNODE 2 -NODE 24 DNODE 2 -NODE 27 DNODE 2 -NODE 30 DNODE 2 -NODE 33 DNODE 2 -NODE 36 DNODE 2 -NODE 39 DNODE 2 -NODE 42 DNODE 2 -NODE 45 DNODE 2 -NODE 48 DNODE 2 -NODE 51 DNODE 2 -NODE 54 DNODE 2 -NODE 57 DNODE 2 -NODE 58 DNODE 3 -NODE 61 DNODE 3 -NODE 64 DNODE 3 -NODE 67 DNODE 3 -NODE 70 DNODE 3 -NODE 73 DNODE 3 -NODE 76 DNODE 3 -NODE 79 DNODE 3 -NODE 82 DNODE 3 -NODE 85 DNODE 3 -NODE 88 DNODE 3 -NODE 91 DNODE 3 -NODE 94 DNODE 3 -NODE 97 DNODE 3 -NODE 100 DNODE 3 -NODE 103 DNODE 3 -NODE 106 DNODE 3 -NODE 109 DNODE 3 -NODE 112 DNODE 3 -NODE 60 DNODE 4 -NODE 63 DNODE 4 -NODE 66 DNODE 4 -NODE 69 DNODE 4 -NODE 72 DNODE 4 -NODE 75 DNODE 4 -NODE 78 DNODE 4 -NODE 81 DNODE 4 -NODE 84 DNODE 4 -NODE 87 DNODE 4 -NODE 90 DNODE 4 -NODE 93 DNODE 4 -NODE 96 DNODE 4 -NODE 99 DNODE 4 -NODE 102 DNODE 4 -NODE 105 DNODE 4 -NODE 108 DNODE 4 -NODE 111 DNODE 4 -NODE 114 DNODE 4 +NODE 3 DNODE 1 +NODE 6 DNODE 1 +NODE 9 DNODE 1 +NODE 12 DNODE 1 +NODE 15 DNODE 1 +NODE 18 DNODE 1 +NODE 21 DNODE 1 +NODE 24 DNODE 1 +NODE 27 DNODE 1 +NODE 30 DNODE 1 +NODE 33 DNODE 1 +NODE 36 DNODE 1 +NODE 39 DNODE 1 +NODE 42 DNODE 1 +NODE 45 DNODE 1 +NODE 48 DNODE 1 +NODE 51 DNODE 1 +NODE 54 DNODE 1 +NODE 57 DNODE 1 +NODE 1 DNODE 2 +NODE 4 DNODE 2 +NODE 7 DNODE 2 +NODE 10 DNODE 2 +NODE 13 DNODE 2 +NODE 16 DNODE 2 +NODE 19 DNODE 2 +NODE 22 DNODE 2 +NODE 25 DNODE 2 +NODE 28 DNODE 2 +NODE 31 DNODE 2 +NODE 34 DNODE 2 +NODE 37 DNODE 2 +NODE 40 DNODE 2 +NODE 43 DNODE 2 +NODE 46 DNODE 2 +NODE 49 DNODE 2 +NODE 52 DNODE 2 +NODE 55 DNODE 2 +NODE 60 DNODE 3 +NODE 63 DNODE 3 +NODE 66 DNODE 3 +NODE 69 DNODE 3 +NODE 72 DNODE 3 +NODE 75 DNODE 3 +NODE 78 DNODE 3 +NODE 81 DNODE 3 +NODE 84 DNODE 3 +NODE 87 DNODE 3 +NODE 90 DNODE 3 +NODE 93 DNODE 3 +NODE 96 DNODE 3 +NODE 99 DNODE 3 +NODE 102 DNODE 3 +NODE 105 DNODE 3 +NODE 108 DNODE 3 +NODE 111 DNODE 3 +NODE 114 DNODE 3 +NODE 58 DNODE 4 +NODE 61 DNODE 4 +NODE 64 DNODE 4 +NODE 67 DNODE 4 +NODE 70 DNODE 4 +NODE 73 DNODE 4 +NODE 76 DNODE 4 +NODE 79 DNODE 4 +NODE 82 DNODE 4 +NODE 85 DNODE 4 +NODE 88 DNODE 4 +NODE 91 DNODE 4 +NODE 94 DNODE 4 +NODE 97 DNODE 4 +NODE 100 DNODE 4 +NODE 103 DNODE 4 +NODE 106 DNODE 4 +NODE 109 DNODE 4 +NODE 112 DNODE 4 -------------------------------------------------------------DLINE-NODE TOPOLOGY NODE 1 DLINE 1 NODE 2 DLINE 1 @@ -393,4 +393,4 @@ NODE 114 COORD 3 1.8 -0.173205080757 75 BEAM3EB LINE2 112 113 MAT 1 76 BEAM3EB LINE2 113 114 MAT 1 ------------------------------------------------------------------FLUID ELEMENTS ------------------------------------------------------------------------------END +-----------------------------------------------------------------------------END \ No newline at end of file diff --git a/tests/reference-files/test_meshpy_vtk_beam_reference.vtu b/tests/reference-files/test_meshpy_vtk_beam_reference.vtu index cd789204..4fde4360 100644 --- a/tests/reference-files/test_meshpy_vtk_beam_reference.vtu +++ b/tests/reference-files/test_meshpy_vtk_beam_reference.vtu @@ -75,7 +75,7 @@ 1 1 1 1 1 1 1 1 1 1 1 1 - + -1 -1 -1 -1 -1 1 1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 @@ -411,7 +411,7 @@ 1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 - + -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 diff --git a/tests/reference-files/test_nurbs_brick_reference.dat b/tests/reference-files/test_nurbs_brick_reference.dat index 8cba06b0..a976fa6b 100644 --- a/tests/reference-files/test_nurbs_brick_reference.dat +++ b/tests/reference-files/test_nurbs_brick_reference.dat @@ -47,224 +47,224 @@ TYPE Interpolated 1.0 END NURBSPATCH -------------------------------------------------------------DNODE-NODE TOPOLOGY -NODE 1 DNODE 1 -NODE 4 DNODE 2 -NODE 17 DNODE 3 -NODE 20 DNODE 4 -NODE 101 DNODE 5 -NODE 104 DNODE 6 -NODE 117 DNODE 7 -NODE 120 DNODE 8 +NODE 120 DNODE 1 +NODE 20 DNODE 2 +NODE 104 DNODE 3 +NODE 4 DNODE 4 +NODE 117 DNODE 5 +NODE 17 DNODE 6 +NODE 101 DNODE 7 +NODE 1 DNODE 8 -------------------------------------------------------------DLINE-NODE TOPOLOGY -NODE 1 DLINE 1 -NODE 2 DLINE 1 -NODE 3 DLINE 1 -NODE 4 DLINE 1 +NODE 20 DLINE 1 +NODE 40 DLINE 1 +NODE 60 DLINE 1 +NODE 80 DLINE 1 +NODE 100 DLINE 1 +NODE 120 DLINE 1 NODE 4 DLINE 2 -NODE 8 DLINE 2 -NODE 12 DLINE 2 -NODE 16 DLINE 2 -NODE 20 DLINE 2 -NODE 17 DLINE 3 -NODE 18 DLINE 3 -NODE 19 DLINE 3 -NODE 20 DLINE 3 -NODE 1 DLINE 4 -NODE 5 DLINE 4 -NODE 9 DLINE 4 -NODE 13 DLINE 4 -NODE 17 DLINE 4 -NODE 1 DLINE 5 -NODE 21 DLINE 5 -NODE 41 DLINE 5 -NODE 61 DLINE 5 -NODE 81 DLINE 5 -NODE 101 DLINE 5 -NODE 4 DLINE 6 -NODE 24 DLINE 6 -NODE 44 DLINE 6 -NODE 64 DLINE 6 -NODE 84 DLINE 6 -NODE 104 DLINE 6 -NODE 17 DLINE 7 -NODE 37 DLINE 7 -NODE 57 DLINE 7 -NODE 77 DLINE 7 -NODE 97 DLINE 7 +NODE 24 DLINE 2 +NODE 44 DLINE 2 +NODE 64 DLINE 2 +NODE 84 DLINE 2 +NODE 104 DLINE 2 +NODE 104 DLINE 3 +NODE 108 DLINE 3 +NODE 112 DLINE 3 +NODE 116 DLINE 3 +NODE 120 DLINE 3 +NODE 4 DLINE 4 +NODE 8 DLINE 4 +NODE 12 DLINE 4 +NODE 16 DLINE 4 +NODE 20 DLINE 4 +NODE 17 DLINE 5 +NODE 37 DLINE 5 +NODE 57 DLINE 5 +NODE 77 DLINE 5 +NODE 97 DLINE 5 +NODE 117 DLINE 5 +NODE 1 DLINE 6 +NODE 21 DLINE 6 +NODE 41 DLINE 6 +NODE 61 DLINE 6 +NODE 81 DLINE 6 +NODE 101 DLINE 6 +NODE 101 DLINE 7 +NODE 105 DLINE 7 +NODE 109 DLINE 7 +NODE 113 DLINE 7 NODE 117 DLINE 7 -NODE 20 DLINE 8 -NODE 40 DLINE 8 -NODE 60 DLINE 8 -NODE 80 DLINE 8 -NODE 100 DLINE 8 -NODE 120 DLINE 8 -NODE 101 DLINE 9 -NODE 102 DLINE 9 -NODE 103 DLINE 9 -NODE 104 DLINE 9 -NODE 104 DLINE 10 -NODE 108 DLINE 10 -NODE 112 DLINE 10 -NODE 116 DLINE 10 -NODE 120 DLINE 10 -NODE 117 DLINE 11 -NODE 118 DLINE 11 -NODE 119 DLINE 11 -NODE 120 DLINE 11 -NODE 101 DLINE 12 -NODE 105 DLINE 12 -NODE 109 DLINE 12 -NODE 113 DLINE 12 -NODE 117 DLINE 12 +NODE 1 DLINE 8 +NODE 5 DLINE 8 +NODE 9 DLINE 8 +NODE 13 DLINE 8 +NODE 17 DLINE 8 +NODE 117 DLINE 9 +NODE 118 DLINE 9 +NODE 119 DLINE 9 +NODE 120 DLINE 9 +NODE 17 DLINE 10 +NODE 18 DLINE 10 +NODE 19 DLINE 10 +NODE 20 DLINE 10 +NODE 101 DLINE 11 +NODE 102 DLINE 11 +NODE 103 DLINE 11 +NODE 104 DLINE 11 +NODE 1 DLINE 12 +NODE 2 DLINE 12 +NODE 3 DLINE 12 +NODE 4 DLINE 12 -------------------------------------------------------------DSURF-NODE TOPOLOGY -NODE 1 DSURFACE 1 -NODE 2 DSURFACE 1 -NODE 3 DSURFACE 1 NODE 4 DSURFACE 1 -NODE 5 DSURFACE 1 -NODE 6 DSURFACE 1 -NODE 7 DSURFACE 1 NODE 8 DSURFACE 1 -NODE 9 DSURFACE 1 -NODE 10 DSURFACE 1 -NODE 11 DSURFACE 1 NODE 12 DSURFACE 1 -NODE 13 DSURFACE 1 -NODE 14 DSURFACE 1 -NODE 15 DSURFACE 1 NODE 16 DSURFACE 1 -NODE 17 DSURFACE 1 -NODE 18 DSURFACE 1 -NODE 19 DSURFACE 1 NODE 20 DSURFACE 1 +NODE 24 DSURFACE 1 +NODE 28 DSURFACE 1 +NODE 32 DSURFACE 1 +NODE 36 DSURFACE 1 +NODE 40 DSURFACE 1 +NODE 44 DSURFACE 1 +NODE 48 DSURFACE 1 +NODE 52 DSURFACE 1 +NODE 56 DSURFACE 1 +NODE 60 DSURFACE 1 +NODE 64 DSURFACE 1 +NODE 68 DSURFACE 1 +NODE 72 DSURFACE 1 +NODE 76 DSURFACE 1 +NODE 80 DSURFACE 1 +NODE 84 DSURFACE 1 +NODE 88 DSURFACE 1 +NODE 92 DSURFACE 1 +NODE 96 DSURFACE 1 +NODE 100 DSURFACE 1 +NODE 104 DSURFACE 1 +NODE 108 DSURFACE 1 +NODE 112 DSURFACE 1 +NODE 116 DSURFACE 1 +NODE 120 DSURFACE 1 +NODE 1 DSURFACE 2 +NODE 5 DSURFACE 2 +NODE 9 DSURFACE 2 +NODE 13 DSURFACE 2 +NODE 17 DSURFACE 2 +NODE 21 DSURFACE 2 +NODE 25 DSURFACE 2 +NODE 29 DSURFACE 2 +NODE 33 DSURFACE 2 +NODE 37 DSURFACE 2 +NODE 41 DSURFACE 2 +NODE 45 DSURFACE 2 +NODE 49 DSURFACE 2 +NODE 53 DSURFACE 2 +NODE 57 DSURFACE 2 +NODE 61 DSURFACE 2 +NODE 65 DSURFACE 2 +NODE 69 DSURFACE 2 +NODE 73 DSURFACE 2 +NODE 77 DSURFACE 2 +NODE 81 DSURFACE 2 +NODE 85 DSURFACE 2 +NODE 89 DSURFACE 2 +NODE 93 DSURFACE 2 +NODE 97 DSURFACE 2 NODE 101 DSURFACE 2 -NODE 102 DSURFACE 2 -NODE 103 DSURFACE 2 -NODE 104 DSURFACE 2 NODE 105 DSURFACE 2 -NODE 106 DSURFACE 2 -NODE 107 DSURFACE 2 -NODE 108 DSURFACE 2 NODE 109 DSURFACE 2 -NODE 110 DSURFACE 2 -NODE 111 DSURFACE 2 -NODE 112 DSURFACE 2 NODE 113 DSURFACE 2 -NODE 114 DSURFACE 2 -NODE 115 DSURFACE 2 -NODE 116 DSURFACE 2 NODE 117 DSURFACE 2 -NODE 118 DSURFACE 2 -NODE 119 DSURFACE 2 -NODE 120 DSURFACE 2 -NODE 1 DSURFACE 3 -NODE 2 DSURFACE 3 -NODE 3 DSURFACE 3 -NODE 4 DSURFACE 3 -NODE 21 DSURFACE 3 -NODE 22 DSURFACE 3 -NODE 23 DSURFACE 3 -NODE 24 DSURFACE 3 -NODE 41 DSURFACE 3 -NODE 42 DSURFACE 3 -NODE 43 DSURFACE 3 -NODE 44 DSURFACE 3 -NODE 61 DSURFACE 3 -NODE 62 DSURFACE 3 -NODE 63 DSURFACE 3 -NODE 64 DSURFACE 3 -NODE 81 DSURFACE 3 -NODE 82 DSURFACE 3 -NODE 83 DSURFACE 3 -NODE 84 DSURFACE 3 -NODE 101 DSURFACE 3 -NODE 102 DSURFACE 3 -NODE 103 DSURFACE 3 -NODE 104 DSURFACE 3 +NODE 17 DSURFACE 3 +NODE 18 DSURFACE 3 +NODE 19 DSURFACE 3 +NODE 20 DSURFACE 3 +NODE 37 DSURFACE 3 +NODE 38 DSURFACE 3 +NODE 39 DSURFACE 3 +NODE 40 DSURFACE 3 +NODE 57 DSURFACE 3 +NODE 58 DSURFACE 3 +NODE 59 DSURFACE 3 +NODE 60 DSURFACE 3 +NODE 77 DSURFACE 3 +NODE 78 DSURFACE 3 +NODE 79 DSURFACE 3 +NODE 80 DSURFACE 3 +NODE 97 DSURFACE 3 +NODE 98 DSURFACE 3 +NODE 99 DSURFACE 3 +NODE 100 DSURFACE 3 +NODE 117 DSURFACE 3 +NODE 118 DSURFACE 3 +NODE 119 DSURFACE 3 +NODE 120 DSURFACE 3 +NODE 1 DSURFACE 4 +NODE 2 DSURFACE 4 +NODE 3 DSURFACE 4 NODE 4 DSURFACE 4 -NODE 8 DSURFACE 4 -NODE 12 DSURFACE 4 -NODE 16 DSURFACE 4 -NODE 20 DSURFACE 4 +NODE 21 DSURFACE 4 +NODE 22 DSURFACE 4 +NODE 23 DSURFACE 4 NODE 24 DSURFACE 4 -NODE 28 DSURFACE 4 -NODE 32 DSURFACE 4 -NODE 36 DSURFACE 4 -NODE 40 DSURFACE 4 +NODE 41 DSURFACE 4 +NODE 42 DSURFACE 4 +NODE 43 DSURFACE 4 NODE 44 DSURFACE 4 -NODE 48 DSURFACE 4 -NODE 52 DSURFACE 4 -NODE 56 DSURFACE 4 -NODE 60 DSURFACE 4 +NODE 61 DSURFACE 4 +NODE 62 DSURFACE 4 +NODE 63 DSURFACE 4 NODE 64 DSURFACE 4 -NODE 68 DSURFACE 4 -NODE 72 DSURFACE 4 -NODE 76 DSURFACE 4 -NODE 80 DSURFACE 4 +NODE 81 DSURFACE 4 +NODE 82 DSURFACE 4 +NODE 83 DSURFACE 4 NODE 84 DSURFACE 4 -NODE 88 DSURFACE 4 -NODE 92 DSURFACE 4 -NODE 96 DSURFACE 4 -NODE 100 DSURFACE 4 +NODE 101 DSURFACE 4 +NODE 102 DSURFACE 4 +NODE 103 DSURFACE 4 NODE 104 DSURFACE 4 -NODE 108 DSURFACE 4 -NODE 112 DSURFACE 4 -NODE 116 DSURFACE 4 -NODE 120 DSURFACE 4 -NODE 17 DSURFACE 5 -NODE 18 DSURFACE 5 -NODE 19 DSURFACE 5 -NODE 20 DSURFACE 5 -NODE 37 DSURFACE 5 -NODE 38 DSURFACE 5 -NODE 39 DSURFACE 5 -NODE 40 DSURFACE 5 -NODE 57 DSURFACE 5 -NODE 58 DSURFACE 5 -NODE 59 DSURFACE 5 -NODE 60 DSURFACE 5 -NODE 77 DSURFACE 5 -NODE 78 DSURFACE 5 -NODE 79 DSURFACE 5 -NODE 80 DSURFACE 5 -NODE 97 DSURFACE 5 -NODE 98 DSURFACE 5 -NODE 99 DSURFACE 5 -NODE 100 DSURFACE 5 +NODE 101 DSURFACE 5 +NODE 102 DSURFACE 5 +NODE 103 DSURFACE 5 +NODE 104 DSURFACE 5 +NODE 105 DSURFACE 5 +NODE 106 DSURFACE 5 +NODE 107 DSURFACE 5 +NODE 108 DSURFACE 5 +NODE 109 DSURFACE 5 +NODE 110 DSURFACE 5 +NODE 111 DSURFACE 5 +NODE 112 DSURFACE 5 +NODE 113 DSURFACE 5 +NODE 114 DSURFACE 5 +NODE 115 DSURFACE 5 +NODE 116 DSURFACE 5 NODE 117 DSURFACE 5 NODE 118 DSURFACE 5 NODE 119 DSURFACE 5 NODE 120 DSURFACE 5 NODE 1 DSURFACE 6 +NODE 2 DSURFACE 6 +NODE 3 DSURFACE 6 +NODE 4 DSURFACE 6 NODE 5 DSURFACE 6 +NODE 6 DSURFACE 6 +NODE 7 DSURFACE 6 +NODE 8 DSURFACE 6 NODE 9 DSURFACE 6 +NODE 10 DSURFACE 6 +NODE 11 DSURFACE 6 +NODE 12 DSURFACE 6 NODE 13 DSURFACE 6 +NODE 14 DSURFACE 6 +NODE 15 DSURFACE 6 +NODE 16 DSURFACE 6 NODE 17 DSURFACE 6 -NODE 21 DSURFACE 6 -NODE 25 DSURFACE 6 -NODE 29 DSURFACE 6 -NODE 33 DSURFACE 6 -NODE 37 DSURFACE 6 -NODE 41 DSURFACE 6 -NODE 45 DSURFACE 6 -NODE 49 DSURFACE 6 -NODE 53 DSURFACE 6 -NODE 57 DSURFACE 6 -NODE 61 DSURFACE 6 -NODE 65 DSURFACE 6 -NODE 69 DSURFACE 6 -NODE 73 DSURFACE 6 -NODE 77 DSURFACE 6 -NODE 81 DSURFACE 6 -NODE 85 DSURFACE 6 -NODE 89 DSURFACE 6 -NODE 93 DSURFACE 6 -NODE 97 DSURFACE 6 -NODE 101 DSURFACE 6 -NODE 105 DSURFACE 6 -NODE 109 DSURFACE 6 -NODE 113 DSURFACE 6 -NODE 117 DSURFACE 6 +NODE 18 DSURFACE 6 +NODE 19 DSURFACE 6 +NODE 20 DSURFACE 6 --------------------------------------------------------------DVOL-NODE TOPOLOGY NODE 1 DVOL 1 NODE 2 DVOL 1 @@ -533,4 +533,4 @@ CP 120 COORD 0.75 1.5 1.2 1.0 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 ------------------------------------------------------------------FLUID ELEMENTS ------------------------------------------------------------------------------END +-----------------------------------------------------------------------------END \ No newline at end of file diff --git a/tests/reference-files/test_nurbs_couple_nurbs_meshes_reference.dat b/tests/reference-files/test_nurbs_couple_nurbs_meshes_reference.dat index c73be34a..c78d9724 100644 --- a/tests/reference-files/test_nurbs_couple_nurbs_meshes_reference.dat +++ b/tests/reference-files/test_nurbs_couple_nurbs_meshes_reference.dat @@ -60,51 +60,87 @@ TYPE Interpolated 1.0 END NURBSPATCH -------------------------------------------------------------DNODE-NODE TOPOLOGY -NODE 1 DNODE 1 +NODE 20 DNODE 1 NODE 5 DNODE 2 NODE 16 DNODE 3 -NODE 20 DNODE 4 -NODE 21 DNODE 5 +NODE 1 DNODE 4 +NODE 16 DNODE 5 NODE 1 DNODE 6 NODE 33 DNODE 7 -NODE 16 DNODE 8 +NODE 21 DNODE 8 -------------------------------------------------------------DLINE-NODE TOPOLOGY -NODE 1 DLINE 1 -NODE 2 DLINE 1 -NODE 3 DLINE 1 -NODE 4 DLINE 1 NODE 5 DLINE 1 -NODE 5 DLINE 2 -NODE 10 DLINE 2 -NODE 15 DLINE 2 -NODE 20 DLINE 2 +NODE 10 DLINE 1 +NODE 15 DLINE 1 +NODE 20 DLINE 1 +NODE 4 DLINE 2 +NODE 9 DLINE 2 +NODE 14 DLINE 2 +NODE 19 DLINE 2 +NODE 1 DLINE 3 +NODE 6 DLINE 3 +NODE 11 DLINE 3 NODE 16 DLINE 3 -NODE 17 DLINE 3 -NODE 18 DLINE 3 -NODE 19 DLINE 3 -NODE 20 DLINE 3 -NODE 1 DLINE 4 -NODE 6 DLINE 4 -NODE 11 DLINE 4 -NODE 16 DLINE 4 -NODE 1 DLINE 5 -NODE 21 DLINE 5 -NODE 22 DLINE 5 -NODE 23 DLINE 5 -NODE 24 DLINE 5 -NODE 1 DLINE 6 -NODE 6 DLINE 6 +NODE 2 DLINE 4 +NODE 7 DLINE 4 +NODE 12 DLINE 4 +NODE 17 DLINE 4 +NODE 16 DLINE 5 +NODE 17 DLINE 5 +NODE 18 DLINE 5 +NODE 19 DLINE 5 +NODE 20 DLINE 5 NODE 11 DLINE 6 -NODE 16 DLINE 6 -NODE 16 DLINE 7 -NODE 33 DLINE 7 -NODE 34 DLINE 7 -NODE 35 DLINE 7 -NODE 36 DLINE 7 -NODE 21 DLINE 8 -NODE 25 DLINE 8 -NODE 29 DLINE 8 -NODE 33 DLINE 8 +NODE 12 DLINE 6 +NODE 13 DLINE 6 +NODE 14 DLINE 6 +NODE 15 DLINE 6 +NODE 1 DLINE 7 +NODE 2 DLINE 7 +NODE 3 DLINE 7 +NODE 4 DLINE 7 +NODE 5 DLINE 7 +NODE 6 DLINE 8 +NODE 7 DLINE 8 +NODE 8 DLINE 8 +NODE 9 DLINE 8 +NODE 10 DLINE 8 +NODE 1 DLINE 9 +NODE 6 DLINE 9 +NODE 11 DLINE 9 +NODE 16 DLINE 9 +NODE 24 DLINE 10 +NODE 28 DLINE 10 +NODE 32 DLINE 10 +NODE 36 DLINE 10 +NODE 21 DLINE 11 +NODE 25 DLINE 11 +NODE 29 DLINE 11 +NODE 33 DLINE 11 +NODE 22 DLINE 12 +NODE 26 DLINE 12 +NODE 30 DLINE 12 +NODE 34 DLINE 12 +NODE 16 DLINE 13 +NODE 33 DLINE 13 +NODE 34 DLINE 13 +NODE 35 DLINE 13 +NODE 36 DLINE 13 +NODE 11 DLINE 14 +NODE 29 DLINE 14 +NODE 30 DLINE 14 +NODE 31 DLINE 14 +NODE 32 DLINE 14 +NODE 1 DLINE 15 +NODE 21 DLINE 15 +NODE 22 DLINE 15 +NODE 23 DLINE 15 +NODE 24 DLINE 15 +NODE 6 DLINE 16 +NODE 25 DLINE 16 +NODE 26 DLINE 16 +NODE 27 DLINE 16 +NODE 28 DLINE 16 -------------------------------------------------------------DSURF-NODE TOPOLOGY NODE 1 DSURFACE 1 NODE 2 DSURFACE 1 @@ -197,4 +233,4 @@ CP 36 COORD 0.423205080757 0.506217782649 0 0.9553418012614796 11 WALLNURBS NURBS9 26 27 28 30 31 32 34 35 36 MAT 1 KINEM linear EAS none THICK 1.0 STRESS_STRAIN plane_strain GP 3 3 12 WALLNURBS NURBS9 27 28 6 31 32 11 35 36 16 MAT 1 KINEM linear EAS none THICK 1.0 STRESS_STRAIN plane_strain GP 3 3 ------------------------------------------------------------------FLUID ELEMENTS ------------------------------------------------------------------------------END +-----------------------------------------------------------------------------END \ No newline at end of file diff --git a/tests/reference-files/test_nurbs_flat_plate_2d_reference.dat b/tests/reference-files/test_nurbs_flat_plate_2d_reference.dat index 2ac2ee0a..542ee15a 100644 --- a/tests/reference-files/test_nurbs_flat_plate_2d_reference.dat +++ b/tests/reference-files/test_nurbs_flat_plate_2d_reference.dat @@ -37,33 +37,55 @@ TYPE Interpolated 1.0 END NURBSPATCH -------------------------------------------------------------DNODE-NODE TOPOLOGY -NODE 1 DNODE 1 +NODE 28 DNODE 1 NODE 4 DNODE 2 NODE 25 DNODE 3 -NODE 28 DNODE 4 +NODE 1 DNODE 4 -------------------------------------------------------------DLINE-NODE TOPOLOGY -NODE 1 DLINE 1 -NODE 2 DLINE 1 -NODE 3 DLINE 1 NODE 4 DLINE 1 -NODE 4 DLINE 2 -NODE 8 DLINE 2 -NODE 12 DLINE 2 -NODE 16 DLINE 2 -NODE 20 DLINE 2 -NODE 24 DLINE 2 -NODE 28 DLINE 2 +NODE 8 DLINE 1 +NODE 12 DLINE 1 +NODE 16 DLINE 1 +NODE 20 DLINE 1 +NODE 24 DLINE 1 +NODE 28 DLINE 1 +NODE 3 DLINE 2 +NODE 7 DLINE 2 +NODE 11 DLINE 2 +NODE 15 DLINE 2 +NODE 19 DLINE 2 +NODE 23 DLINE 2 +NODE 27 DLINE 2 +NODE 1 DLINE 3 +NODE 5 DLINE 3 +NODE 9 DLINE 3 +NODE 13 DLINE 3 +NODE 17 DLINE 3 +NODE 21 DLINE 3 NODE 25 DLINE 3 -NODE 26 DLINE 3 -NODE 27 DLINE 3 -NODE 28 DLINE 3 -NODE 1 DLINE 4 -NODE 5 DLINE 4 -NODE 9 DLINE 4 -NODE 13 DLINE 4 -NODE 17 DLINE 4 -NODE 21 DLINE 4 -NODE 25 DLINE 4 +NODE 2 DLINE 4 +NODE 6 DLINE 4 +NODE 10 DLINE 4 +NODE 14 DLINE 4 +NODE 18 DLINE 4 +NODE 22 DLINE 4 +NODE 26 DLINE 4 +NODE 25 DLINE 5 +NODE 26 DLINE 5 +NODE 27 DLINE 5 +NODE 28 DLINE 5 +NODE 21 DLINE 6 +NODE 22 DLINE 6 +NODE 23 DLINE 6 +NODE 24 DLINE 6 +NODE 1 DLINE 7 +NODE 2 DLINE 7 +NODE 3 DLINE 7 +NODE 4 DLINE 7 +NODE 5 DLINE 8 +NODE 6 DLINE 8 +NODE 7 DLINE 8 +NODE 8 DLINE 8 -------------------------------------------------------------DSURF-NODE TOPOLOGY NODE 1 DSURFACE 1 NODE 2 DSURFACE 1 @@ -134,4 +156,4 @@ CP 28 COORD 0.375 0.455 0 1.0 9 WALLNURBS NURBS9 17 18 19 21 22 23 25 26 27 MAT 1 KINEM linear EAS none THICK 1.0 STRESS_STRAIN plane_strain GP 3 3 10 WALLNURBS NURBS9 18 19 20 22 23 24 26 27 28 MAT 1 KINEM linear EAS none THICK 1.0 STRESS_STRAIN plane_strain GP 3 3 ------------------------------------------------------------------FLUID ELEMENTS ------------------------------------------------------------------------------END +-----------------------------------------------------------------------------END \ No newline at end of file diff --git a/tests/reference-files/test_nurbs_hemisphere_surface_reference.dat b/tests/reference-files/test_nurbs_hemisphere_surface_reference.dat index c0ecbf79..784e6d6f 100644 --- a/tests/reference-files/test_nurbs_hemisphere_surface_reference.dat +++ b/tests/reference-files/test_nurbs_hemisphere_surface_reference.dat @@ -130,107 +130,187 @@ TYPE Interpolated 1.0 END NURBSPATCH -------------------------------------------------------------DNODE-NODE TOPOLOGY -NODE 1 DNODE 1 +NODE 16 DNODE 1 NODE 4 DNODE 2 NODE 13 DNODE 3 -NODE 16 DNODE 4 -NODE 17 DNODE 5 +NODE 1 DNODE 4 +NODE 32 DNODE 5 NODE 20 DNODE 6 NODE 29 DNODE 7 -NODE 32 DNODE 8 -NODE 33 DNODE 9 +NODE 17 DNODE 8 +NODE 48 DNODE 9 NODE 36 DNODE 10 NODE 45 DNODE 11 -NODE 48 DNODE 12 -NODE 49 DNODE 13 +NODE 33 DNODE 12 +NODE 64 DNODE 13 NODE 52 DNODE 14 NODE 61 DNODE 15 -NODE 64 DNODE 16 -NODE 65 DNODE 17 +NODE 49 DNODE 16 +NODE 80 DNODE 17 NODE 68 DNODE 18 NODE 77 DNODE 19 -NODE 80 DNODE 20 +NODE 65 DNODE 20 -------------------------------------------------------------DLINE-NODE TOPOLOGY -NODE 1 DLINE 1 -NODE 2 DLINE 1 -NODE 3 DLINE 1 NODE 4 DLINE 1 -NODE 4 DLINE 2 -NODE 8 DLINE 2 -NODE 12 DLINE 2 -NODE 16 DLINE 2 +NODE 8 DLINE 1 +NODE 12 DLINE 1 +NODE 16 DLINE 1 +NODE 3 DLINE 2 +NODE 7 DLINE 2 +NODE 11 DLINE 2 +NODE 15 DLINE 2 +NODE 1 DLINE 3 +NODE 5 DLINE 3 +NODE 9 DLINE 3 NODE 13 DLINE 3 -NODE 14 DLINE 3 -NODE 15 DLINE 3 -NODE 16 DLINE 3 -NODE 1 DLINE 4 -NODE 5 DLINE 4 -NODE 9 DLINE 4 -NODE 13 DLINE 4 -NODE 17 DLINE 5 -NODE 18 DLINE 5 -NODE 19 DLINE 5 -NODE 20 DLINE 5 -NODE 20 DLINE 6 -NODE 24 DLINE 6 -NODE 28 DLINE 6 -NODE 32 DLINE 6 -NODE 29 DLINE 7 -NODE 30 DLINE 7 -NODE 31 DLINE 7 -NODE 32 DLINE 7 -NODE 17 DLINE 8 -NODE 21 DLINE 8 -NODE 25 DLINE 8 -NODE 29 DLINE 8 -NODE 33 DLINE 9 -NODE 34 DLINE 9 -NODE 35 DLINE 9 -NODE 36 DLINE 9 -NODE 36 DLINE 10 -NODE 40 DLINE 10 -NODE 44 DLINE 10 -NODE 48 DLINE 10 -NODE 45 DLINE 11 -NODE 46 DLINE 11 -NODE 47 DLINE 11 -NODE 48 DLINE 11 -NODE 33 DLINE 12 -NODE 37 DLINE 12 -NODE 41 DLINE 12 -NODE 45 DLINE 12 -NODE 49 DLINE 13 -NODE 50 DLINE 13 -NODE 51 DLINE 13 -NODE 52 DLINE 13 -NODE 52 DLINE 14 -NODE 56 DLINE 14 -NODE 60 DLINE 14 -NODE 64 DLINE 14 -NODE 61 DLINE 15 -NODE 62 DLINE 15 -NODE 63 DLINE 15 -NODE 64 DLINE 15 -NODE 49 DLINE 16 -NODE 53 DLINE 16 -NODE 57 DLINE 16 -NODE 61 DLINE 16 -NODE 65 DLINE 17 -NODE 66 DLINE 17 -NODE 67 DLINE 17 -NODE 68 DLINE 17 -NODE 68 DLINE 18 -NODE 72 DLINE 18 -NODE 76 DLINE 18 -NODE 80 DLINE 18 -NODE 77 DLINE 19 -NODE 78 DLINE 19 -NODE 79 DLINE 19 -NODE 80 DLINE 19 -NODE 65 DLINE 20 -NODE 69 DLINE 20 -NODE 73 DLINE 20 -NODE 77 DLINE 20 +NODE 2 DLINE 4 +NODE 6 DLINE 4 +NODE 10 DLINE 4 +NODE 14 DLINE 4 +NODE 13 DLINE 5 +NODE 14 DLINE 5 +NODE 15 DLINE 5 +NODE 16 DLINE 5 +NODE 9 DLINE 6 +NODE 10 DLINE 6 +NODE 11 DLINE 6 +NODE 12 DLINE 6 +NODE 1 DLINE 7 +NODE 2 DLINE 7 +NODE 3 DLINE 7 +NODE 4 DLINE 7 +NODE 5 DLINE 8 +NODE 6 DLINE 8 +NODE 7 DLINE 8 +NODE 8 DLINE 8 +NODE 20 DLINE 9 +NODE 24 DLINE 9 +NODE 28 DLINE 9 +NODE 32 DLINE 9 +NODE 19 DLINE 10 +NODE 23 DLINE 10 +NODE 27 DLINE 10 +NODE 31 DLINE 10 +NODE 17 DLINE 11 +NODE 21 DLINE 11 +NODE 25 DLINE 11 +NODE 29 DLINE 11 +NODE 18 DLINE 12 +NODE 22 DLINE 12 +NODE 26 DLINE 12 +NODE 30 DLINE 12 +NODE 29 DLINE 13 +NODE 30 DLINE 13 +NODE 31 DLINE 13 +NODE 32 DLINE 13 +NODE 25 DLINE 14 +NODE 26 DLINE 14 +NODE 27 DLINE 14 +NODE 28 DLINE 14 +NODE 17 DLINE 15 +NODE 18 DLINE 15 +NODE 19 DLINE 15 +NODE 20 DLINE 15 +NODE 21 DLINE 16 +NODE 22 DLINE 16 +NODE 23 DLINE 16 +NODE 24 DLINE 16 +NODE 36 DLINE 17 +NODE 40 DLINE 17 +NODE 44 DLINE 17 +NODE 48 DLINE 17 +NODE 35 DLINE 18 +NODE 39 DLINE 18 +NODE 43 DLINE 18 +NODE 47 DLINE 18 +NODE 33 DLINE 19 +NODE 37 DLINE 19 +NODE 41 DLINE 19 +NODE 45 DLINE 19 +NODE 34 DLINE 20 +NODE 38 DLINE 20 +NODE 42 DLINE 20 +NODE 46 DLINE 20 +NODE 45 DLINE 21 +NODE 46 DLINE 21 +NODE 47 DLINE 21 +NODE 48 DLINE 21 +NODE 41 DLINE 22 +NODE 42 DLINE 22 +NODE 43 DLINE 22 +NODE 44 DLINE 22 +NODE 33 DLINE 23 +NODE 34 DLINE 23 +NODE 35 DLINE 23 +NODE 36 DLINE 23 +NODE 37 DLINE 24 +NODE 38 DLINE 24 +NODE 39 DLINE 24 +NODE 40 DLINE 24 +NODE 52 DLINE 25 +NODE 56 DLINE 25 +NODE 60 DLINE 25 +NODE 64 DLINE 25 +NODE 51 DLINE 26 +NODE 55 DLINE 26 +NODE 59 DLINE 26 +NODE 63 DLINE 26 +NODE 49 DLINE 27 +NODE 53 DLINE 27 +NODE 57 DLINE 27 +NODE 61 DLINE 27 +NODE 50 DLINE 28 +NODE 54 DLINE 28 +NODE 58 DLINE 28 +NODE 62 DLINE 28 +NODE 61 DLINE 29 +NODE 62 DLINE 29 +NODE 63 DLINE 29 +NODE 64 DLINE 29 +NODE 57 DLINE 30 +NODE 58 DLINE 30 +NODE 59 DLINE 30 +NODE 60 DLINE 30 +NODE 49 DLINE 31 +NODE 50 DLINE 31 +NODE 51 DLINE 31 +NODE 52 DLINE 31 +NODE 53 DLINE 32 +NODE 54 DLINE 32 +NODE 55 DLINE 32 +NODE 56 DLINE 32 +NODE 68 DLINE 33 +NODE 72 DLINE 33 +NODE 76 DLINE 33 +NODE 80 DLINE 33 +NODE 67 DLINE 34 +NODE 71 DLINE 34 +NODE 75 DLINE 34 +NODE 79 DLINE 34 +NODE 65 DLINE 35 +NODE 69 DLINE 35 +NODE 73 DLINE 35 +NODE 77 DLINE 35 +NODE 66 DLINE 36 +NODE 70 DLINE 36 +NODE 74 DLINE 36 +NODE 78 DLINE 36 +NODE 77 DLINE 37 +NODE 78 DLINE 37 +NODE 79 DLINE 37 +NODE 80 DLINE 37 +NODE 73 DLINE 38 +NODE 74 DLINE 38 +NODE 75 DLINE 38 +NODE 76 DLINE 38 +NODE 65 DLINE 39 +NODE 66 DLINE 39 +NODE 67 DLINE 39 +NODE 68 DLINE 39 +NODE 69 DLINE 40 +NODE 70 DLINE 40 +NODE 71 DLINE 40 +NODE 72 DLINE 40 -------------------------------------------------------------DSURF-NODE TOPOLOGY NODE 1 DSURFACE 1 NODE 2 DSURFACE 1 diff --git a/tests/reference-files/test_nurbs_hollow_cylinder_segment_2d_reference.dat b/tests/reference-files/test_nurbs_hollow_cylinder_segment_2d_reference.dat index c85acd30..09b445fc 100644 --- a/tests/reference-files/test_nurbs_hollow_cylinder_segment_2d_reference.dat +++ b/tests/reference-files/test_nurbs_hollow_cylinder_segment_2d_reference.dat @@ -35,29 +35,47 @@ TYPE Interpolated 1.0 END NURBSPATCH -------------------------------------------------------------DNODE-NODE TOPOLOGY -NODE 1 DNODE 1 +NODE 20 DNODE 1 NODE 4 DNODE 2 NODE 17 DNODE 3 -NODE 20 DNODE 4 +NODE 1 DNODE 4 -------------------------------------------------------------DLINE-NODE TOPOLOGY -NODE 1 DLINE 1 -NODE 2 DLINE 1 -NODE 3 DLINE 1 NODE 4 DLINE 1 -NODE 4 DLINE 2 -NODE 8 DLINE 2 -NODE 12 DLINE 2 -NODE 16 DLINE 2 -NODE 20 DLINE 2 +NODE 8 DLINE 1 +NODE 12 DLINE 1 +NODE 16 DLINE 1 +NODE 20 DLINE 1 +NODE 3 DLINE 2 +NODE 7 DLINE 2 +NODE 11 DLINE 2 +NODE 15 DLINE 2 +NODE 19 DLINE 2 +NODE 1 DLINE 3 +NODE 5 DLINE 3 +NODE 9 DLINE 3 +NODE 13 DLINE 3 NODE 17 DLINE 3 -NODE 18 DLINE 3 -NODE 19 DLINE 3 -NODE 20 DLINE 3 -NODE 1 DLINE 4 -NODE 5 DLINE 4 -NODE 9 DLINE 4 -NODE 13 DLINE 4 -NODE 17 DLINE 4 +NODE 2 DLINE 4 +NODE 6 DLINE 4 +NODE 10 DLINE 4 +NODE 14 DLINE 4 +NODE 18 DLINE 4 +NODE 17 DLINE 5 +NODE 18 DLINE 5 +NODE 19 DLINE 5 +NODE 20 DLINE 5 +NODE 13 DLINE 6 +NODE 14 DLINE 6 +NODE 15 DLINE 6 +NODE 16 DLINE 6 +NODE 1 DLINE 7 +NODE 2 DLINE 7 +NODE 3 DLINE 7 +NODE 4 DLINE 7 +NODE 5 DLINE 8 +NODE 6 DLINE 8 +NODE 7 DLINE 8 +NODE 8 DLINE 8 -------------------------------------------------------------DSURF-NODE TOPOLOGY NODE 1 DSURFACE 1 NODE 2 DSURFACE 1 @@ -108,4 +126,4 @@ CP 20 COORD -1.50688420258 0.87 0 1.0 5 WALLNURBS NURBS9 9 10 11 13 14 15 17 18 19 MAT 1 KINEM linear EAS none THICK 1.0 STRESS_STRAIN plane_strain GP 3 3 6 WALLNURBS NURBS9 10 11 12 14 15 16 18 19 20 MAT 1 KINEM linear EAS none THICK 1.0 STRESS_STRAIN plane_strain GP 3 3 ------------------------------------------------------------------FLUID ELEMENTS ------------------------------------------------------------------------------END +-----------------------------------------------------------------------------END \ No newline at end of file diff --git a/tests/reference-files/test_nurbs_rotation_nurbs_surface_reference.dat b/tests/reference-files/test_nurbs_rotation_nurbs_surface_reference.dat index d11fdd8d..4914f2d1 100644 --- a/tests/reference-files/test_nurbs_rotation_nurbs_surface_reference.dat +++ b/tests/reference-files/test_nurbs_rotation_nurbs_surface_reference.dat @@ -37,33 +37,55 @@ TYPE Interpolated 1.0 END NURBSPATCH -------------------------------------------------------------DNODE-NODE TOPOLOGY -NODE 1 DNODE 1 +NODE 28 DNODE 1 NODE 7 DNODE 2 NODE 22 DNODE 3 -NODE 28 DNODE 4 +NODE 1 DNODE 4 -------------------------------------------------------------DLINE-NODE TOPOLOGY -NODE 1 DLINE 1 -NODE 2 DLINE 1 -NODE 3 DLINE 1 -NODE 4 DLINE 1 -NODE 5 DLINE 1 -NODE 6 DLINE 1 NODE 7 DLINE 1 -NODE 7 DLINE 2 -NODE 14 DLINE 2 -NODE 21 DLINE 2 -NODE 28 DLINE 2 +NODE 14 DLINE 1 +NODE 21 DLINE 1 +NODE 28 DLINE 1 +NODE 6 DLINE 2 +NODE 13 DLINE 2 +NODE 20 DLINE 2 +NODE 27 DLINE 2 +NODE 1 DLINE 3 +NODE 8 DLINE 3 +NODE 15 DLINE 3 NODE 22 DLINE 3 -NODE 23 DLINE 3 -NODE 24 DLINE 3 -NODE 25 DLINE 3 -NODE 26 DLINE 3 -NODE 27 DLINE 3 -NODE 28 DLINE 3 -NODE 1 DLINE 4 -NODE 8 DLINE 4 -NODE 15 DLINE 4 -NODE 22 DLINE 4 +NODE 2 DLINE 4 +NODE 9 DLINE 4 +NODE 16 DLINE 4 +NODE 23 DLINE 4 +NODE 22 DLINE 5 +NODE 23 DLINE 5 +NODE 24 DLINE 5 +NODE 25 DLINE 5 +NODE 26 DLINE 5 +NODE 27 DLINE 5 +NODE 28 DLINE 5 +NODE 15 DLINE 6 +NODE 16 DLINE 6 +NODE 17 DLINE 6 +NODE 18 DLINE 6 +NODE 19 DLINE 6 +NODE 20 DLINE 6 +NODE 21 DLINE 6 +NODE 1 DLINE 7 +NODE 2 DLINE 7 +NODE 3 DLINE 7 +NODE 4 DLINE 7 +NODE 5 DLINE 7 +NODE 6 DLINE 7 +NODE 7 DLINE 7 +NODE 8 DLINE 8 +NODE 9 DLINE 8 +NODE 10 DLINE 8 +NODE 11 DLINE 8 +NODE 12 DLINE 8 +NODE 13 DLINE 8 +NODE 14 DLINE 8 -------------------------------------------------------------DSURF-NODE TOPOLOGY NODE 1 DSURFACE 1 NODE 2 DSURFACE 1 @@ -134,4 +156,4 @@ CP 28 COORD 1.72276409234 -0.244299566923 -0.00126638641091 1.0 9 WALLNURBS NURBS9 11 12 13 18 19 20 25 26 27 MAT 1 KINEM linear EAS none THICK 1.0 STRESS_STRAIN plane_strain GP 3 3 10 WALLNURBS NURBS9 12 13 14 19 20 21 26 27 28 MAT 1 KINEM linear EAS none THICK 1.0 STRESS_STRAIN plane_strain GP 3 3 ------------------------------------------------------------------FLUID ELEMENTS ------------------------------------------------------------------------------END +-----------------------------------------------------------------------------END \ No newline at end of file diff --git a/tests/reference-files/test_nurbs_sphere_surface_reference.dat b/tests/reference-files/test_nurbs_sphere_surface_reference.dat index 5de71197..72f60a32 100644 --- a/tests/reference-files/test_nurbs_sphere_surface_reference.dat +++ b/tests/reference-files/test_nurbs_sphere_surface_reference.dat @@ -35,29 +35,47 @@ TYPE Interpolated 1.0 END NURBSPATCH -------------------------------------------------------------DNODE-NODE TOPOLOGY -NODE 1 DNODE 1 +NODE 20 DNODE 1 NODE 5 DNODE 2 NODE 16 DNODE 3 -NODE 20 DNODE 4 +NODE 1 DNODE 4 -------------------------------------------------------------DLINE-NODE TOPOLOGY -NODE 1 DLINE 1 -NODE 2 DLINE 1 -NODE 3 DLINE 1 -NODE 4 DLINE 1 NODE 5 DLINE 1 -NODE 5 DLINE 2 -NODE 10 DLINE 2 -NODE 15 DLINE 2 -NODE 20 DLINE 2 +NODE 10 DLINE 1 +NODE 15 DLINE 1 +NODE 20 DLINE 1 +NODE 4 DLINE 2 +NODE 9 DLINE 2 +NODE 14 DLINE 2 +NODE 19 DLINE 2 +NODE 1 DLINE 3 +NODE 6 DLINE 3 +NODE 11 DLINE 3 NODE 16 DLINE 3 -NODE 17 DLINE 3 -NODE 18 DLINE 3 -NODE 19 DLINE 3 -NODE 20 DLINE 3 -NODE 1 DLINE 4 -NODE 6 DLINE 4 -NODE 11 DLINE 4 -NODE 16 DLINE 4 +NODE 2 DLINE 4 +NODE 7 DLINE 4 +NODE 12 DLINE 4 +NODE 17 DLINE 4 +NODE 16 DLINE 5 +NODE 17 DLINE 5 +NODE 18 DLINE 5 +NODE 19 DLINE 5 +NODE 20 DLINE 5 +NODE 11 DLINE 6 +NODE 12 DLINE 6 +NODE 13 DLINE 6 +NODE 14 DLINE 6 +NODE 15 DLINE 6 +NODE 1 DLINE 7 +NODE 2 DLINE 7 +NODE 3 DLINE 7 +NODE 4 DLINE 7 +NODE 5 DLINE 7 +NODE 6 DLINE 8 +NODE 7 DLINE 8 +NODE 8 DLINE 8 +NODE 9 DLINE 8 +NODE 10 DLINE 8 -------------------------------------------------------------DSURF-NODE TOPOLOGY NODE 1 DSURFACE 1 NODE 2 DSURFACE 1 diff --git a/tests/reference-files/test_nurbs_string_types_reference.dat b/tests/reference-files/test_nurbs_string_types_reference.dat index af8031f1..5c98fea4 100644 --- a/tests/reference-files/test_nurbs_string_types_reference.dat +++ b/tests/reference-files/test_nurbs_string_types_reference.dat @@ -35,29 +35,47 @@ TYPE Interpolated 1.0 END NURBSPATCH -------------------------------------------------------------DNODE-NODE TOPOLOGY -NODE 1 DNODE 1 +NODE 20 DNODE 1 NODE 5 DNODE 2 NODE 16 DNODE 3 -NODE 20 DNODE 4 +NODE 1 DNODE 4 -------------------------------------------------------------DLINE-NODE TOPOLOGY -NODE 1 DLINE 1 -NODE 2 DLINE 1 -NODE 3 DLINE 1 -NODE 4 DLINE 1 NODE 5 DLINE 1 -NODE 5 DLINE 2 -NODE 10 DLINE 2 -NODE 15 DLINE 2 -NODE 20 DLINE 2 +NODE 10 DLINE 1 +NODE 15 DLINE 1 +NODE 20 DLINE 1 +NODE 4 DLINE 2 +NODE 9 DLINE 2 +NODE 14 DLINE 2 +NODE 19 DLINE 2 +NODE 1 DLINE 3 +NODE 6 DLINE 3 +NODE 11 DLINE 3 NODE 16 DLINE 3 -NODE 17 DLINE 3 -NODE 18 DLINE 3 -NODE 19 DLINE 3 -NODE 20 DLINE 3 -NODE 1 DLINE 4 -NODE 6 DLINE 4 -NODE 11 DLINE 4 -NODE 16 DLINE 4 +NODE 2 DLINE 4 +NODE 7 DLINE 4 +NODE 12 DLINE 4 +NODE 17 DLINE 4 +NODE 16 DLINE 5 +NODE 17 DLINE 5 +NODE 18 DLINE 5 +NODE 19 DLINE 5 +NODE 20 DLINE 5 +NODE 11 DLINE 6 +NODE 12 DLINE 6 +NODE 13 DLINE 6 +NODE 14 DLINE 6 +NODE 15 DLINE 6 +NODE 1 DLINE 7 +NODE 2 DLINE 7 +NODE 3 DLINE 7 +NODE 4 DLINE 7 +NODE 5 DLINE 7 +NODE 6 DLINE 8 +NODE 7 DLINE 8 +NODE 8 DLINE 8 +NODE 9 DLINE 8 +NODE 10 DLINE 8 -------------------------------------------------------------DSURF-NODE TOPOLOGY NODE 1 DSURFACE 1 NODE 2 DSURFACE 1 diff --git a/tests/reference-files/test_nurbs_translate_nurbs_surface_reference.dat b/tests/reference-files/test_nurbs_translate_nurbs_surface_reference.dat index b5a987d5..5edd0919 100644 --- a/tests/reference-files/test_nurbs_translate_nurbs_surface_reference.dat +++ b/tests/reference-files/test_nurbs_translate_nurbs_surface_reference.dat @@ -35,29 +35,47 @@ TYPE Interpolated 1.0 END NURBSPATCH -------------------------------------------------------------DNODE-NODE TOPOLOGY -NODE 1 DNODE 1 +NODE 20 DNODE 1 NODE 4 DNODE 2 NODE 17 DNODE 3 -NODE 20 DNODE 4 +NODE 1 DNODE 4 -------------------------------------------------------------DLINE-NODE TOPOLOGY -NODE 1 DLINE 1 -NODE 2 DLINE 1 -NODE 3 DLINE 1 NODE 4 DLINE 1 -NODE 4 DLINE 2 -NODE 8 DLINE 2 -NODE 12 DLINE 2 -NODE 16 DLINE 2 -NODE 20 DLINE 2 +NODE 8 DLINE 1 +NODE 12 DLINE 1 +NODE 16 DLINE 1 +NODE 20 DLINE 1 +NODE 3 DLINE 2 +NODE 7 DLINE 2 +NODE 11 DLINE 2 +NODE 15 DLINE 2 +NODE 19 DLINE 2 +NODE 1 DLINE 3 +NODE 5 DLINE 3 +NODE 9 DLINE 3 +NODE 13 DLINE 3 NODE 17 DLINE 3 -NODE 18 DLINE 3 -NODE 19 DLINE 3 -NODE 20 DLINE 3 -NODE 1 DLINE 4 -NODE 5 DLINE 4 -NODE 9 DLINE 4 -NODE 13 DLINE 4 -NODE 17 DLINE 4 +NODE 2 DLINE 4 +NODE 6 DLINE 4 +NODE 10 DLINE 4 +NODE 14 DLINE 4 +NODE 18 DLINE 4 +NODE 17 DLINE 5 +NODE 18 DLINE 5 +NODE 19 DLINE 5 +NODE 20 DLINE 5 +NODE 13 DLINE 6 +NODE 14 DLINE 6 +NODE 15 DLINE 6 +NODE 16 DLINE 6 +NODE 1 DLINE 7 +NODE 2 DLINE 7 +NODE 3 DLINE 7 +NODE 4 DLINE 7 +NODE 5 DLINE 8 +NODE 6 DLINE 8 +NODE 7 DLINE 8 +NODE 8 DLINE 8 -------------------------------------------------------------DSURF-NODE TOPOLOGY NODE 1 DSURFACE 1 NODE 2 DSURFACE 1 @@ -108,4 +126,4 @@ CP 20 COORD -1.165 -1.625 3.7 1.0 5 WALLNURBS NURBS9 9 10 11 13 14 15 17 18 19 MAT 1 KINEM linear EAS none THICK 1.0 STRESS_STRAIN plane_strain GP 3 3 6 WALLNURBS NURBS9 10 11 12 14 15 16 18 19 20 MAT 1 KINEM linear EAS none THICK 1.0 STRESS_STRAIN plane_strain GP 3 3 ------------------------------------------------------------------FLUID ELEMENTS ------------------------------------------------------------------------------END +-----------------------------------------------------------------------------END \ No newline at end of file