Commit f688bc11 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Cleanup of directory structure and removed obsolete files and functions

parent 0ef5f46a
#install headers
install(FILES
ConvectionDiffusionOperator.hpp
FirstOrderDivTestvec.hpp
FirstOrderDivTestvecTrial.hpp
FirstOrderGradTest.hpp
FirstOrderGradTestTrial.hpp
FirstOrderGradTestTrialvec.hpp
FirstOrderPartialTest.hpp
FirstOrderPartialTestTrial.hpp
FirstOrderTestDivTrialvec.hpp
FirstOrderTestGradTrial.hpp
......@@ -12,10 +16,11 @@ install(FILES
SecondOrderDivTestvecDivTrialvec.hpp
SecondOrderGradTestGradTrial.hpp
SecondOrderPartialTestPartialTrial.hpp
StokesOperator.hpp
ZeroOrderTest.hpp
ZeroOrderTestTrial.hpp
ZeroOrderTestTrialvec.hpp
ZeroOrderTestvec.hpp
ZeroOrderTestvecTrial.hpp
ZeroOrderTestvecTrialvec.hpp
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/assembler)
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/localoperators)
......@@ -2,11 +2,11 @@
#include <type_traits>
#include <amdis/LocalBasisCache.hpp>
#include <amdis/utility/LocalBasisCache.hpp>
#include <amdis/LocalOperator.hpp>
#include <amdis/Output.hpp>
#include <amdis/common/Utility.hpp>
#include <amdis/common/Size.hpp>
#include <amdis/common/TypeTraits.hpp>
#include <amdis/common/StaticSize.hpp>
namespace AMDiS
{
......@@ -109,22 +109,22 @@ namespace AMDiS
IF_CONSTEXPR(conserving) {
WorldVector gradAi;
for (std::size_t i = 0; i < numLocalFe; ++i) {
const int local_i = rowNode.localIndex(i);
const auto local_i = rowNode.localIndex(i);
gradAi = A * gradients[i];
auto gradBi = b * gradients[i];
for (std::size_t j = 0; j < numLocalFe; ++j) {
const int local_j = colNode.localIndex(j);
const auto local_j = colNode.localIndex(j);
elementMatrix[local_i][local_j] += (dot(gradAi, gradients[j]) + (c * shapeValues[i] - gradBi) * shapeValues[j]) * factor;
}
}
} else {
WorldVector grad_i;
for (std::size_t i = 0; i < numLocalFe; ++i) {
const int local_i = rowNode.localIndex(i);
const auto local_i = rowNode.localIndex(i);
grad_i = A * gradients[i];
grad_i+= b * shapeValues[i];
for (std::size_t j = 0; j < numLocalFe; ++j) {
const int local_j = colNode.localIndex(j);
const auto local_j = colNode.localIndex(j);
elementMatrix[local_i][local_j] += (dot(grad_i, gradients[j]) + c * shapeValues[i] * shapeValues[j]) * factor;
}
}
......@@ -169,7 +169,7 @@ namespace AMDiS
const auto factor = localFctF(local) * context.integrationElement(quad[iq].position()) * quad[iq].weight();
for (std::size_t i = 0; i < numLocalFe; ++i) {
const int local_i = node.localIndex(i);
const auto local_i = node.localIndex(i);
elementVector[local_i] += shapeValues[i] * factor;
}
}
......
......@@ -3,9 +3,9 @@
#include <type_traits>
#include <amdis/GridFunctionOperator.hpp>
#include <amdis/LocalBasisCache.hpp>
#include <amdis/Output.hpp>
#include <amdis/common/Size.hpp>
#include <amdis/common/StaticSize.hpp>
#include <amdis/utility/LocalBasisCache.hpp>
namespace AMDiS
{
......
......@@ -2,7 +2,7 @@
#include <type_traits>
#include <amdis/assembler/FirstOrderTestDivTrialvec.hpp>
#include <amdis/localoperators/FirstOrderTestDivTrialvec.hpp>
namespace AMDiS
{
......
......@@ -3,9 +3,9 @@
#include <type_traits>
#include <amdis/GridFunctionOperator.hpp>
#include <amdis/LocalBasisCache.hpp>
#include <amdis/Output.hpp>
#include <amdis/common/Size.hpp>
#include <amdis/common/StaticSize.hpp>
#include <amdis/utility/LocalBasisCache.hpp>
namespace AMDiS
{
......
......@@ -2,7 +2,7 @@
#include <type_traits>
#include <amdis/assembler/FirstOrderTestGradTrial.hpp>
#include <amdis/localoperators/FirstOrderTestGradTrial.hpp>
namespace AMDiS
{
......
......@@ -2,7 +2,7 @@
#include <type_traits>
#include <amdis/assembler/FirstOrderTestvecGradTrial.hpp>
#include <amdis/localoperators/FirstOrderTestvecGradTrial.hpp>
namespace AMDiS
{
......
......@@ -2,7 +2,7 @@
#include <type_traits>
#include <amdis/assembler/FirstOrderTestPartialTrial.hpp>
#include <amdis/localoperators/FirstOrderTestPartialTrial.hpp>
namespace AMDiS
{
......
......@@ -2,7 +2,7 @@
#include <type_traits>
#include <amdis/assembler/FirstOrderTestPartialTrial.hpp>
#include <amdis/localoperators/FirstOrderTestPartialTrial.hpp>
namespace AMDiS
{
......
......@@ -3,9 +3,9 @@
#include <type_traits>
#include <amdis/GridFunctionOperator.hpp>
#include <amdis/LocalBasisCache.hpp>
#include <amdis/utility/LocalBasisCache.hpp>
#include <amdis/Output.hpp>
#include <amdis/common/Size.hpp>
#include <amdis/common/StaticSize.hpp>
namespace AMDiS
{
......
......@@ -3,9 +3,9 @@
#include <type_traits>
#include <amdis/GridFunctionOperator.hpp>
#include <amdis/LocalBasisCache.hpp>
#include <amdis/utility/LocalBasisCache.hpp>
#include <amdis/Output.hpp>
#include <amdis/common/Size.hpp>
#include <amdis/common/StaticSize.hpp>
namespace AMDiS
{
......
......@@ -3,9 +3,9 @@
#include <type_traits>
#include <amdis/GridFunctionOperator.hpp>
#include <amdis/LocalBasisCache.hpp>
#include <amdis/utility/LocalBasisCache.hpp>
#include <amdis/Output.hpp>
#include <amdis/common/Size.hpp>
#include <amdis/common/StaticSize.hpp>
namespace AMDiS
{
......
......@@ -3,9 +3,9 @@
#include <type_traits>
#include <amdis/GridFunctionOperator.hpp>
#include <amdis/LocalBasisCache.hpp>
#include <amdis/utility/LocalBasisCache.hpp>
#include <amdis/Output.hpp>
#include <amdis/common/Size.hpp>
#include <amdis/common/StaticSize.hpp>
namespace AMDiS
{
......
......@@ -3,9 +3,9 @@
#include <type_traits>
#include <amdis/GridFunctionOperator.hpp>
#include <amdis/LocalBasisCache.hpp>
#include <amdis/utility/LocalBasisCache.hpp>
#include <amdis/Output.hpp>
#include <amdis/common/Size.hpp>
#include <amdis/common/StaticSize.hpp>
namespace AMDiS
{
......
......@@ -3,9 +3,9 @@
#include <type_traits>
#include <amdis/GridFunctionOperator.hpp>
#include <amdis/LocalBasisCache.hpp>
#include <amdis/utility/LocalBasisCache.hpp>
#include <amdis/Output.hpp>
#include <amdis/common/Size.hpp>
#include <amdis/common/StaticSize.hpp>
#include <amdis/common/ValueCategory.hpp>
namespace AMDiS
......
......@@ -3,9 +3,9 @@
#include <type_traits>
#include <amdis/GridFunctionOperator.hpp>
#include <amdis/LocalBasisCache.hpp>
#include <amdis/utility/LocalBasisCache.hpp>
#include <amdis/Output.hpp>
#include <amdis/common/Size.hpp>
#include <amdis/common/StaticSize.hpp>
namespace AMDiS
{
......
......@@ -4,8 +4,8 @@
#include <vector>
#include <amdis/GridFunctionOperator.hpp>
#include <amdis/LocalBasisCache.hpp>
#include <amdis/common/Size.hpp>
#include <amdis/utility/LocalBasisCache.hpp>
#include <amdis/common/StaticSize.hpp>
namespace AMDiS
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment