Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions source/mesh_deformation/external_tool_interface.cc
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,18 @@ namespace aspect
cell_data.reference_point_ptrs[cell_index]));

const std::vector< Point< dim >> &support_points = mesh_dof_handler.get_fe().get_unit_support_points();
for (unsigned int i=0; i<unit_points.size(); ++i)
for (unsigned int j=0; j<support_points.size(); ++j)
{
const unsigned int point_index = local_values[n_components*i];
const unsigned int rank = local_values[n_components*i+1];
// skip all DoFs in the interior
const bool is_boundary_dof = boundary_dofs.is_element(cell_dof_indices[j]);
if (!is_boundary_dof)
continue;

for (unsigned int j=0; j<support_points.size(); ++j)
for (unsigned int i=0; i<unit_points.size(); ++i)
{
const unsigned int point_index = local_values[n_components*i];
const unsigned int rank = local_values[n_components*i+1];

const double distance_sq = unit_points[i].distance_square(support_points[j]);
if (distance_sq < squared_distances[cell_dof_indices[j]])
{
Expand Down
64 changes: 18 additions & 46 deletions tests/mesh_deformation_external_01/screen-output
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------

Loading shared library <./libmesh_deformation_external_01.debug.so>

initialize()
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
Number of active cells: 64 (on 4 levels)
Number of degrees of freedom: 948 (578+81+289)

Expand All @@ -16,42 +11,24 @@ Number of mesh deformation degrees of freedom: 162
update()
setting points
map_dof_to_eval_point (dof, evaluation_point_index, component):
110 0 0
111 0 1
112 1 0
113 1 1
114 2 0
115 2 1
116 0 0
117 0 1
118 1 0
119 1 1
120 2 0
121 2 1
122 4 0
123 4 1
124 5 0
125 5 1
126 4 0
127 4 1
128 5 0
129 5 1
146 6 0
147 6 1
148 8 0
149 8 1
150 6 0
151 6 1
152 8 0
153 8 1
154 9 0
155 9 1
156 10 0
157 10 1
158 9 0
159 9 1
160 10 0
161 10 1
116 0 0
117 0 1
118 1 0
119 1 1
120 2 0
121 2 1
126 4 0
127 4 1
128 5 0
129 5 1
150 6 0
151 6 1
152 8 0
153 8 1
158 9 0
159 9 1
160 10 0
161 10 1
compute_updated_velocities_at_points()
Solution at evaluation points:
rank 0:
Expand Down Expand Up @@ -251,9 +228,4 @@ rank 0:
Termination requested by criterion: end time


+---------------------------------------------+------------+------------+
+---------------------------------+-----------+------------+------------+
+---------------------------------+-----------+------------+------------+

-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
Loading
Loading