Commit a2d45a19 authored by Dmitry Yu. Naumov's avatar Dmitry Yu. Naumov
Browse files

Merge branch 'cleanup' into 'master'

[PL/CT | CL] cleanups: remove unused member functions.

See merge request !4117
parents 06207a92 4d7922e3
Pipeline #10008 failed with stages
in 238 minutes and 8 seconds
......@@ -65,8 +65,6 @@ public:
virtual void executeSpeciationCalculation(double const dt) = 0;
virtual std::vector<GlobalVector*> getIntPtProcessSolutions() const = 0;
virtual double getConcentration(
int const /*component_id*/,
GlobalIndexType const /*chemical_system_id*/) const
......
......@@ -406,22 +406,6 @@ void PhreeqcIO::executeSpeciationCalculation(double const dt)
readOutputsFromFile();
}
std::vector<GlobalVector*> PhreeqcIO::getIntPtProcessSolutions() const
{
auto const& aqueous_solution = _chemical_system->aqueous_solution;
std::vector<GlobalVector*> int_pt_process_solutions;
int_pt_process_solutions.reserve(aqueous_solution->components.size() + 1);
std::transform(aqueous_solution->components.begin(),
aqueous_solution->components.end(),
std::back_inserter(int_pt_process_solutions),
[](auto const& c) { return c.amount.get(); });
int_pt_process_solutions.push_back(aqueous_solution->pH.get());
return int_pt_process_solutions;
}
double PhreeqcIO::getConcentration(
int const component_id, GlobalIndexType const chemical_system_id) const
{
......
......@@ -67,8 +67,6 @@ public:
void executeSpeciationCalculation(double const dt) override;
std::vector<GlobalVector*> getIntPtProcessSolutions() const override;
double getConcentration(
int const component_id,
GlobalIndexType const chemical_system_id) const override;
......
......@@ -48,11 +48,6 @@ public:
void callPhreeqc(std::vector<GlobalVector*>& process_solutions);
std::vector<GlobalVector*> getIntPtProcessSolutions() const override
{
return {};
}
void updateNodalProcessSolutions(
std::vector<GlobalVector*> const& process_solutions,
std::size_t const node_id);
......
......@@ -1562,21 +1562,6 @@ public:
return flux;
}
std::vector<double> interpolateNodalValuesToIntegrationPoints(
std::vector<double> const& local_x) override
{
unsigned const n_integration_points =
_integration_method.getNumberOfPoints();
std::vector<double> interpolated_values(n_integration_points);
for (unsigned ip(0); ip < n_integration_points; ++ip)
{
NumLib::shapeFunctionInterpolate(local_x, _ip_data[ip].N,
interpolated_values[ip]);
}
return interpolated_values;
}
void computeSecondaryVariableConcrete(
double const t,
double const /*dt*/,
......
......@@ -99,12 +99,6 @@ public:
bool const use_monolithic_scheme,
int const process_id);
virtual std::vector<double> interpolateNodalValuesToIntegrationPoints(
std::vector<double> const& /*local_x*/)
{
return {};
}
/// Computes the flux in the point \c p_local_coords that is given in local
/// coordinates using the values from \c local_x.
/// Fits to monolithic scheme.
......
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