Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
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
Commits
3c146d45
Commit
3c146d45
authored
7 years ago
by
Gabi Seitz
Browse files
Options
Downloads
Patches
Plain Diff
[1pncmin] adjust the 1pncmin properties
to removing the 1pnc-newton controller
parent
670cea53
No related branches found
No related tags found
2 merge requests
!617
[WIP] Next
,
!565
Transfer 1pncmin to next
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/porousmediumflow/1pncmin/implicit/propertydefaults.hh
+0
-15
0 additions, 15 deletions
dumux/porousmediumflow/1pncmin/implicit/propertydefaults.hh
with
0 additions
and
15 deletions
dumux/porousmediumflow/1pncmin/implicit/propertydefaults.hh
+
0
−
15
View file @
3c146d45
...
...
@@ -34,7 +34,6 @@
#include
"properties.hh"
#include
<dumux/porousmediumflow/nonisothermal/implicit/propertydefaults.hh>
#include
<dumux/porousmediumflow/1pnc/implicit/newtoncontroller.hh>
#include
<dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
#include
<dumux/material/spatialparams/implicit1p.hh>
#include
<dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
...
...
@@ -81,7 +80,6 @@ private:
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
PTAG
(
FluidSystem
))
FluidSystem
;
public:
// static const int value = FluidSystem::numComponents + FluidSystem::numSPhases;
static
const
int
value
=
FluidSystem
::
numComponents
+
FluidSystem
::
numSComponents
;
//steamaircao2h2 has 2 components in the fluidphase
};
...
...
@@ -110,19 +108,9 @@ SET_TYPE_PROP(OnePNCMin, Model, OnePNCMinModel<TypeTag>);
//! the VolumeVariables property
SET_TYPE_PROP
(
OnePNCMin
,
VolumeVariables
,
OnePNCMinVolumeVariables
<
TypeTag
>
);
//! the FluxVariables property
// SET_TYPE_PROP(OnePNCMin, FluxVariables, OnePNCMinFluxVariables<TypeTag>);
//! The indices required by the isothermal 2pNcMin model
SET_TYPE_PROP
(
OnePNCMin
,
Indices
,
OnePNCMinIndices
<
TypeTag
,
/*PVOffset=*/
0
>
);
//! default value for the forchheimer coefficient
// Source: Ward, J.C. 1964 Turbulent flow in porous media. ASCE J. Hydraul. Div 90.
// Actually the Forchheimer coefficient is also a function of the dimensions of the
// porous medium. Taking it as a constant is only a first approximation
// (Nield, Bejan, Convection in porous media, 2006, p. 10)
// SET_SCALAR_PROP(OnePNCMin, SpatialParamsForchCoeff, 0.55);
//set isothermal VolumeVariables
SET_TYPE_PROP
(
OnePNCMin
,
IsothermalVolumeVariables
,
OnePNCMinVolumeVariables
<
TypeTag
>
);
...
...
@@ -146,9 +134,6 @@ SET_BOOL_PROP(OnePNCMinNI, NiOutputLevel, 0);
// set isothermal Model
SET_TYPE_PROP
(
OnePNCMinNI
,
IsothermalModel
,
OnePNCMinModel
<
TypeTag
>
);
// set isothermal FluxVariables
//SET_TYPE_PROP(OnePNCMinNI, IsothermalFluxVariables, OnePNCMinFluxVariables<TypeTag>);
//set isothermal VolumeVariables
SET_TYPE_PROP
(
OnePNCMinNI
,
IsothermalVolumeVariables
,
OnePNCMinVolumeVariables
<
TypeTag
>
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment