Commit b93099c9 authored by Martin Schneider's avatar Martin Schneider
Browse files

[md][ffpm][1ptest] Update test according to new slip condition

parent 74652a34
......@@ -27,6 +27,7 @@ OutputName = test_md_boundary_stokes1p_darcy1p_bj
EnableGravity = false
EnableInertiaTerms = false
TestCase = BJSymmetrized
SlipCondition = BJ
[Vtk]
AddVelocity = 1
......
......@@ -34,6 +34,7 @@ EnableGravity = false
EnableInertiaTerms = false
NewIc = true
TestCase = NewICNonSymmetrized
SlipCondition = ER
[Stokes.FreeFlow]
EnableUnsymmetrizedVelocityGradientForIC = true
......
......@@ -244,7 +244,7 @@ public:
/*!
* \brief Returns the velocity in the porous medium (which is 0 by default according to Saffmann).
*/
VelocityVector porousMediumVelocity(const Element& element, const SubControlVolumeFace& scvf) const
VelocityVector porousMediumTerm(const Element& element, const SubControlVolumeFace& scvf) const
{
return couplingManager().couplingData().porousMediumVelocity(element, scvf);
}
......
add_input_file_links()
dune_symlink_to_source_files(FILES "convergencetest.py")
add_executable(test_md_boundary_darcy1p_freeflow1p_convtest EXCLUDE_FROM_ALL main.cc)
dumux_add_test(NAME test_md_boundary_darcy1p_stokes1p_convtest
TARGET test_md_boundary_darcy1p_freeflow1p_convtest
dune_add_test(NAME test_md_boundary_darcy1ptpfa_stokes1p_convtest
SOURCES main.cc
COMPILE_DEFINITIONS DARCYTYPETAG=DarcyOnePCC
LABELS multidomain multidomain_boundary stokesdarcy
TIMEOUT 1000
CMAKE_GUARD HAVE_UMFPACK
COMMAND ./convergencetest.py
CMD_ARGS test_md_boundary_darcy1p_freeflow1p_convtest params.input
-Problem.TestCase ShiueExampleTwo
-Darcy.SpatialParams.Permeability 1.0)
CMD_ARGS test_md_boundary_darcy1ptpfa_stokes1p_convtest params.input)
dumux_add_test(NAME test_md_boundary_darcy1p_navierstokes1p_convtest
TARGET test_md_boundary_darcy1p_freeflow1p_convtest
dune_add_test(NAME test_md_boundary_darcy1pbox_stokes1p_convtest
SOURCES main.cc
COMPILE_DEFINITIONS DARCYTYPETAG=DarcyOnePBox
LABELS multidomain multidomain_boundary stokesdarcy
TIMEOUT 1000
CMAKE_GUARD HAVE_UMFPACK
COMMAND ./convergencetest.py
CMD_ARGS test_md_boundary_darcy1p_freeflow1p_convtest params.input
-Problem.TestCase Schneider
-FreeFlow.Problem.EnableInertiaTerms true
-FreeFlow.EnableUnsymmetrizedVelocityGradientForBeaversJoseph true)
CMD_ARGS test_md_boundary_darcy1pbox_stokes1p_convtest params.input)
......@@ -45,7 +45,9 @@ namespace Dumux::Properties {
// Create new type tags
namespace TTag {
struct DarcyOneP { using InheritsFrom = std::tuple<OneP, CCTpfaModel>; };
struct DarcyOneP { using InheritsFrom = std::tuple<OneP>; };
struct DarcyOnePBox { using InheritsFrom = std::tuple<DarcyOneP, BoxModel>; };
struct DarcyOnePCC { using InheritsFrom = std::tuple<DarcyOneP, CCTpfaModel>; };
} // end namespace TTag
// Set the problem property
......@@ -103,12 +105,12 @@ struct EnableGridVolumeVariablesCache<TypeTag, TTag::FreeFlowOneP> { static cons
template<class TypeTag>
struct CouplingManager<TypeTag, TTag::FreeFlowOneP>
{
using Traits = StaggeredMultiDomainTraits<TypeTag, TypeTag, Properties::TTag::DarcyOneP>;
using Traits = StaggeredMultiDomainTraits<TypeTag, TypeTag, Properties::TTag::DARCYTYPETAG>;
using type = Dumux::StokesDarcyCouplingManager<Traits>;
};
template<class TypeTag>
struct CouplingManager<TypeTag, TTag::DarcyOneP>
struct CouplingManager<TypeTag, TTag::DARCYTYPETAG>
{
using Traits = StaggeredMultiDomainTraits<Properties::TTag::FreeFlowOneP, Properties::TTag::FreeFlowOneP, TypeTag>;
using type = Dumux::StokesDarcyCouplingManager<Traits>;
......
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