Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
77
Issue boards
Milestones
Wiki
Code
Merge requests
77
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dumux-repositories
dumux
Merge requests
!894
[mpnc][test] Rename class PureWaterSimpleFluidSystem to CombustionFluidsystem
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
[mpnc][test] Rename class PureWaterSimpleFluidSystem to CombustionFluidsystem
cleanup/rename-purewatersimple
into
master
Overview
0
Commits
1
Pipelines
0
Changes
2
Merged
Kilian Weishaupt
requested to merge
cleanup/rename-purewatersimple
into
master
6 years ago
Overview
0
Commits
1
Pipelines
0
Changes
2
Expand
👍
0
👎
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
26909890
1 commit,
6 years ago
2 files
+
5
−
5
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh
+
4
−
4
Options
@@ -19,7 +19,7 @@
/*!
* \file
* \ingroup Fluidsystems
* \brief @copybrief Dumux::FluidSystems::
PureWaterSimple
Fluid
S
ystem
* \brief @copybrief Dumux::FluidSystems::
Combustion
Fluid
s
ystem
*/
#ifndef DUMUX_PURE_WATER_FLUID_SYSTEM_HH
#define DUMUX_PURE_WATER_FLUID_SYSTEM_HH
@@ -46,10 +46,10 @@ namespace FluidSystems {
* Values are taken from Shi & Wang, A numerical investigation of transpiration cooling with liquid coolant phase change, Transport in Porous Media, 2011
*/
template
<
class
Scalar
,
bool
useComplexRelations
=
false
>
class
PureWaterSimple
Fluid
S
ystem
:
public
BaseFluidSystem
<
Scalar
,
PureWaterSimple
Fluid
S
ystem
<
Scalar
,
useComplexRelations
>
>
class
Combustion
Fluid
s
ystem
:
public
BaseFluidSystem
<
Scalar
,
Combustion
Fluid
s
ystem
<
Scalar
,
useComplexRelations
>
>
{
using
ThisType
=
PureWaterSimple
Fluid
S
ystem
<
Scalar
,
useComplexRelations
>
;
using
ThisType
=
Combustion
Fluid
s
ystem
<
Scalar
,
useComplexRelations
>
;
using
Base
=
BaseFluidSystem
<
Scalar
,
ThisType
>
;
// convenience using declarations
Loading