Commit 00d0f15a authored by DIAZ Jerome's avatar DIAZ Jerome Committed by GILLES Sebastien

#1423 Moved Input files related to the InternalVariablePolicy where they belong.

parent 032dab44
......@@ -343,7 +343,6 @@ namespace MoReFEM
dW,
d2W);
std::cout<< "At each quad point Piola Kircchoff : \n " << dW << std::endl;
const auto& viscoelasticity_ptr = static_cast<ViscoelasticityPolicyT*>(this);
auto& viscoelasticity = *viscoelasticity_ptr;
......
......@@ -28,12 +28,12 @@
# include "ParameterInstances/Fiber/FiberList.hpp"
# include "ParameterInstances/Fiber/Internal/FiberListManager.hpp"
# include "ParameterInstances/Compound/InternalVariable/AnalyticalPrestress/InputAnalyticalPrestress.hpp"
# include "Parameters/Parameter.hpp"
# include "Parameters/InitParameterFromInputData/InitParameterFromInputData.hpp"
# include "Parameters/ParameterAtQuadraturePoint.hpp"
# include "Operators/LocalVariationalOperator/ElementaryData.hpp"
# include "OperatorInstances/VariationalOperator/NonlinearForm/Local/SecondPiolaKirchhoffStressTensor/InternalVariablePolicy/InputAnalyticalPrestress.hpp"
namespace MoReFEM
......@@ -130,7 +130,7 @@ namespace MoReFEM
//! Alias to the type of the input of the policy.
using input_internal_variable_policy_type =
LocalVariationalOperatorNS::SecondPiolaKirchhoffStressTensorNS::InternalVariablePolicyNS::InputAnalyticalPrestress;
ParameterInstancesNS::SecondPiolaKirchhoffStressTensorNS::InternalVariablePolicyNS::InputAnalyticalPrestress;
//! Friendship to the class that calls SetSigmaC().
template
......
......@@ -32,7 +32,7 @@
# include "Operators/LocalVariationalOperator/ElementaryData.hpp"
# include "ParameterInstances/Compound/Microsphere/InputMicrosphere.hpp"
# include "ParameterInstances/Compound/InternalVariable/Microsphere/InputMicrosphere.hpp"
namespace MoReFEM
{
......
......@@ -17,7 +17,7 @@
# include <memory>
# include "OperatorInstances/VariationalOperator/NonlinearForm/Local/SecondPiolaKirchhoffStressTensor/InternalVariablePolicy/InputNone.hpp"
# include "ParameterInstances/Compound/InternalVariable/InputNone.hpp"
namespace MoReFEM
......@@ -76,7 +76,7 @@ namespace MoReFEM
//! Alias to the type of the input.
using input_internal_variable_policy_type =
::MoReFEM::Advanced::LocalVariationalOperatorNS::InternalVariablePolicyNS::InputNone;
::MoReFEM::Advanced::ParameterInstancesNS::InternalVariablePolicyNS::InputNone;
public:
......
......@@ -15,9 +15,6 @@ target_sources(${MOREFEM_OP_INSTANCES}
PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/AnalyticalPrestress.hpp"
"${CMAKE_CURRENT_LIST_DIR}/AnalyticalPrestress.hxx"
"${CMAKE_CURRENT_LIST_DIR}/InputAnalyticalPrestress.hpp"
"${CMAKE_CURRENT_LIST_DIR}/InputAnalyticalPrestress.hxx"
"${CMAKE_CURRENT_LIST_DIR}/InputNone.hpp"
"${CMAKE_CURRENT_LIST_DIR}/Microsphere.hpp"
"${CMAKE_CURRENT_LIST_DIR}/Microsphere.hxx"
"${CMAKE_CURRENT_LIST_DIR}/None.hpp"
......
......@@ -12,8 +12,8 @@
*/
#ifndef MOREFEM_x_OPERATOR_INSTANCES_x_VARIATIONAL_OPERATOR_x_NONLINEAR_FORM_x_LOCAL_x_SECOND_PIOLA_KIRCHHOFF_STRESS_TENSOR_x_INTERNAL_VARIABLE_POLICY_x_INPUT_ANALYTICAL_PRESTRESS_HPP_
# define MOREFEM_x_OPERATOR_INSTANCES_x_VARIATIONAL_OPERATOR_x_NONLINEAR_FORM_x_LOCAL_x_SECOND_PIOLA_KIRCHHOFF_STRESS_TENSOR_x_INTERNAL_VARIABLE_POLICY_x_INPUT_ANALYTICAL_PRESTRESS_HPP_
#ifndef MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_ANALYTICAL_PRESTRESS_x_INPUT_ANALYTICAL_PRESTRESS_HPP_
# define MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_ANALYTICAL_PRESTRESS_x_INPUT_ANALYTICAL_PRESTRESS_HPP_
# include <memory>
# include <vector>
......@@ -34,7 +34,7 @@ namespace MoReFEM
{
namespace LocalVariationalOperatorNS
namespace ParameterInstancesNS
{
......@@ -96,7 +96,7 @@ namespace MoReFEM
} // namespace SecondPiolaKirchhoffStressTensorNS
} // namespace LocalVariationalOperatorNS
} // namespace ParameterInstancesNS
} // namespace Advanced
......@@ -108,7 +108,7 @@ namespace MoReFEM
/// @} // addtogroup OperatorInstancesGroup
#include "OperatorInstances/VariationalOperator/NonlinearForm/Local/SecondPiolaKirchhoffStressTensor/InternalVariablePolicy/InputAnalyticalPrestress.hxx"
#include "ParameterInstances/Compound/InternalVariable/AnalyticalPrestress/InputAnalyticalPrestress.hxx"
#endif // MOREFEM_x_OPERATOR_INSTANCES_x_VARIATIONAL_OPERATOR_x_NONLINEAR_FORM_x_LOCAL_x_SECOND_PIOLA_KIRCHHOFF_STRESS_TENSOR_x_INTERNAL_VARIABLE_POLICY_x_INPUT_ANALYTICAL_PRESTRESS_HPP_
#endif // MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_ANALYTICAL_PRESTRESS_x_INPUT_ANALYTICAL_PRESTRESS_HPP_
......@@ -12,8 +12,8 @@
*/
#ifndef MOREFEM_x_OPERATOR_INSTANCES_x_VARIATIONAL_OPERATOR_x_NONLINEAR_FORM_x_LOCAL_x_SECOND_PIOLA_KIRCHHOFF_STRESS_TENSOR_x_INTERNAL_VARIABLE_POLICY_x_INPUT_ANALYTICAL_PRESTRESS_HXX_
# define MOREFEM_x_OPERATOR_INSTANCES_x_VARIATIONAL_OPERATOR_x_NONLINEAR_FORM_x_LOCAL_x_SECOND_PIOLA_KIRCHHOFF_STRESS_TENSOR_x_INTERNAL_VARIABLE_POLICY_x_INPUT_ANALYTICAL_PRESTRESS_HXX_
#ifndef MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_ANALYTICAL_PRESTRESS_x_INPUT_ANALYTICAL_PRESTRESS_HXX_
# define MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_ANALYTICAL_PRESTRESS_x_INPUT_ANALYTICAL_PRESTRESS_HXX_
namespace MoReFEM
......@@ -24,7 +24,7 @@ namespace MoReFEM
{
namespace LocalVariationalOperatorNS
namespace ParameterInstancesNS
{
......@@ -74,7 +74,7 @@ namespace MoReFEM
} // namespace SecondPiolaKirchhoffStressTensorNS
} // namespace LocalVariationalOperatorNS
} // namespace ParameterInstancesNS
} // namespace Advanced
......@@ -86,4 +86,4 @@ namespace MoReFEM
/// @} // addtogroup OperatorInstancesGroup
#endif // MOREFEM_x_OPERATOR_INSTANCES_x_VARIATIONAL_OPERATOR_x_NONLINEAR_FORM_x_LOCAL_x_SECOND_PIOLA_KIRCHHOFF_STRESS_TENSOR_x_INTERNAL_VARIABLE_POLICY_x_INPUT_ANALYTICAL_PRESTRESS_HXX_
#endif // MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_ANALYTICAL_PRESTRESS_x_INPUT_ANALYTICAL_PRESTRESS_HXX_
### ===================================================================================
### This file is generated automatically by Scripts/generate_cmake_source_list.py.
### Do not edit it manually!
### Convention is that:
### - When a CMake file is manually managed, it is named canonically CMakeLists.txt.
###. - When it is generated automatically, it is named SourceList.cmake.
### ===================================================================================
target_sources(${MOREFEM_PARAM_INSTANCES}
PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/InputAnalyticalPrestress.hpp"
"${CMAKE_CURRENT_LIST_DIR}/InputAnalyticalPrestress.hxx"
)
......@@ -12,8 +12,8 @@
*/
#ifndef MOREFEM_x_OPERATOR_INSTANCES_x_VARIATIONAL_OPERATOR_x_NONLINEAR_FORM_x_LOCAL_x_SECOND_PIOLA_KIRCHHOFF_STRESS_TENSOR_x_INTERNAL_VARIABLE_POLICY_x_INPUT_NONE_HPP_
# define MOREFEM_x_OPERATOR_INSTANCES_x_VARIATIONAL_OPERATOR_x_NONLINEAR_FORM_x_LOCAL_x_SECOND_PIOLA_KIRCHHOFF_STRESS_TENSOR_x_INTERNAL_VARIABLE_POLICY_x_INPUT_NONE_HPP_
#ifndef MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_INPUT_NONE_HPP_
# define MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_INPUT_NONE_HPP_
......@@ -25,7 +25,7 @@ namespace MoReFEM
{
namespace LocalVariationalOperatorNS
namespace ParameterInstancesNS
{
......@@ -42,7 +42,7 @@ namespace MoReFEM
} // namespace LocalVariationalOperatorNS
} // namespace ParameterInstancesNS
} // namespace Advanced
......@@ -54,4 +54,4 @@ namespace MoReFEM
/// @} // addtogroup OperatorInstancesGroup
#endif // MOREFEM_x_OPERATOR_INSTANCES_x_VARIATIONAL_OPERATOR_x_NONLINEAR_FORM_x_LOCAL_x_SECOND_PIOLA_KIRCHHOFF_STRESS_TENSOR_x_INTERNAL_VARIABLE_POLICY_x_INPUT_NONE_HPP_
#endif // MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_INPUT_NONE_HPP_
......@@ -14,7 +14,7 @@
#include <sstream>
#include "ParameterInstances/Compound/Microsphere/Exceptions/InputMicrosphere.hpp"
#include "ParameterInstances/Compound/InternalVariable/Microsphere/Exceptions/InputMicrosphere.hpp"
namespace // anonymous
......
......@@ -12,8 +12,8 @@
*/
#ifndef MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_MICROSPHERE_x_EXCEPTIONS_x_INPUT_MICROSPHERE_HPP_
# define MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_MICROSPHERE_x_EXCEPTIONS_x_INPUT_MICROSPHERE_HPP_
#ifndef MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_MICROSPHERE_x_EXCEPTIONS_x_INPUT_MICROSPHERE_HPP_
# define MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_MICROSPHERE_x_EXCEPTIONS_x_INPUT_MICROSPHERE_HPP_
# include <string>
......@@ -70,7 +70,7 @@ namespace MoReFEM
// @} // addtogroup ParameterInstancesGroup
# include "ParameterInstances/Compound/Microsphere/Exceptions/InputMicrosphere.hxx"
# include "ParameterInstances/Compound/InternalVariable/Microsphere/Exceptions/InputMicrosphere.hxx"
#endif // MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_MICROSPHERE_x_EXCEPTIONS_x_INPUT_MICROSPHERE_HPP_
#endif // MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_MICROSPHERE_x_EXCEPTIONS_x_INPUT_MICROSPHERE_HPP_
......@@ -12,8 +12,8 @@
*/
#ifndef MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_MICROSPHERE_x_EXCEPTIONS_x_INPUT_MICROSPHERE_HXX_
# define MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_MICROSPHERE_x_EXCEPTIONS_x_INPUT_MICROSPHERE_HXX_
#ifndef MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_MICROSPHERE_x_EXCEPTIONS_x_INPUT_MICROSPHERE_HXX_
# define MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_MICROSPHERE_x_EXCEPTIONS_x_INPUT_MICROSPHERE_HXX_
namespace MoReFEM
......@@ -34,4 +34,4 @@ namespace MoReFEM
// @} // addtogroup ParameterInstancesGroup
#endif // MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_MICROSPHERE_x_EXCEPTIONS_x_INPUT_MICROSPHERE_HXX_
#endif // MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_MICROSPHERE_x_EXCEPTIONS_x_INPUT_MICROSPHERE_HXX_
......@@ -22,7 +22,7 @@
#include "FiniteElement/QuadratureRules/QuadratureRule.hpp"
#include "FiniteElement/QuadratureRules/QuadratureRulePerTopology.hpp"
#include "ParameterInstances/Compound/Microsphere/InputMicrosphere.hpp"
#include "ParameterInstances/Compound/InternalVariable/Microsphere/InputMicrosphere.hpp"
......
......@@ -12,8 +12,8 @@
*/
#ifndef MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_MICROSPHERE_x_INPUT_MICROSPHERE_HPP_
# define MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_MICROSPHERE_x_INPUT_MICROSPHERE_HPP_
#ifndef MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_MICROSPHERE_x_INPUT_MICROSPHERE_HPP_
# define MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_MICROSPHERE_x_INPUT_MICROSPHERE_HPP_
# include <memory>
# include <vector>
......@@ -25,7 +25,7 @@
# include "Parameters/Parameter.hpp"
# include "Parameters/InitParameterFromInputData/InitParameterFromInputData.hpp"
# include "ParameterInstances/Compound/Microsphere/Exceptions/InputMicrosphere.hpp"
# include "ParameterInstances/Compound/InternalVariable/Microsphere/Exceptions/InputMicrosphere.hpp"
namespace MoReFEM
......@@ -252,7 +252,7 @@ namespace MoReFEM
/// @} // addtogroup ParameterInstancesGroup
# include "ParameterInstances/Compound/Microsphere/InputMicrosphere.hxx"
# include "ParameterInstances/Compound/InternalVariable/Microsphere/InputMicrosphere.hxx"
#endif // MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_MICROSPHERE_x_INPUT_MICROSPHERE_HPP_
#endif // MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_MICROSPHERE_x_INPUT_MICROSPHERE_HPP_
......@@ -12,8 +12,8 @@
*/
#ifndef MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_MICROSPHERE_x_INPUT_MICROSPHERE_HXX_
# define MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_MICROSPHERE_x_INPUT_MICROSPHERE_HXX_
#ifndef MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_MICROSPHERE_x_INPUT_MICROSPHERE_HXX_
# define MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_MICROSPHERE_x_INPUT_MICROSPHERE_HXX_
namespace MoReFEM
......@@ -97,8 +97,8 @@ namespace MoReFEM
std::get<4>(input_microsphere_) =
InitScalarParameterFromInputData<MicrosphereIP::OutOfPlaneFiberDispersionI6>("OutOfPlaneFiberDispersionI6",
domain,
input_data);
domain,
input_data);
std::get<5>(input_microsphere_) =
InitScalarParameterFromInputData<MicrosphereIP::FiberStiffnessDensityI6>("FiberStiffnessDensityI6",
......@@ -230,4 +230,4 @@ namespace MoReFEM
/// @} // addtogroup ParameterInstancesGroup
#endif // MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_MICROSPHERE_x_INPUT_MICROSPHERE_HXX_
#endif // MOREFEM_x_PARAMETER_INSTANCES_x_COMPOUND_x_INTERNAL_VARIABLE_x_MICROSPHERE_x_INPUT_MICROSPHERE_HXX_
### ===================================================================================
### This file is generated automatically by Scripts/generate_cmake_source_list.py.
### Do not edit it manually!
### Convention is that:
### - When a CMake file is manually managed, it is named canonically CMakeLists.txt.
###. - When it is generated automatically, it is named SourceList.cmake.
### ===================================================================================
target_sources(${MOREFEM_PARAM_INSTANCES}
PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/InputNone.hpp"
)
include(${CMAKE_CURRENT_LIST_DIR}/Microsphere/SourceList.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/AnalyticalPrestress/SourceList.cmake)
......@@ -12,5 +12,5 @@ target_sources(${MOREFEM_PARAM_INSTANCES}
PRIVATE
)
include(${CMAKE_CURRENT_LIST_DIR}/Microsphere/SourceList.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/InternalVariable/SourceList.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/Solid/SourceList.cmake)
Markdown is supported
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