Skip to content

GitLab

Commit 09301848 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1026 Move all operator instances into the brand new library.

parent 096bdb70
Expand all Hide whitespace changes
Inline Side-by-side
HappyHeart.xcodeproj/project.pbxproj
View file @ 09301848
This diff is collapsed.
Sources/ModelInstances/CardiacMechanicsPrestress/VariationalFormulation.hpp
View file @ 09301848
......@@ -35,7 +35,7 @@
# include "OperatorInstances/VariationalOperator/NonlinearForm/Advanced//SecondPiolaKirchhoffStressTensor/Private/Helper.hpp"
# include "Operators/ParametersOperator/GlobalParametersOperatorInstances/UpdateFiberDeformation.hpp"
# include "OperatorInstances/ParameterOperator//UpdateFiberDeformation.hpp"
# include "Operators/Miscellaneous/FindCoordsOfGlobalVector.hpp"
# include "Operators/Miscellaneous/MatchDofInNumberingSubset.hpp"
......
Sources/ModelInstances/FSI_EI/ImplicitStepFluidVariationalFormulation.hpp
View file @ 09301848
......@@ -19,7 +19,7 @@
# include "Geometry/Domain/Domain.hpp"
# include "OperatorInstances/VariationalOperator/BilinearForm/ScalarDivVectorial.hpp"
# include "Operators/ConformInterpolatorInstances/SubsetOrSuperset.hpp"
# include "OperatorInstances/ConformInterpolator/SubsetOrSuperset.hpp"
# include "OperatorInstances/VariationalOperator/LinearForm/TransientSource.hpp"
......
Sources/ModelInstances/FSI_EI/Newton/Model.hpp
View file @ 09301848
......@@ -20,9 +20,9 @@
# include "Geometry/Interpolator/VertexMatching.hpp"
# include "Operators/ConformInterpolatorInstances/P1_to_P2.hpp"
# include "Operators/ConformInterpolatorInstances/SubsetOrSuperset.hpp"
# include "Operators/NonConformInterpolator/FromVertexMatching.hpp"
# include "OperatorInstances/ConformInterpolator/P1_to_P2.hpp"
# include "OperatorInstances/ConformInterpolator/SubsetOrSuperset.hpp"
# include "OperatorInstances/NonConformInterpolator/FromVertexMatching.hpp"
# include "Model/Model.hpp"
......
Sources/ModelInstances/Legacy/FSI_EI_One_Mesh/Aitken/Model.hpp
View file @ 09301848
......@@ -14,8 +14,8 @@
# include <memory>
# include <vector>
# include "Operators/ConformInterpolatorInstances/P1_to_P2.hpp"
# include "Operators/ConformInterpolatorInstances/SubsetOrSuperset.hpp"
# include "OperatorInstances/ConformInterpolator/P1_to_P2.hpp"
# include "OperatorInstances/ConformInterpolator/SubsetOrSuperset.hpp"
# include "Model/Model.hpp"
......
Sources/ModelInstances/Legacy/FSI_EI_One_Mesh/ImplicitStepFluidVariationalFormulation.hpp
View file @ 09301848
......@@ -19,7 +19,7 @@
# include "Geometry/Domain/Domain.hpp"
# include "OperatorInstances/VariationalOperator/BilinearForm/ScalarDivVectorial.hpp"
# include "Operators/ConformInterpolatorInstances/SubsetOrSuperset.hpp"
# include "OperatorInstances/ConformInterpolator/SubsetOrSuperset.hpp"
# include "OperatorInstances/VariationalOperator/LinearForm/TransientSource.hpp"
......
Sources/ModelInstances/Legacy/FSI_EI_One_Mesh/Newton/Model.hpp
View file @ 09301848
......@@ -18,8 +18,8 @@
# include "ThirdParty/Wrappers/Petsc/Matrix/ShellMatrix.hpp"
# include "Operators/ConformInterpolatorInstances/P1_to_P2.hpp"
# include "Operators/ConformInterpolatorInstances/SubsetOrSuperset.hpp"
# include "OperatorInstances/ConformInterpolator/P1_to_P2.hpp"
# include "OperatorInstances/ConformInterpolator/SubsetOrSuperset.hpp"
# include "Model/Model.hpp"
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/Data/Porosity.cpp
View file @ 09301848
......@@ -12,7 +12,7 @@
#include "FiniteElement/FiniteElementSpace/GodOfDofManager.hpp"
#include "Operators/NonConformInterpolator/FromVertexMatching.hpp"
#include "OperatorInstances/NonConformInterpolator/FromVertexMatching.hpp"
#include "ModelInstances/UnderDevelopment/Poromechanics/InputParameterList.hpp"
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/InterpolatorHolder.cpp
View file @ 09301848
......@@ -12,7 +12,7 @@
#include "FiniteElement/FiniteElementSpace/GodOfDofManager.hpp"
#include "Operators/ConformInterpolatorInstances/P1_to_P1b.hpp"
#include "OperatorInstances/ConformInterpolator/P1_to_P1b.hpp"
#include "ModelInstances/UnderDevelopment/Poromechanics/InputParameterList.hpp"
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/InterpolatorHolder.hpp
View file @ 09301848
......@@ -14,8 +14,8 @@
# include <memory>
# include <vector>
# include "Operators/ConformInterpolatorInstances/SubsetOrSuperset.hpp"
# include "Operators/NonConformInterpolator/FromVertexMatching.hpp"
# include "OperatorInstances/ConformInterpolator/SubsetOrSuperset.hpp"
# include "OperatorInstances/NonConformInterpolator/FromVertexMatching.hpp"
namespace HappyHeart
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/Model.hpp
View file @ 09301848
......@@ -22,7 +22,7 @@
# include "Parameters/InitParameterFromInputData/InitParameterFromInputData.hpp"
# include "Parameters/TimeDependency/TimeDependency.hpp"
# include "Operators/ConformInterpolatorInstances/P1b_to_P1.hpp"
# include "OperatorInstances/ConformInterpolator/P1b_to_P1.hpp"
# include "OperatorInstances/VariationalOperator/BilinearForm/VariableMass.hpp"
# include "Model/Model.hpp"
......
Sources/Operators/ConformInterpolatorInstances/Private/P1_to_Phigher.hpp → Sources/OperatorInstances/ConformInterpolator/Internal/P1_to_Phigher.hpp
View file @ 09301848
......@@ -6,8 +6,8 @@
// Copyright © 2016 Inria. All rights reserved.
//
#ifndef HAPPY_HEART_x_OPERATORS_x_CONFORM_INTERPOLATOR_INSTANCES_x_PRIVATE_x_P1_xTO_x_PHIGHER_HPP_
# define HAPPY_HEART_x_OPERATORS_x_CONFORM_INTERPOLATOR_INSTANCES_x_PRIVATE_x_P1_xTO_x_PHIGHER_HPP_
#ifndef HAPPY_HEART_x_OPERATOR_INSTANCES_x_CONFORM_INTERPOLATOR_x_INTERNAL_x_P1_xTO_x_PHIGHER_HPP_
# define HAPPY_HEART_x_OPERATOR_INSTANCES_x_CONFORM_INTERPOLATOR_x_INTERNAL_x_P1_xTO_x_PHIGHER_HPP_
# include <memory>
# include <vector>
......@@ -17,16 +17,16 @@
namespace HappyHeart
{
namespace ConformInterpolatorNS
{
namespace Private
{
/*!
* \brief Family of interpolators that extend a P1 finite element to higher order: P1b, P2, etc...
*
......@@ -43,30 +43,30 @@ namespace HappyHeart
>
{
private:
using parent = LagrangianNS::LagrangianInterpolator
<
P1_to_Phigher<LocalInterpolatorT>,
LocalInterpolatorT
>;
public:
//! \copydoc doxygen_hide_alias_self
using self = P1_to_Phigher<LocalInterpolatorT>;
//! Alias to unique_ptr.
using unique_ptr = std::unique_ptr<self>;
//! Class name.
static const std::string& ClassName();
public:
/// \name Special members.
///@{
/*!
* \brief Constructor.
*
......@@ -90,41 +90,41 @@ namespace HappyHeart
const FEltSpace& target_felt_space,
const NumberingSubset& target_numbering_subset,
pairing_type&& pairing);
//! Destructor.
~P1_to_Phigher() = default;
//! Copy constructor.
P1_to_Phigher(const P1_to_Phigher&) = delete;
//! Move constructor.
P1_to_Phigher(P1_to_Phigher&&) = delete;
//! Copy affectation.
P1_to_Phigher& operator=(const P1_to_Phigher&) = delete;
//! Move affectation.
P1_to_Phigher& operator=(P1_to_Phigher&&) = delete;
///@}
private:
};
} // namespace Private
} // namespace ConformInterpolatorNS
} // namespace HappyHeart
# include "Operators/ConformInterpolatorInstances/Private/P1_to_Phigher.hxx"
# include "OperatorInstances/ConformInterpolator/Internal/P1_to_Phigher.hxx"
#endif // HAPPY_HEART_x_OPERATORS_x_CONFORM_INTERPOLATOR_INSTANCES_x_PRIVATE_x_P1_xTO_x_PHIGHER_HPP_
#endif // HAPPY_HEART_x_OPERATOR_INSTANCES_x_CONFORM_INTERPOLATOR_x_INTERNAL_x_P1_xTO_x_PHIGHER_HPP_
Sources/Operators/ConformInterpolatorInstances/Private/P1_to_Phigher.hxx → Sources/OperatorInstances/ConformInterpolator/Internal/P1_to_Phigher.hxx
View file @ 09301848
......@@ -6,30 +6,30 @@
// Copyright © 2016 Inria. All rights reserved.
//
#ifndef HAPPY_HEART_x_OPERATORS_x_CONFORM_INTERPOLATOR_INSTANCES_x_PRIVATE_x_P1_xTO_x_PHIGHER_HXX_
# define HAPPY_HEART_x_OPERATORS_x_CONFORM_INTERPOLATOR_INSTANCES_x_PRIVATE_x_P1_xTO_x_PHIGHER_HXX_
#ifndef HAPPY_HEART_x_OPERATOR_INSTANCES_x_CONFORM_INTERPOLATOR_x_INTERNAL_x_P1_xTO_x_PHIGHER_HXX_
# define HAPPY_HEART_x_OPERATOR_INSTANCES_x_CONFORM_INTERPOLATOR_x_INTERNAL_x_P1_xTO_x_PHIGHER_HXX_
namespace HappyHeart
{
namespace ConformInterpolatorNS
{
namespace Private
{
template<class LocalInterpolatorT>
const std::string& P1_to_Phigher<LocalInterpolatorT>::ClassName()
{
static std::string ret = "P1_to_" + LocalInterpolatorT::GetTargetShapeFunctionLabel();
return ret;
}
template<class LocalInterpolatorT>
P1_to_Phigher<LocalInterpolatorT>
::P1_to_Phigher(const FEltSpace& source_felt_space,
......@@ -44,10 +44,10 @@ namespace HappyHeart
std::move(pairing))
{
#ifndef NDEBUG
const auto& interpolation_data = parent::GetInterpolationData();
const auto& source_unknown_storage = interpolation_data.GetSourceData().GetExtendedUnknownList();
assert(std::all_of(source_unknown_storage.cbegin(),
source_unknown_storage.cend(),
[](const auto& extended_unknown_ptr)
......@@ -55,32 +55,32 @@ namespace HappyHeart
assert(!(!extended_unknown_ptr));
return extended_unknown_ptr->GetShapeFunctionLabel() == "P1";
}));
const auto& target_unknown_storage = interpolation_data.GetTargetData().GetExtendedUnknownList();
assert(std::all_of(target_unknown_storage.cbegin(),
target_unknown_storage.cend(),
[](const auto& extended_unknown_ptr)
{
if (!extended_unknown_ptr)
return true; // some unknowns may be dropped.
return extended_unknown_ptr->GetShapeFunctionLabel() == LocalInterpolatorT::GetTargetShapeFunctionLabel();
}));
#endif // NDEBUG
}
} // namespace Private
} // namespace ConformInterpolatorNS
} // namespace HappyHeart
#endif // HAPPY_HEART_x_OPERATORS_x_CONFORM_INTERPOLATOR_INSTANCES_x_PRIVATE_x_P1_xTO_x_PHIGHER_HXX_
#endif // HAPPY_HEART_x_OPERATOR_INSTANCES_x_CONFORM_INTERPOLATOR_x_INTERNAL_x_P1_xTO_x_PHIGHER_HXX_
Sources/Operators/ConformInterpolatorInstances/Private/Phigher_to_P1.hpp → Sources/OperatorInstances/ConformInterpolator/Internal/Phigher_to_P1.hpp
View file @ 09301848
......@@ -6,8 +6,8 @@
// Copyright © 2016 Inria. All rights reserved.
//
#ifndef HAPPY_HEART_x_OPERATORS_x_CONFORM_INTERPOLATOR_INSTANCES_x_PRIVATE_x_PHIGHER_xTO_x_P1_HPP_
# define HAPPY_HEART_x_OPERATORS_x_CONFORM_INTERPOLATOR_INSTANCES_x_PRIVATE_x_PHIGHER_xTO_x_P1_HPP_
#ifndef HAPPY_HEART_x_OPERATOR_INSTANCES_x_CONFORM_INTERPOLATOR_x_INTERNAL_x_PHIGHER_xTO_x_P1_HPP_
# define HAPPY_HEART_x_OPERATOR_INSTANCES_x_CONFORM_INTERPOLATOR_x_INTERNAL_x_PHIGHER_xTO_x_P1_HPP_
# include <memory>
# include <vector>
......@@ -17,16 +17,16 @@
namespace HappyHeart
{
namespace ConformInterpolatorNS
{
namespace Private
{
/*!
* \brief Family of interpolators that reduce a P1b, P2, ... finite element to P1.
*
......@@ -42,31 +42,31 @@ namespace HappyHeart
LocalInterpolatorT
>
{
public:
//! \copydoc doxygen_hide_alias_self
using self = Phigher_to_P1<LocalInterpolatorT>;
//! Alias to unique pointer.
using unique_ptr = std::unique_ptr<self>;
//! Class name.
static const std::string& ClassName();
private:
//! Alias to parent.
using parent = LagrangianNS::LagrangianInterpolator<self, LocalInterpolatorT>;
public:
/// \name Special members.
///@{
/*!
* \brief Constructor.
*
......@@ -89,41 +89,41 @@ namespace HappyHeart
const FEltSpace& target_felt_space,
const NumberingSubset& target_numbering_subset,
pairing_type&& pairing);
//! Destructor.
~Phigher_to_P1() = default;
//! Copy constructor.
Phigher_to_P1(const Phigher_to_P1&) = delete;
//! Move constructor.
Phigher_to_P1(Phigher_to_P1&&) = delete;
//! Copy affectation.
Phigher_to_P1& operator=(const Phigher_to_P1&) = delete;
//! Move affectation.
Phigher_to_P1& operator=(Phigher_to_P1&&) = delete;
///@}
private:
};
} // namespace Private
} // namespace ConformInterpolatorNS
} // namespace HappyHeart
# include "Operators/ConformInterpolatorInstances/Private/Phigher_to_P1.hxx"
# include "OperatorInstances/ConformInterpolator/Internal/Phigher_to_P1.hxx"
#endif // HAPPY_HEART_x_OPERATORS_x_CONFORM_INTERPOLATOR_INSTANCES_x_PRIVATE_x_PHIGHER_xTO_x_P1_HPP_
#endif // HAPPY_HEART_x_OPERATOR_INSTANCES_x_CONFORM_INTERPOLATOR_x_INTERNAL_x_PHIGHER_xTO_x_P1_HPP_
Sources/Operators/ConformInterpolatorInstances/Private/Phigher_to_P1.hxx → Sources/OperatorInstances/ConformInterpolator/Internal/Phigher_to_P1.hxx
View file @ 09301848
......@@ -6,22 +6,22 @@
// Copyright © 2016 Inria. All rights reserved.
//
#ifndef HAPPY_HEART_x_OPERATORS_x_CONFORM_INTERPOLATOR_INSTANCES_x_PRIVATE_x_PHIGHER_xTO_x_P1_HXX_
# define HAPPY_HEART_x_OPERATORS_x_CONFORM_INTERPOLATOR_INSTANCES_x_PRIVATE_x_PHIGHER_xTO_x_P1_HXX_
#ifndef HAPPY_HEART_x_OPERATOR_INSTANCES_x_CONFORM_INTERPOLATOR_x_INTERNAL_x_PHIGHER_xTO_x_P1_HXX_
# define HAPPY_HEART_x_OPERATOR_INSTANCES_x_CONFORM_INTERPOLATOR_x_INTERNAL_x_PHIGHER_xTO_x_P1_HXX_
namespace HappyHeart
{
namespace ConformInterpolatorNS
{
namespace Private
{
template<class LocalInterpolatorT>
const std::string& Phigher_to_P1<LocalInterpolatorT>::ClassName()
{
......@@ -29,7 +29,7 @@ namespace HappyHeart
return ret;
}
template<class LocalInterpolatorT>
Phigher_to_P1<LocalInterpolatorT>::Phigher_to_P1(const FEltSpace& source_felt_space,
const NumberingSubset& source_numbering_subset,
......@@ -43,41 +43,41 @@ namespace HappyHeart
std::move(pairing))
{
#ifndef NDEBUG
const auto& interpolation_data = parent::GetInterpolationData();
const auto& source_unknown_storage = interpolation_data.GetSourceData().GetExtendedUnknownList();
assert(std::all_of(source_unknown_storage.cbegin(),
source_unknown_storage.cend(),
[](const auto& extended_unknown_ptr)
{
assert(!(!extended_unknown_ptr));
return extended_unknown_ptr->GetShapeFunctionLabel() == LocalInterpolatorT::GetSourceShapeFunctionLabel();
}));
const auto& target_unknown_storage = interpolation_data.GetTargetData().GetExtendedUnknownList();
assert(std::all_of(target_unknown_storage.cbegin(),
target_unknown_storage.cend(),
[](const auto& extended_unknown_ptr)
{
if (!extended_unknown_ptr)
return true; // some unknowns may be dropped.
return extended_unknown_ptr->GetShapeFunctionLabel() == "P1";
}));
#endif // NDEBUG
}
} // namespace Private
} // namespace ConformInterpolatorNS
} // namespace HappyHeart
#endif // HAPPY_HEART_x_OPERATORS_x_CONFORM_INTERPOLATOR_INSTANCES_x_PRIVATE_x_PHIGHER_xTO_x_P1_HXX_
#endif // HAPPY_HEART_x_OPERATOR_INSTANCES_x_CONFORM_INTERPOLATOR_x_INTERNAL_x_PHIGHER_xTO_x_P1_HXX_
Sources/Operators/ConformInterpolatorInstances/Local/Private/Check.cpp → Sources/OperatorInstances/ConformInterpolator/Local/Internal/Check.cpp
View file @ 09301848
......@@ -8,7 +8,7 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#include "Operators/ConformInterpolatorInstances/Local/Private/Check.hpp"
#include "OperatorInstances/ConformInterpolator/Local/Internal/Check.hpp"
namespace HappyHeart
......@@ -51,10 +51,7 @@ namespace HappyHeart
}
#endif // NDEBUG
} //namespace Private
......
Sources/Operators/ConformInterpolatorInstances/Local/Private/Check.hpp → Sources/OperatorInstances/ConformInterpolator/Local/Internal/Check.hpp
View file @ 09301848
//! \file
//! \file
//
//
// Check.hpp
......@@ -8,28 +8,28 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#ifndef HAPPY_HEART_x_OPERATORS_x_CONFORM_INTERPOLATOR_INSTANCES_x_LOCAL_x_PRIVATE_x_CHECK_HPP_
# define HAPPY_HEART_x_OPERATORS_x_CONFORM_INTERPOLATOR_INSTANCES_x_LOCAL_x_PRIVATE_x_CHECK_HPP_
#ifndef HAPPY_HEART_x_OPERATOR_INSTANCES_x_CONFORM_INTERPOLATOR_x_LOCAL_x_INTERNAL_x_CHECK_HPP_
# define HAPPY_HEART_x_OPERATOR_INSTANCES_x_CONFORM_INTERPOLATOR_x_LOCAL_x_INTERNAL_x_CHECK_HPP_