Skip to content

Commit

Permalink
Update outputs for tests
Browse files Browse the repository at this point in the history
Update todos
  • Loading branch information
NiklasWik committed Apr 27, 2022
1 parent 5e51e8a commit 4632283
Show file tree
Hide file tree
Showing 5 changed files with 142 additions and 22 deletions.
24 changes: 16 additions & 8 deletions include/deal.II/matrix_free/fe_evaluation.h
Original file line number Diff line number Diff line change
Expand Up @@ -5868,9 +5868,11 @@ FEEvaluationAccess<dim, dim, Number, is_face, VectorizedArrayType>::
grad_out[comp][d] = tmp;
}
}
// General cell (non-zero jacobian gradient)
// General cell TODO
else
{
// Here we need the jacobian gradient and not the inverse which is
// stored in this->jacobian_gradients
AssertThrow(false, ExcNotImplemented());
}
return grad_out;
Expand Down Expand Up @@ -5919,7 +5921,7 @@ FEEvaluationAccess<dim, dim, Number, is_face, VectorizedArrayType>::
this->gradients_quad[(dim * d + index[d]) * nqp + q_point] *
inv_det;
}
// General cell
// General cell TODO
else
{
Assert(false, ExcNotImplemented());
Expand Down Expand Up @@ -6191,7 +6193,7 @@ FEEvaluationAccess<dim, dim, Number, is_face, VectorizedArrayType>::
this->gradients_quad[(comp * dim + d) * nqp + q_point] = tmp;
}
}
// General cell
// General cell TODO
else
{
AssertThrow(false, ExcNotImplemented());
Expand Down Expand Up @@ -6276,7 +6278,7 @@ FEEvaluationAccess<dim, dim, Number, is_face, VectorizedArrayType>::
this->gradients_quad[(comp * dim + d) * nqp + q_point] = tmp;
}
}
// General cell
// General cell TODO
else
{
AssertThrow(false, ExcNotImplemented());
Expand Down Expand Up @@ -6342,7 +6344,7 @@ FEEvaluationAccess<dim, dim, Number, is_face, VectorizedArrayType>::
}
}
}
// General cell
// General cell TODO
else
{
AssertThrow(false, ExcNotImplemented());
Expand Down Expand Up @@ -6398,9 +6400,15 @@ FEEvaluationAccess<dim, dim, Number, is_face, VectorizedArrayType>::
const SymmetricTensor<2, dim, VectorizedArrayType> sym_grad,
const unsigned int q_point)
{
// could have used base class operator, but that involves some overhead
// which is inefficient. it is nice to have the symmetric tensor because
// that saves some operations
if (this->data->element_type ==
internal::MatrixFreeFunctions::ElementType::tensor_raviart_thomas)
{
// TODO
AssertThrow(false, ExcNotImplemented());
}
// could have used base class operator, but that involves some overhead
// which is inefficient. it is nice to have the symmetric tensor because
// that saves some operations
# ifdef DEBUG
Assert(this->is_reinitialized, ExcNotInitialized());
# endif
Expand Down
44 changes: 36 additions & 8 deletions tests/matrix_free/matrix_vector_rt_01.output
Original file line number Diff line number Diff line change
@@ -1,25 +1,53 @@

DEAL:2d::Testing FE_RaviartThomasNodal<2>(1)
DEAL:2d::Using FE_RaviartThomasNodal<2>(1)
DEAL:2d::Number of cells: 16
DEAL:2d::Number of degrees of freedom: 144
DEAL:2d::
DEAL:2d::Norm of difference: 6.20418e-16
DEAL:2d::Testing Values
DEAL:2d::Norm of difference: 6.05894e-16
DEAL:2d::
DEAL:2d::Testing FE_RaviartThomasNodal<2>(2)
DEAL:2d::Testing Gradients
DEAL:2d::Norm of difference: 6.33970e-16
DEAL:2d::
DEAL:2d::Testing Divergence
DEAL:2d::Norm of difference: 5.24419e-16
DEAL:2d::
DEAL:2d::Using FE_RaviartThomasNodal<2>(2)
DEAL:2d::Number of cells: 16
DEAL:2d::Number of degrees of freedom: 312
DEAL:2d::
DEAL:2d::Norm of difference: 7.03559e-16
DEAL:2d::Testing Values
DEAL:2d::Norm of difference: 6.67799e-16
DEAL:2d::
DEAL:2d::Testing Gradients
DEAL:2d::Norm of difference: 1.06191e-15
DEAL:2d::
DEAL:2d::Testing Divergence
DEAL:2d::Norm of difference: 5.38383e-16
DEAL:2d::
DEAL:3d::Testing FE_RaviartThomasNodal<3>(1)
DEAL:3d::Using FE_RaviartThomasNodal<3>(1)
DEAL:3d::Number of cells: 64
DEAL:3d::Number of degrees of freedom: 1728
DEAL:3d::
DEAL:3d::Norm of difference: 1.04798e-15
DEAL:3d::Testing Values
DEAL:3d::Norm of difference: 6.43004e-16
DEAL:3d::
DEAL:3d::Testing FE_RaviartThomasNodal<3>(2)
DEAL:3d::Testing Gradients
DEAL:3d::Norm of difference: 8.38689e-16
DEAL:3d::
DEAL:3d::Testing Divergence
DEAL:3d::Norm of difference: 8.84868e-16
DEAL:3d::
DEAL:3d::Using FE_RaviartThomasNodal<3>(2)
DEAL:3d::Number of cells: 64
DEAL:3d::Number of degrees of freedom: 5616
DEAL:3d::
DEAL:3d::Norm of difference: 1.49180e-15
DEAL:3d::Testing Values
DEAL:3d::Norm of difference: 1.10927e-15
DEAL:3d::
DEAL:3d::Testing Gradients
DEAL:3d::Norm of difference: 1.50806e-15
DEAL:3d::
DEAL:3d::Testing Divergence
DEAL:3d::Norm of difference: 1.72044e-15
DEAL:3d::
41 changes: 41 additions & 0 deletions tests/matrix_free/matrix_vector_rt_02.output
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@

DEAL:2d::Using FE_RaviartThomasNodal<2>(1)
DEAL:2d::Number of cells: 4
DEAL:2d::Number of degrees of freedom: 40
DEAL:2d::
DEAL:2d::Testing Values and Gradients
DEAL:2d::Norm of difference: 3.77395e-16
DEAL:2d::
DEAL:2d::Testing Divergence
DEAL:2d::Norm of difference: 7.00345e-16
DEAL:2d::
DEAL:2d::Using FE_RaviartThomasNodal<2>(2)
DEAL:2d::Number of cells: 4
DEAL:2d::Number of degrees of freedom: 84
DEAL:2d::
DEAL:2d::Testing Values and Gradients
DEAL:2d::Norm of difference: 7.63491e-16
DEAL:2d::
DEAL:2d::Testing Divergence
DEAL:2d::Norm of difference: 7.46533e-16
DEAL:2d::
DEAL:3d::Using FE_RaviartThomasNodal<3>(1)
DEAL:3d::Number of cells: 8
DEAL:3d::Number of degrees of freedom: 240
DEAL:3d::
DEAL:3d::Testing Values and Gradients
DEAL:3d::Norm of difference: 1.22886e-15
DEAL:3d::
DEAL:3d::Testing Divergence
DEAL:3d::Norm of difference: 1.16405e-15
DEAL:3d::
DEAL:3d::Using FE_RaviartThomasNodal<3>(2)
DEAL:3d::Number of cells: 8
DEAL:3d::Number of degrees of freedom: 756
DEAL:3d::
DEAL:3d::Testing Values and Gradients
DEAL:3d::Norm of difference: 2.06049e-15
DEAL:3d::
DEAL:3d::Testing Divergence
DEAL:3d::Norm of difference: 1.23490e-15
DEAL:3d::
24 changes: 18 additions & 6 deletions tests/matrix_free/matrix_vector_rt_face_01.output
Original file line number Diff line number Diff line change
@@ -1,19 +1,31 @@

DEAL:2d::Testing FE_RaviartThomasNodal<2>(1)
DEAL:2d::Using FE_RaviartThomasNodal<2>(1)
DEAL:2d::Number of cells: 4
DEAL:2d::Number of degrees of freedom: 40
DEAL:2d::
DEAL:2d::Norm of difference: 3.44596e-16
DEAL:2d::Testing Values and Gradients
DEAL:2d::Norm of difference: 2.36910e-16
DEAL:2d::
DEAL:2d::Testing FE_RaviartThomasNodal<2>(2)
DEAL:2d::Testing Divergence
DEAL:2d::Norm of difference: 4.52039e-16
DEAL:2d::
DEAL:2d::Using FE_RaviartThomasNodal<2>(2)
DEAL:2d::Number of cells: 4
DEAL:2d::Number of degrees of freedom: 84
DEAL:2d::
DEAL:2d::Norm of difference: 3.47432e-15
DEAL:2d::Testing Values and Gradients
DEAL:2d::Norm of difference: 7.31531e-15
DEAL:2d::
DEAL:2d::Testing Divergence
DEAL:2d::Norm of difference: 2.97155e-15
DEAL:2d::
DEAL:3d::Testing FE_RaviartThomasNodal<3>(1)
DEAL:3d::Using FE_RaviartThomasNodal<3>(1)
DEAL:3d::Number of cells: 8
DEAL:3d::Number of degrees of freedom: 240
DEAL:3d::
DEAL:3d::Norm of difference: 2.28531e-15
DEAL:3d::Testing Values and Gradients
DEAL:3d::Norm of difference: 3.73456e-15
DEAL:3d::
DEAL:3d::Testing Divergence
DEAL:3d::Norm of difference: 4.51598e-15
DEAL:3d::
31 changes: 31 additions & 0 deletions tests/matrix_free/matrix_vector_rt_face_02.output
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

DEAL:2d::Using FE_RaviartThomasNodal<2>(1)
DEAL:2d::Number of cells: 4
DEAL:2d::Number of degrees of freedom: 40
DEAL:2d::
DEAL:2d::Testing Values and Gradients
DEAL:2d::Norm of difference: 6.92435e-16
DEAL:2d::
DEAL:2d::Testing Divergence
DEAL:2d::Norm of difference: 2.84791e-16
DEAL:2d::
DEAL:2d::Using FE_RaviartThomasNodal<2>(2)
DEAL:2d::Number of cells: 4
DEAL:2d::Number of degrees of freedom: 84
DEAL:2d::
DEAL:2d::Testing Values and Gradients
DEAL:2d::Norm of difference: 4.97871e-15
DEAL:2d::
DEAL:2d::Testing Divergence
DEAL:2d::Norm of difference: 4.05232e-15
DEAL:2d::
DEAL:3d::Using FE_RaviartThomasNodal<3>(1)
DEAL:3d::Number of cells: 8
DEAL:3d::Number of degrees of freedom: 240
DEAL:3d::
DEAL:3d::Testing Values and Gradients
DEAL:3d::Norm of difference: 2.96549e-15
DEAL:3d::
DEAL:3d::Testing Divergence
DEAL:3d::Norm of difference: 4.91752e-15
DEAL:3d::

0 comments on commit 4632283

Please sign in to comment.