Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux
Commits
017e443b
Commit
017e443b
authored
May 11, 2022
by
Yue Wang
Committed by
Timo Koch
May 12, 2022
Browse files
[el2p] reuse CO2 table
parent
f51406bd
Pipeline
#16505
passed with stages
Changes
3
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
test/multidomain/poromechanics/el2p/co2tables_el2p.hh
deleted
100644 → 0
View file @
f51406bd
// -*- 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 3 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 <http://www.gnu.org/licenses/>. *
*****************************************************************************/
/*!
* \file
* \ingroup PoromechanicsTests
* \brief Provides the class with the tabulated values of CO2
*/
#ifndef DUMUX_EL2P_CO2TABLES_HH
#define DUMUX_EL2P_CO2TABLES_HH
#include
<cassert>
#include
<dumux/material/components/co2tablereader.hh>
namespace
Dumux
{
namespace
El2P
{
// Class providing the tabulated values of CO2 for density and enthalpy
// the real work is done by some external program which provides
// ready-to-use tables.
#ifndef DOXYGEN // hide tables from doxygen
#include
"co2values.inc"
#endif
}
// end namespace El2P
}
// end namespace Dumux
#endif
test/multidomain/poromechanics/el2p/co2values.inc
deleted
100644 → 0
View file @
f51406bd
This diff is collapsed.
Click to expand it.
test/multidomain/poromechanics/el2p/properties.hh
View file @
017e443b
...
...
@@ -46,7 +46,7 @@
#include
"problem_2p.hh"
#include
"problem_poroelastic.hh"
#include
"co2tables
_el2p
.hh"
#include
"
test/porousmediumflow/co2/
co2tables.hh"
namespace
Dumux
::
Properties
{
...
...
@@ -60,7 +60,7 @@ template<class TypeTag>
struct
FluidSystem
<
TypeTag
,
TTag
::
TwoPSub
>
{
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
type
=
FluidSystems
::
BrineCO2
<
Scalar
,
El2P
::
CO2Tables
>
;
using
type
=
FluidSystems
::
BrineCO2
<
Scalar
,
GeneratedCO2Tables
::
CO2Tables
>
;
};
// Set the grid type
...
...
@@ -95,7 +95,7 @@ template<class TypeTag>
struct
FluidSystem
<
TypeTag
,
TTag
::
PoroElasticSub
>
{
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
type
=
FluidSystems
::
BrineCO2
<
Scalar
,
El2P
::
CO2Tables
>
;
using
type
=
FluidSystems
::
BrineCO2
<
Scalar
,
GeneratedCO2Tables
::
CO2Tables
>
;
};
// The spatial parameters property
...
...
Timo Koch
@timok
mentioned in commit
688ebcc8
·
May 13, 2022
mentioned in commit
688ebcc8
mentioned in commit 688ebcc8b2f1bfb350b32f761fcfca08f44539b9
Toggle commit list
Timo Koch
@timok
mentioned in merge request
!3115 (merged)
·
May 13, 2022
mentioned in merge request
!3115 (merged)
mentioned in merge request !3115
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment