[Test] Fix solute parameters const correctness and test functions

parent efeef535
......@@ -82,7 +82,7 @@ public:
for (int j = 0; j < Traits::dim; ++j) {
D[i][j] = 0.;
if (Dune::FloatCmp::gt(v_abs,0.)) {
D[i][j] += difference*water_flux.value[i]*water_flux.value[j]/v_abs; // !!!
D[i][j] += difference*water_flux.value[i]*water_flux.value[j]/(v_abs*water_content.value); // !!!
if (i==j)
D[i][j] += lambda_t.value * v_abs/water_content.value;
}
......@@ -117,7 +117,7 @@ public:
std::unique_ptr<EffectiveHydromechanicDispersion<Traits>> clone () const override
{
using ThisType = IsotropicEffectiveHydromechanicDispersion<Traits>;
return std::make_unique<ThisType>(*this);
return std::make_unique<ThisType>(this->get_name(),_long_disp->clone(),_trans_disp->clone());
}
};
......
......@@ -84,7 +84,7 @@ public:
std::unique_ptr<HydrodynamicDispersion<Traits>> clone () const override
{
using ThisType = HydrodynamicDispersionSuperposition<Traits>;
return std::make_unique<ThisType>(*this);
return std::make_unique<ThisType>(this->get_name(),_eff_diff->clone(),_eff_hyrm_disp->clone());
}
};
......
......@@ -113,7 +113,7 @@ public:
virtual std::unique_ptr<Transport<Traits>> clone () const
{
using ThisType = Transport<Traits>;
return std::make_unique<ThisType>(*this);
return std::make_unique<ThisType>(this->get_name(),_peclet->clone(),_hyrd_disp->clone());
}
private:
const std::string _name;
......
......@@ -84,6 +84,11 @@ public:
};
}
std::unique_ptr<Peclet<Traits>> clone () const
{
using ThisType = Peclet<Traits>;
return std::make_unique<ThisType>(*this);
}
private:
const std::string _name;
......
......@@ -121,7 +121,7 @@ struct TransportParameterizationFactory
hd_dips = std::make_shared<Parameterization::HydrodynamicDispersionSuperposition<Traits>>(name,eff_diff,eff_hm_disp);
} else {
DUNE_THROW(NotImplemented,"Invalid hydrodyn_disp");
DUNE_THROW(NotImplemented,"Invalid hydrodyn_disp" );
}
return std::make_shared<Dorie::Parameterization::Transport<Traits>>(name,peclet,hd_dips);
}
......
This diff is collapsed.
......@@ -12,12 +12,12 @@ volumes:
material_1:
index: 1
transport:
type: sthor
type: power_law
parameters:
char_length: 1.5E-11
mol_diff: 2.E-9
gamma_st: 0.8
alpha_st: 1.17
gamma: 0.8
alpha: 1.17
material_2:
index: 2
......
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