Commit a8a230c4 authored by Lukas Riedel's avatar Lukas Riedel 📝

Remove BC options "evaporation" and "limitedInflux"

* remove options from input scheme
* remove options in Richards LOP
* remove grid view from LOP constructor arguments
* remove BC type cache from LOP
parent fbb7f2fa
......@@ -120,7 +120,7 @@ namespace Dorie{
/*-----------------------------------------------------------------------*//**
* @brief Read necessary parameters. Then read out BC data file
* with rectangular boundary decomposition.
*
*
* @throws Dune::IOError BC File path not specified
*
* @param[in] config The configuration
......@@ -643,19 +643,6 @@ namespace Dorie{
bcData[i][j].headValue.push_back(stod(buffer));
bcData[i][j].fluxValue.push_back(0.0);
}
else if(buffer == "limited_influx"){
bcData[i][j].type.push_back(BoundaryCondition::LimitedInFlux);
instream >> buffer;
bcData[i][j].fluxValue.push_back(stod(buffer));
bcData[i][j].headValue.push_back(0.0);
}
else if(buffer == "evaporation"){
bcData[i][j].type.push_back(BoundaryCondition::Evaporation);
instream >> buffer;
bcData[i][j].fluxValue.push_back(stod(buffer));
instream >> buffer;
bcData[i][j].headValue.push_back(stod(buffer));
}
else
DUNE_THROW(IOError,"In BC file line " + std::to_string(counter) + ": BC side "
+ std::to_string(i) + ": BC declaration " + std::to_string(j+1) + ": BC type unknown!");
......@@ -821,11 +808,6 @@ namespace Dorie{
std::cout << "neumann : ";
else if(bcData[i][j].type[k]==BoundaryCondition::Dirichlet)
std::cout << "dirichlet : ";
else if(bcData[i][j].type[k]==BoundaryCondition::LimitedInFlux)
std::cout << "limited_influx : ";
else if(bcData[i][j].type[k]==BoundaryCondition::Evaporation)
std::cout << "evaporation : ";
std::cout << bcData[i][j].fluxValue[k] << " , " << bcData[i][j].headValue[k] << std::endl;
}
index++;
}
......
......@@ -13,8 +13,6 @@ namespace Dune{
enum Type {
Neumann, //!< Fixed flux at boundary
Dirichlet, //!< Fixed matric head at boundary
Evaporation, //!< Special BC which switches between Neumann and Dirichlet depending on the water content
LimitedInFlux, //!< Special Neumann BC which stops infiltration into saturated medium
Other //!< UNUSED
};
......@@ -28,16 +26,6 @@ namespace Dune{
{
return (i == Neumann);
}
//! Test for Limited Flux boundary condition
static bool isLimitedInFlux (Type i)
{
return (i == LimitedInFlux);
}
//! Test for Evaporation boundary condition
static bool isEvaporation (Type i)
{
return (i == Evaporation);
}
//! UNUSED: Test for other(?) boundary condition
static bool isOther (Type i)
{
......
This diff is collapsed.
......@@ -49,13 +49,13 @@ RichardsSimulation<Traits>::RichardsSimulation (
const auto upwinding = std::get<OP::RichardsDGUpwinding::Type>(settings);
const auto weights = std::get<OP::RichardsDGWeights::Type>(settings);
slop = std::make_unique<SLOP>(inifile, *fparam, gv, *fboundary, *fsource,
slop = std::make_unique<SLOP>(inifile, *fparam, *fboundary, *fsource,
method, upwinding, weights);
#else
slop = std::make_unique<SLOP>(inifile, *fparam, gv, *fboundary, *fsource);
slop = std::make_unique<SLOP>(inifile, *fparam, *fboundary, *fsource);
#endif // EXPERIMENTAL_DG_FEATURES
tlop = std::make_unique<TLOP>(inifile, *fparam, gv);
tlop = std::make_unique<TLOP>(inifile, *fparam);
controller = std::make_unique<CalculationController>(
inifile, *fboundary, this->_log);
......
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