MAJ terminée. Nous sommes passés en version 14.6.2 . Pour consulter les "releases notes" associées c'est ici :

https://about.gitlab.com/releases/2022/01/11/security-release-gitlab-14-6-2-released/
https://about.gitlab.com/releases/2022/01/04/gitlab-14-6-1-released/

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

#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);
}
......
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