Commit 6d21f1df authored by GILLES Sebastien's avatar GILLES Sebastien

#1304 Rename input_parameter_data input_data.

parent 09c4490b
......@@ -31,9 +31,9 @@
/*!
*
* \class doxygen_hide_input_parameter_data_arg
* \class doxygen_hide_input_data_arg
*
* \param[in] input_parameter_data Object which hold the values of all the parameters defined in
* \param[in] input_data Object which hold the values of all the parameters defined in
* the input file.
*/
......
......@@ -30,7 +30,7 @@ namespace MoReFEM
/*!
* \brief Init the time keeper and write its logs in the output directory specified in \a input_parameter_data.
* \brief Init the time keeper and write its logs in the output directory specified in \a input_data.
*
* This function is to be called early in your main if you want to time keep some information lines.
*
......
......@@ -31,12 +31,12 @@ namespace MoReFEM
* \brief Create all the instances read from the input parameter data of the type held by \a ManagerT.
*
* \code
* SetFromInputParameterData<DomainManager>(input_parameter_data, domain_manager);
* SetFromInputParameterData<DomainManager>(input_data, domain_manager);
* \endcode
*
* iterates through the entries of \a input_parameter_data and create all the domains encountered doing so.
* iterates through the entries of \a input_data and create all the domains encountered doing so.
*
* \copydoc doxygen_hide_input_parameter_data_arg
* \copydoc doxygen_hide_input_data_arg
* \copydoc doxygen_hide_cplusplus_variadic_args
* These variadic arguments are here transmitted to the Create() static method arguments, not to \a ManagerT
* constructor.
......@@ -50,7 +50,7 @@ namespace MoReFEM
class InputParameterDataT,
typename... Args
>
void SetFromInputParameterData(const InputParameterDataT& input_parameter_data,
void SetFromInputParameterData(const InputParameterDataT& input_data,
ManagerT& manager,
Args&&... args);
......
......@@ -27,7 +27,7 @@ namespace MoReFEM
class InputParameterDataT,
typename... Args
>
void SetFromInputParameterData(const InputParameterDataT& input_parameter_data,
void SetFromInputParameterData(const InputParameterDataT& input_data,
ManagerT& manager,
Args&&... args)
{
......@@ -47,7 +47,7 @@ namespace MoReFEM
>;
input_parameter_tuple_iteration
::template ActIfSection<typename ManagerT::input_parameter_type>(input_parameter_data.GetTuple(),
::template ActIfSection<typename ManagerT::input_parameter_type>(input_data.GetTuple(),
create);
}
......
......@@ -75,7 +75,7 @@ namespace MoReFEM
using const_unique_ptr = std::unique_ptr<self>;
//! Alias to \a InputParameterDataT.
using input_parameter_data_type = InputParameterDataT;
using input_data_type = InputParameterDataT;
/// \name Special members.
///@{
......@@ -125,7 +125,7 @@ namespace MoReFEM
Wrappers::Petsc::Petsc::const_unique_ptr petsc_ = nullptr;
//! Holds InputParameterList.
typename InputParameterDataT::const_unique_ptr input_parameter_data_ = nullptr;
typename InputParameterDataT::const_unique_ptr input_data_ = nullptr;
//! Result directory, in which all the outputs of MoReFEM should be written.
std::string result_directory_;
......
......@@ -166,14 +166,14 @@ namespace MoReFEM
}
// We can be here only if the file exists...
input_parameter_data_ = std::make_unique<InputParameterDataT>(input_parameter_file,
input_data_ = std::make_unique<InputParameterDataT>(input_parameter_file,
mpi,
DoTrackUnusedFieldsT);
namespace ipl = Utilities::InputParameterListNS;
using Result = InputParameter::Result;
result_directory_ = ipl::Extract<Result::OutputDirectory>::Folder(*input_parameter_data_);
result_directory_ = ipl::Extract<Result::OutputDirectory>::Folder(*input_data_);
if (!suppl_result_subdir.empty())
{
......@@ -217,7 +217,7 @@ namespace MoReFEM
assert(false && "No exception in destructors!");
}
input_parameter_data_ = nullptr;
input_data_ = nullptr;
mpi.Barrier(); // to better handle the possible MpiAbort() on one of the branch...
}
......@@ -246,8 +246,8 @@ namespace MoReFEM
>
const InputParameterDataT& MoReFEMData<InputParameterDataT, DoTrackUnusedFieldsT, AdditionalCommandLineArgumentsPolicyT>::GetInputParameterList() const
{
assert(!(!input_parameter_data_));
return *input_parameter_data_;
assert(!(!input_data_));
return *input_data_;
}
......
......@@ -34,7 +34,7 @@ namespace MoReFEM
*
*
* \copydetails doxygen_hide_mpi_param
* \copydoc doxygen_hide_input_parameter_data_arg
* \copydoc doxygen_hide_input_data_arg
* \param[in] snes_function If linear solve, just give nullptr. If non linear solve, give here the function
* evaluation routine. See Petsc documentation
* http://www.mcs.anl.gov/petsc/petsc-current/docs/manualpages/SNES/SNESSetFunction.html for more details.
......@@ -53,7 +53,7 @@ namespace MoReFEM
*/
template<unsigned int SolverIndexT, class InputParameterDataT>
Wrappers::Petsc::Snes::unique_ptr InitSolver(const Wrappers::Mpi& mpi,
const InputParameterDataT& input_parameter_data,
const InputParameterDataT& input_data,
Wrappers::Petsc::Snes::SNESFunction snes_function = nullptr,
Wrappers::Petsc::Snes::SNESJacobian snes_jacobian = nullptr,
Wrappers::Petsc::Snes::SNESViewer snes_viewer = nullptr,
......
......@@ -19,7 +19,7 @@ namespace MoReFEM
template<unsigned int SolverIndexT, class InputParameterDataT>
Wrappers::Petsc::Snes::unique_ptr InitSolver(const Wrappers::Mpi& mpi,
const InputParameterDataT& input_parameter_data,
const InputParameterDataT& input_data,
Wrappers::Petsc::Snes::SNESFunction snes_function,
Wrappers::Petsc::Snes::SNESJacobian snes_jacobian,
Wrappers::Petsc::Snes::SNESViewer snes_viewer,
......@@ -28,14 +28,14 @@ namespace MoReFEM
namespace ipl = Utilities::InputParameterListNS;
using ip_petsc = InputParameter::Petsc<SolverIndexT>;
decltype(auto) solver = ipl::Extract<typename ip_petsc::Solver>::Value(input_parameter_data);
const std::string& preconditioner = ipl::Extract<typename ip_petsc::Preconditioner>::Value(input_parameter_data);
decltype(auto) solver = ipl::Extract<typename ip_petsc::Solver>::Value(input_data);
const std::string& preconditioner = ipl::Extract<typename ip_petsc::Preconditioner>::Value(input_data);
const double absolute_tolerance = ipl::Extract<typename ip_petsc::AbsoluteTolerance>::Value(input_parameter_data);
const double relative_tolerance = ipl::Extract<typename ip_petsc::RelativeTolerance>::Value(input_parameter_data);
const double step_size_tolerance = ipl::Extract<typename ip_petsc::StepSizeTolerance>::Value(input_parameter_data);
const unsigned int gmres_restart = ipl::Extract<typename ip_petsc::GmresRestart>::Value(input_parameter_data);
const unsigned int max_iteration = ipl::Extract<typename ip_petsc::MaxIteration>::Value(input_parameter_data);
const double absolute_tolerance = ipl::Extract<typename ip_petsc::AbsoluteTolerance>::Value(input_data);
const double relative_tolerance = ipl::Extract<typename ip_petsc::RelativeTolerance>::Value(input_data);
const double step_size_tolerance = ipl::Extract<typename ip_petsc::StepSizeTolerance>::Value(input_data);
const unsigned int gmres_restart = ipl::Extract<typename ip_petsc::GmresRestart>::Value(input_data);
const unsigned int max_iteration = ipl::Extract<typename ip_petsc::MaxIteration>::Value(input_data);
return std::make_unique<Wrappers::Petsc::Snes>(mpi,
solver,
......
......@@ -51,10 +51,10 @@ namespace MoReFEM
/*!
* \brief Constructor.
*
* \copydoc doxygen_hide_input_parameter_data_arg
* \copydoc doxygen_hide_input_data_arg
*/
template<class InputParameterDataT>
explicit ConstantTimeStep(const InputParameterDataT& input_parameter_data);
explicit ConstantTimeStep(const InputParameterDataT& input_data);
//! Destructor.
~ConstantTimeStep() = default;
......
......@@ -26,14 +26,14 @@ namespace MoReFEM
template<class InputParameterDataT>
ConstantTimeStep::ConstantTimeStep(const InputParameterDataT& input_parameter_data)
ConstantTimeStep::ConstantTimeStep(const InputParameterDataT& input_data)
{
namespace IPL = Utilities::InputParameterListNS;
using TimeManager = InputParameter::TimeManager;
time_step_ = IPL::Extract<TimeManager::TimeStep>::Value(input_parameter_data);
maximum_time_ = IPL::Extract<TimeManager::TimeMax>::Value(input_parameter_data);
initial_time_ = IPL::Extract<TimeManager::TimeInit>::Value(input_parameter_data);
time_step_ = IPL::Extract<TimeManager::TimeStep>::Value(input_data);
maximum_time_ = IPL::Extract<TimeManager::TimeMax>::Value(input_data);
initial_time_ = IPL::Extract<TimeManager::TimeInit>::Value(input_data);
assert(time_step_ > 1.e-9 && "Should have been already checked when reading the input parameter data "
"hence the assert rather than an exception.");
......
......@@ -50,10 +50,10 @@ namespace MoReFEM
/*!
* \brief Constructor.
*
* \copydoc doxygen_hide_input_parameter_data_arg
* \copydoc doxygen_hide_input_data_arg
*/
template<class InputParameterDataT>
explicit VariableTimeStep(const InputParameterDataT& input_parameter_data);
explicit VariableTimeStep(const InputParameterDataT& input_data);
//! Destructor.
~VariableTimeStep() = default;
......
......@@ -26,16 +26,16 @@ namespace MoReFEM
template<class InputParameterDataT>
VariableTimeStep::VariableTimeStep(const InputParameterDataT& input_parameter_data)
VariableTimeStep::VariableTimeStep(const InputParameterDataT& input_data)
{
namespace IPL = Utilities::InputParameterListNS;
using TimeManager = InputParameter::TimeManager;
time_step_ = IPL::Extract<TimeManager::TimeStep>::Value(input_parameter_data);
maximum_time_ = IPL::Extract<TimeManager::TimeMax>::Value(input_parameter_data);
minimum_time_step_ = IPL::Extract<TimeManager::MinimumTimeStep>::Value(input_parameter_data);
time_step_ = IPL::Extract<TimeManager::TimeStep>::Value(input_data);
maximum_time_ = IPL::Extract<TimeManager::TimeMax>::Value(input_data);
minimum_time_step_ = IPL::Extract<TimeManager::MinimumTimeStep>::Value(input_data);
maximum_time_step_ = time_step_;
initial_time_ = IPL::Extract<TimeManager::TimeInit>::Value(input_parameter_data);
initial_time_ = IPL::Extract<TimeManager::TimeInit>::Value(input_data);
assert(time_step_ > 1.e-9);
}
......
......@@ -68,10 +68,10 @@ namespace MoReFEM
/*!
* \brief Constructor.
*
* \copydoc doxygen_hide_input_parameter_data_arg
* \copydoc doxygen_hide_input_data_arg
*/
template<class InputParameterDataT>
explicit TimeManager(const InputParameterDataT& input_parameter_data);
explicit TimeManager(const InputParameterDataT& input_data);
//! Destructor.
virtual ~TimeManager();
......
......@@ -18,12 +18,12 @@ namespace MoReFEM
template<class InputParameterDataT>
TimeManager::TimeManager(const InputParameterDataT& input_parameter_data)
TimeManager::TimeManager(const InputParameterDataT& input_data)
{
namespace IPL = Utilities::InputParameterListNS;
using TimeManager = InputParameter::TimeManager;
time_ = IPL::Extract<TimeManager::TimeInit>::Value(input_parameter_data);
time_ = IPL::Extract<TimeManager::TimeInit>::Value(input_data);
}
......
......@@ -49,10 +49,10 @@ namespace MoReFEM
/*!
* \brief Constructor.
*
* \copydoc doxygen_hide_input_parameter_data_arg
* \copydoc doxygen_hide_input_data_arg
*/
template<class InputParameterDataT>
explicit TimeManagerInstance(const InputParameterDataT& input_parameter_data);
explicit TimeManagerInstance(const InputParameterDataT& input_data);
//! Destructor.
~TimeManagerInstance() override = default;
......
......@@ -20,9 +20,9 @@ namespace MoReFEM
template<class EvolutionPolicyT>
template<class InputParameterDataT>
TimeManagerInstance<EvolutionPolicyT>::TimeManagerInstance(const InputParameterDataT& input_parameter_data)
: TimeManager(input_parameter_data),
EvolutionPolicyT(input_parameter_data)
TimeManagerInstance<EvolutionPolicyT>::TimeManagerInstance(const InputParameterDataT& input_data)
: TimeManager(input_data),
EvolutionPolicyT(input_data)
{ }
......
......@@ -144,13 +144,13 @@ namespace MoReFEM
* - Set the list of finite elements in each finite element space.
* - Set the list of nodes here.
*
* \copydoc doxygen_hide_input_parameter_data_arg
* \copydoc doxygen_hide_input_data_arg
* \param[in] felt_space_list List of all \a FEltSpace to consider in the \a GodOfDof.
* \copydetails doxygen_hide_do_consider_processor_wise_local_2_global
* \param[in] output_directory Output directory for data specific to the mesh covered by the \a GodOfDof.
*/
template<class InputParameterDataT>
void Init(const InputParameterDataT& input_parameter_data,
void Init(const InputParameterDataT& input_data,
FEltSpace::vector_unique_ptr&& felt_space_list,
DoConsiderProcessorWiseLocal2Global do_consider_processor_wise_local_2_global,
std::string&& output_directory);
......@@ -493,10 +493,10 @@ namespace MoReFEM
* processor-wise are performed. The typical example here is data required by non conform interpolator, which
* involves several GodOfDofs and can't therefore be handled solely by the clever Petsc mpi communications.
*
* \copydoc doxygen_hide_input_parameter_data_arg
* \copydoc doxygen_hide_input_data_arg
*/
template<class InputParameterDataT>
void Init2(const InputParameterDataT& input_parameter_data);
void Init2(const InputParameterDataT& input_data);
/*!
......
......@@ -19,7 +19,7 @@ namespace MoReFEM
template<class InputParameterDataT>
void GodOfDof::Init(const InputParameterDataT& input_parameter_data,
void GodOfDof::Init(const InputParameterDataT& input_data,
FEltSpace::vector_unique_ptr&& a_felt_space_list,
DoConsiderProcessorWiseLocal2Global do_consider_proc_wise_local_2_global,
std::string&& output_directory)
......@@ -29,17 +29,17 @@ namespace MoReFEM
std::map<unsigned int, std::vector<unsigned int>> dof_list_per_felt_space;
Init1(std::move(a_felt_space_list), dof_list_per_felt_space);
Init2(input_parameter_data);
Init2(input_data);
Init3(do_consider_proc_wise_local_2_global, dof_list_per_felt_space);
}
template<class InputParameterDataT>
void GodOfDof::Init2(const InputParameterDataT& input_parameter_data)
void GodOfDof::Init2(const InputParameterDataT& input_data)
{
auto& manager = Internal::FEltSpaceNS::DofProgramWiseIndexListPerVertexCoordIndexListManager
::CreateOrGetInstance(__FILE__, __LINE__);
Advanced::SetFromInputParameterData<>(input_parameter_data, manager, *this);
Advanced::SetFromInputParameterData<>(input_data, manager, *this);
}
......
......@@ -42,17 +42,17 @@ namespace MoReFEM
* \internal <b><tt>[internal]</tt></b> A factory function is used here due to the \a UniqueIdT template parameter: C++ grammar doesn't
* allow an explicit template parameter in a non-template class constructor.
*
* \copydoc doxygen_hide_input_parameter_data_arg
* \copydoc doxygen_hide_input_data_arg
*
* \tparam UniqueIdT Unique id of the finite element space from which the domain is extracted.
* This unique id is the one used in the input parameter file; it is for instance 5 for block tagged
* FiniteElementSpace5.
* \tparam InputParameterDataT Type of \a input_parameter_data.
* \tparam InputParameterDataT Type of \a input_data.
*
* \return The full fledged domain object. It must have been built beforehand by the Domain manager.
*/
template<unsigned int UniqueIdT, class InputParameterDataT>
Domain& ExtractDomain(const InputParameterDataT& input_parameter_data);
Domain& ExtractDomain(const InputParameterDataT& input_data);
/*!
......
......@@ -26,12 +26,12 @@ namespace MoReFEM
template<unsigned int UniqueIdT, class InputParameterDataT>
Domain& ExtractDomain(const InputParameterDataT& input_parameter_data)
Domain& ExtractDomain(const InputParameterDataT& input_data)
{
namespace IPL = Utilities::InputParameterListNS;
using FEltSpaceNS = InputParameter::FEltSpace<UniqueIdT>;
const auto domain_index = IPL::Extract<typename FEltSpaceNS::DomainIndex>::Value(input_parameter_data);
const auto domain_index = IPL::Extract<typename FEltSpaceNS::DomainIndex>::Value(input_data);
return DomainManager::GetInstance(__FILE__, __LINE__).GetNonCstDomain(domain_index);
}
......
......@@ -92,14 +92,14 @@ namespace MoReFEM
* \brief Set one of the operator if it is tagged as activated in the input parameter file.
*
* \param[in] name Name of the parameter (for outputs).
* \copydoc doxygen_hide_input_parameter_data_arg
* \copydoc doxygen_hide_input_data_arg
* \param[in] felt_space Finite element space upon which the operator is defined.
* \param[in] unknown_ptr Unknown considered for this operator (might be scalar or vectorial).
* \copydoc doxygen_hide_quadrature_rule_per_topology_nullptr_arg
*/
template<SourceType SourceTypeT, class T, class InputParameterDataT>
void SetIfTaggedAsActivated(T&& name,
const InputParameterDataT& input_parameter_data,
const InputParameterDataT& input_data,
const FEltSpace& felt_space,
const Unknown::const_shared_ptr unknown_ptr,
const QuadratureRulePerTopology* const quadrature_rule_per_topology = nullptr);
......
......@@ -32,7 +32,7 @@ namespace MoReFEM
template<SourceType SourceTypeT, class T, class InputParameterDataT>
void VolumicAndSurfacicSource<DerivedT, TypeT, VolumicIndexT, SurfacicIndexT, TimeDependencyT>
::SetIfTaggedAsActivated(T&& name,
const InputParameterDataT& input_parameter_data,
const InputParameterDataT& input_data,
const FEltSpace& felt_space,
const Unknown::const_shared_ptr unknown_ptr,
const QuadratureRulePerTopology* const quadrature_rule_per_topology)
......@@ -56,7 +56,7 @@ namespace MoReFEM
TimeDependencyT
>(std::forward<T>(name),
felt_space.GetDomain(),
input_parameter_data);
input_data);
if (parameter_ptr == nullptr)
return;
......
......@@ -44,7 +44,7 @@ namespace MoReFEM
* \param[in] nature One of the possible nature specified in the comment of the input parameter. Currently
* only 'constant' and 'lua_function'.
* \param[in] scalar_value Value to apply if \a nature is 'constant'; irrelevant otherwise.
* \copydoc doxygen_hide_input_parameter_data_arg
* \copydoc doxygen_hide_input_data_arg
*
* \return The \a InitialCondition object properly initialized.
*/
......@@ -55,7 +55,7 @@ namespace MoReFEM
>
InitialCondition<ParameterNS::Type::scalar>::unique_ptr
InitScalarInitialCondition(const Mesh& mesh,
const InputParameterDataT& input_parameter_data,
const InputParameterDataT& input_data,
const std::string& nature,
double scalar_value);
......
......@@ -42,7 +42,7 @@ namespace MoReFEM
*
* \param[in] mesh Mesh upon which the InitialCondition is applied. Initial condition
* might be requested at each of each \a Coords.
* \copydoc doxygen_hide_input_parameter_data_arg
* \copydoc doxygen_hide_input_data_arg
*
* Condition is actually splitted in three \a ScalarInitialCondition.
*
......@@ -56,7 +56,7 @@ namespace MoReFEM
>
InitialCondition<ParameterNS::Type::vector>::unique_ptr
InitThreeDimensionalInitialCondition(const Mesh& mesh,
const InputParameterDataT& input_parameter_data);
const InputParameterDataT& input_data);
} // namespace FormulationSolverNS
......
......@@ -28,14 +28,14 @@ namespace MoReFEM
template<class InitialConditionT, class InputParameterDataT>
InitialCondition<ParameterNS::Type::vector>::unique_ptr
InitThreeDimensionalInitialCondition(const Mesh& mesh,
const InputParameterDataT& input_parameter_data)
const InputParameterDataT& input_data)
{
namespace IPL = Utilities::InputParameterListNS;
using nature_type = typename InitialConditionT::Nature;
decltype(auto) nature_list =
IPL::Extract<nature_type>::Value(input_parameter_data);
IPL::Extract<nature_type>::Value(input_data);
if (nature_list.size() != 3)
throw Exception("Exactly three items were expected for " + nature_type::enclosing_section::GetFullName() + "::"
......@@ -59,7 +59,7 @@ namespace MoReFEM
using scalar_type = typename InitialConditionT::Scalar;
decltype(auto) component_value_list =
IPL::Extract<scalar_type>::Value(input_parameter_data);
IPL::Extract<scalar_type>::Value(input_data);
if (component_value_list.size() != 3)
throw Exception("Exactly three items were expected for " + scalar_type::enclosing_section::GetFullName() + "::"
......@@ -67,17 +67,17 @@ namespace MoReFEM
__FILE__, __LINE__);
auto&& component_x = InitScalarInitialCondition<typename InitialConditionT::LuaFunctionX>(mesh,
input_parameter_data,
input_data,
nature_list[0],
component_value_list[0]);
auto&& component_y = InitScalarInitialCondition<typename InitialConditionT::LuaFunctionY>(mesh,
input_parameter_data,
input_data,
nature_list[1],
component_value_list[1]);
auto&& component_z = InitScalarInitialCondition<typename InitialConditionT::LuaFunctionZ>(mesh,
input_parameter_data,
input_data,
nature_list[2],
component_value_list[2]);
......
......@@ -39,7 +39,7 @@
*
* \internal <b><tt>[internal]</tt></b> This method is called by base class method VariationalFormulation::Init().
*
* \copydoc doxygen_hide_input_parameter_data_arg
* \copydoc doxygen_hide_input_data_arg
*/
......
......@@ -92,7 +92,7 @@ namespace MoReFEM
*
* \tparam DerivedT Class which will inherit from this one through CRTP.
* DerivedT is expected to define the following methods (otherwise the compilation will fail):
* - void SupplInit(const InputParameterList& input_parameter_data) // where InputParameterList is defined within
* - void SupplInit(const InputParameterList& input_data) // where InputParameterList is defined within
* the model instance.
* - void AllocateMatricesAndVectors()
* - Wrappers::Petsc::Snes::SNESFunction ImplementSnesFunction() const
......@@ -504,7 +504,7 @@ namespace MoReFEM
*
* \tparam IndexT Input parameter that gives away the relevant informations is InputParameter::InitialCondition<IndexT>.
* \tparam InputParameterDataT Type of the structure that holds the model settings.
* \copydoc doxygen_hide_input_parameter_data_arg
* \copydoc doxygen_hide_input_data_arg
* \param[in] numbering_subset \a NumberingSubset related to the \a unknown in the \a felt_space.
* \param[in] felt_space \a FEltSpace onto which the vector is to be initialized.
* \param[in] unknown \a Unknown considered in the vector.
......@@ -513,7 +513,7 @@ namespace MoReFEM
//! \copydoc doxygen_hide_init_vector_system_solution
template<unsigned int IndexT, class InputParameterDataT>
void InitializeVectorSystemSolution(const InputParameterDataT& input_parameter_data,
void InitializeVectorSystemSolution(const InputParameterDataT& input_data,
const NumberingSubset& numbering_subset,
const Unknown& unknown,
const FEltSpace& felt_space);
......@@ -529,7 +529,7 @@ namespace MoReFEM
*
*/
template <unsigned int IndexT, class InputParameterDataT>
void InitializeVectorSystemSolution(const InputParameterDataT& input_parameter_data,
void InitializeVectorSystemSolution(const InputParameterDataT& input_data,
const NumberingSubset& numbering_subset,
const Unknown& unknown,
const FEltSpace& felt_space,
......
......@@ -57,12 +57,12 @@ namespace MoReFEM
>
template<class InputParameterDataT>
void VariationalFormulation<DerivedT, SolverIndexT>
::Init(const InputParameterDataT& input_parameter_data)
::Init(const InputParameterDataT& input_data)
{
auto& derived = static_cast<DerivedT&>(*this);
snes_ = InitSolver<SolverIndexT>(this->GetMpi(),
input_parameter_data,
input_data,
derived.ImplementSnesFunction(),
derived.ImplementSnesJacobian(),
derived.ImplementSnesViewer(),
......@@ -70,9 +70,9 @@ namespace MoReFEM
namespace IPL = Utilities::InputParameterListNS;
display_value_ = IPL::Extract<InputParameter::Result::DisplayValue>::Value(input_parameter_data);
display_value_ = IPL::Extract<InputParameter::Result::DisplayValue>::Value(input_data);
derived.AllocateMatricesAndVectors();
derived.SupplInit(input_parameter_data);
derived.SupplInit(input_data);
}
......@@ -602,7 +602,7 @@ namespace MoReFEM
>
template <unsigned int IndexT, class InputParameterDataT>
void VariationalFormulation<DerivedT, SolverIndexT>
::InitializeVectorSystemSolution(const InputParameterDataT& input_parameter_data,
::InitializeVectorSystemSolution(const InputParameterDataT& input_data,
const NumberingSubset& numbering_subset,
const Unknown& unknown,
const FEltSpace& felt_space)
......@@ -611,7 +611,7 @@ namespace MoReFEM
GlobalVector& system_solution = VariationalFormulation::GetNonCstSystemSolution(numbering_subset);
InitializeVectorSystemSolution<IndexT>(input_parameter_data,
InitializeVectorSystemSolution<IndexT>(input_data,
numbering_subset,
unknown,
felt_space,
......@@ -641,7 +641,7 @@ namespace MoReFEM
>
template <unsigned int IndexT, class InputParameterDataT>
void VariationalFormulation<DerivedT, SolverIndexT>
::InitializeVectorSystemSolution(const InputParameterDataT& input_parameter_data,
::InitializeVectorSystemSolution(const InputParameterDataT& input_data,
const NumberingSubset& numbering_subset,
const Unknown& unknown,
const FEltSpace& felt_space,
......@@ -654,7 +654,7 @@ namespace MoReFEM
auto initial_condition_ptr =
Internal::FormulationSolverNS::InitThreeDimensionalInitialCondition<initial_condition_type>(mesh,
input_parameter_data);
input_data);
// Nullptr sign the case initial condition should be ignored.
if (!initial_condition_ptr)
......
......@@ -84,10 +84,10 @@ namespace MoReFEM
/*!
* \brief Constructor from an input parameter file.
*
* \copydoc doxygen_hide_input_parameter_data_arg
* \copydoc doxygen_hide_input_data_arg
*/
template<class InputParameterDataT>
explicit VertexMatching(const InputParameterDataT& input_parameter_data);
explicit VertexMatching(const InputParameterDataT& input_data);
//! Destructor.
~VertexMatching() = default;
......
......@@ -26,10 +26,10 @@ namespace MoReFEM
template<class InputParameterDataT>
VertexMatching::VertexMatching(const InputParameterDataT& input_parameter_data)
VertexMatching::VertexMatching(const InputParameterDataT& input_data)
{
decltype(auto) interpolation_file =
Utilities::InputParameterListNS::Extract<InputParameter::InterpolationFile>::Path(input_parameter_data);
Utilities::InputParameterListNS::Extract<InputParameter::InterpolationFile>::Path(input_data);
Read(interpolation_file);
}
......
......@@ -36,14 +36,14 @@ namespace MoReFEM