Skip to content
Permalink
Browse files

md changes due to rebase mistakes.

  • Loading branch information...
TomFischer committed Jun 5, 2019
1 parent e52488c commit 9a2a0c5d5c84ac0a1be336d98311126c5f2d4709
@@ -13,7 +13,7 @@

#include "BaseLib/Error.h"
#include "MaterialLib/PorousMedium/Permeability/Permeability.h"
#include "ProcessLib/Parameter/Parameter.h"
#include "ParameterLib/Parameter.h"

namespace MaterialLib
{
@@ -26,7 +26,7 @@ class DupuitPermeability final : public Permeability
{
public:
explicit DupuitPermeability(
ProcessLib::Parameter<double> const& permeability_parameter,
ParameterLib::Parameter<double> const& permeability_parameter,
int const dimension)
: Permeability(permeability_parameter, dimension)
{
@@ -43,7 +43,7 @@ class DupuitPermeability final : public Permeability
*/
Eigen::MatrixXd const& getValue(
const double t,
ProcessLib::SpatialPosition const& pos,
ParameterLib::SpatialPosition const& pos,
const double variable,
const double temperature) const override
{
@@ -59,7 +59,8 @@ std::unique_ptr<Permeability> createPermeabilityModel(

if (type == "Dupuit")
{
auto const& permeability_parameter = ProcessLib::findParameter<double>(
auto const& permeability_parameter = ParameterLib::findParameter<
double>(
config,
//! \ogs_file_param_special{material__porous_medium__permeability__permeability_tensor_entries}
"permeability_tensor_entries", parameters, 0);
@@ -74,7 +74,7 @@ void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
unsigned const n_integration_points =
_integration_method.getNumberOfPoints();

SpatialPosition pos;
ParameterLib::SpatialPosition pos;
pos.setElementID(_element.getID());

// TODO: The following two variables should be calculated inside the
@@ -164,7 +164,7 @@ void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
const int material_id,
const double t,
std::vector<double> const& local_x,
SpatialPosition const& pos,
ParameterLib::SpatialPosition const& pos,
MatrixOfVelocityAtIntegrationPoints& darcy_velocity_at_ips) const
{
auto const local_matrix_size = local_x.size();
@@ -211,7 +211,7 @@ class LiquidFlowLocalAssembler : public LiquidFlowLocalAssemblerInterface
const int material_id,
const double t,
std::vector<double> const& local_x,
SpatialPosition const& pos,
ParameterLib::SpatialPosition const& pos,
MatrixOfVelocityAtIntegrationPoints& darcy_velocity_at_ips) const;

const int _gravitational_axis_id;
@@ -96,8 +96,9 @@ double LiquidFlowMaterialProperties::getMassCoefficient(
}

Eigen::MatrixXd const& LiquidFlowMaterialProperties::getPermeability(
const int material_id, const double t, const SpatialPosition& pos,
const int /*dim*/, double const p, double const T) const
const int material_id, const double t,
const ParameterLib::SpatialPosition& pos, const int /*dim*/, double const p,
double const T) const
{
return _intrinsic_permeability_models[material_id]->getValue(t, pos, p, T);
}

0 comments on commit 9a2a0c5

Please sign in to comment.
You can’t perform that action at this time.