Commit 9e11f5f8 by Maziar Veyskarami Committed by Ned Coltman

parent deee05d9
 ... ... @@ -23,6 +23,8 @@ #ifndef DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH #define DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH // TODO: dumux-course-task 3.A // Include headers for turbulence problem (rans) here. #include #include ... ...
 ... ... @@ -23,67 +23,15 @@ #ifndef DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH #define DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH #include #include #include #include #if EXNUMBER >= 1 #include #include #else #include #include #endif namespace Dumux { template class FreeFlowSubProblem; namespace Properties { // Create new type tags namespace TTag { #if EXNUMBER >= 1 struct StokesZeroEq { using InheritsFrom = std::tuple; }; #else struct StokesZeroEq { using InheritsFrom = std::tuple; }; #endif } // end namespace TTag #include // Set the grid type template struct Grid { using type = Dune::YaspGrid<2, Dune::TensorProductCoordinates, 2> >; }; // The fluid system template struct FluidSystem { using H2OAir = FluidSystems::H2OAir>; static constexpr auto phaseIdx = H2OAir::gasPhaseIdx; // simulate the air phase using type = FluidSystems::OnePAdapter; }; template struct ReplaceCompEqIdx { static constexpr int value = 3; }; // Use formulation based on mass fractions template struct UseMoles { static constexpr bool value = true; }; // Set the problem property template struct Problem { using type = Dumux::FreeFlowSubProblem ; }; template struct EnableGridGeometryCache { static constexpr bool value = true; }; template struct EnableGridFluxVariablesCache { static constexpr bool value = true; }; template struct EnableGridVolumeVariablesCache { static constexpr bool value = true; }; } namespace Dumux { /*! * \brief The free-flow sub problem ... ... @@ -418,6 +366,7 @@ private: DiffusionCoefficientAveragingType diffCoeffAvgType_; }; } //end namespace #endif // DUMUX_STOKES1P2C_SUBPROBLEM_HH } //end namespace Dumux #endif // DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
 ... ... @@ -49,28 +49,7 @@ #include #include "porousmediumsubproblem.hh" #include "freeflowsubproblem.hh" namespace Dumux { namespace Properties { template struct CouplingManager { using Traits = StaggeredMultiDomainTraits; using type = Dumux::StokesDarcyCouplingManager; }; template struct CouplingManager { using Traits = StaggeredMultiDomainTraits; using type = Dumux::StokesDarcyCouplingManager; }; } // end namespace Properties } // end namespace Dumux #include "properties.hh" int main(int argc, char** argv) try { ... ...
 ... ... @@ -24,59 +24,10 @@ #ifndef DUMUX_DARCY2P2C_SUBPROBLEM_HH #define DUMUX_DARCY2P2C_SUBPROBLEM_HH #include #include #include #include #include #include #include "../2pspatialparams.hh" namespace Dumux { template class PorousMediumSubProblem; namespace Properties { // Create new type tags namespace TTag { struct DarcyTwoPTwoCNI { using InheritsFrom = std::tuple; }; } // end namespace TTag // Set the problem property template struct Problem { using type = Dumux::PorousMediumSubProblem; }; // the fluid system template struct FluidSystem { using type = FluidSystems::H2OAir>; }; //! Set the default formulation to pw-Sn: This can be over written in the problem. template struct Formulation { static constexpr auto value = TwoPFormulation::p1s0; }; // The gas component balance (air) is replaced by the total mass balance template struct ReplaceCompEqIdx { static constexpr int value = 3; }; // Set the grid type template struct Grid { using type = Dune::YaspGrid<2, Dune::TensorProductCoordinates, 2> >; }; template struct UseMoles { static constexpr bool value = true; }; template struct SpatialParams { using type = TwoPSpatialParams, GetPropType>; }; } // end namespace Properties namespace Dumux { /*! * \brief The porous medium sub problem ... ... @@ -335,6 +286,6 @@ private: std::shared_ptr couplingManager_; DiffusionCoefficientAveragingType diffCoeffAvgType_; }; } //end namespace } //end namespace Dumux #endif //DUMUX_DARCY2P2C_SUBPROBLEM_HH
 // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: /***************************************************************************** * See the file COPYING for full copying permissions. * * * * This program is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program. If not, see . * *****************************************************************************/ /*! * \file * * \brief The coupled exercise properties file or the turbulent case. */ #ifndef DUMUX_EXERCISE_COUPLING_TURBULENCE_PROPERTIES_HH #define DUMUX_EXERCISE_COUPLING_TURBULENCE_PROPERTIES_HH // Both domains #include #include #include // Porous medium flow domain #include #include #include "../2pspatialparams.hh" #include"porousmediumsubproblem.hh" // Free-flow domain #include #if EXNUMBER >= 1 #include #else #include #endif #include"freeflowsubproblem.hh" namespace Dumux::Properties { // Create new type tags namespace TTag { struct DarcyTwoPTwoCNI { using InheritsFrom = std::tuple; }; #if EXNUMBER >= 1 struct StokesZeroEq { using InheritsFrom = std::tuple; }; #else struct StokesZeroEq { using InheritsFrom = std::tuple; }; #endif } // end namespace TTag // Set the coupling manager template struct CouplingManager { using Traits = StaggeredMultiDomainTraits; using type = Dumux::StokesDarcyCouplingManager; }; template struct CouplingManager { using Traits = StaggeredMultiDomainTraits; using type = Dumux::StokesDarcyCouplingManager; }; // Set the problem property template struct Problem { using type = Dumux::FreeFlowSubProblem ; }; template struct Problem { using type = Dumux::PorousMediumSubProblem; }; // Set the grid type template struct Grid { using type = Dune::YaspGrid<2, Dune::TensorProductCoordinates, 2> >; }; template struct Grid { using type = Dune::YaspGrid<2, Dune::TensorProductCoordinates, 2> >; }; // The fluid system template struct FluidSystem { using H2OAir = FluidSystems::H2OAir>; static constexpr auto phaseIdx = H2OAir::gasPhaseIdx; // simulate the air phase using type = FluidSystems::OnePAdapter; }; template struct FluidSystem { using type = FluidSystems::H2OAir>; }; // The gas component balance (air) is replaced by the total mass balance template struct ReplaceCompEqIdx { static constexpr int value = 3; }; template struct ReplaceCompEqIdx { static constexpr int value = 3; }; // Use formulation based on mass fractions template struct UseMoles { static constexpr bool value = true; }; template struct UseMoles { static constexpr bool value = true; }; //! Set the default formulation to pw-Sn: This can be over written in the problem. template struct Formulation { static constexpr auto value = TwoPFormulation::p1s0; }; template struct SpatialParams { using type = TwoPSpatialParams, GetPropType>; }; template struct EnableGridGeometryCache { static constexpr bool value = true; }; template struct EnableGridFluxVariablesCache { static constexpr bool value = true; }; template struct EnableGridVolumeVariablesCache { static constexpr bool value = true; }; } //end namespace Dumux::Properties #endif // DUMUX_EXERCISE_COUPLING_TURBULENCE_PROPERTIES_HH
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