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
d6936451
Commit
d6936451
authored
7 years ago
by
Kilian Weishaupt
Browse files
Options
Downloads
Patches
Plain Diff
[freeflow] Clean up properties
parent
85c6691e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
3 merge requests
!617
[WIP] Next
,
!576
Feature/port staggered ff to next next
,
!571
Cleanup/next
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/freeflow/properties.hh
+1
-51
1 addition, 51 deletions
dumux/freeflow/properties.hh
with
1 addition
and
51 deletions
dumux/freeflow/properties.hh
+
1
−
51
View file @
d6936451
...
@@ -26,17 +26,6 @@
...
@@ -26,17 +26,6 @@
#ifndef DUMUX_FREE_FLOW_PROPERTIES_HH
#ifndef DUMUX_FREE_FLOW_PROPERTIES_HH
#define DUMUX_FREE_FLOW_PROPERTIES_HH
#define DUMUX_FREE_FLOW_PROPERTIES_HH
#include
<dumux/io/vtkoutputmodule.hh>
// #include <dumux/FreeFlow/implicit/fluxvariables.hh>
// #include <dumux/FreeFlow/implicit/fluxvariablescache.hh>
// #include <dumux/FreeFlow/nonisothermal/implicit/localresidual.hh>
// #include <dumux/FreeFlow/compositional/primaryvariableswitch.hh>
// #include <dumux/FreeFlow/implicit/velocityoutput.hh>
// #include <dumux/discretization/darcyslaw.hh>
// #include <dumux/discretization/fickslaw.hh>
// #include <dumux/discretization/fourierslaw.hh>
#include
<dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh>
#include
<dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh>
#include
<dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh>
#include
<dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh>
#include
<dumux/discretization/staggered/freeflow/facevariables.hh>
#include
<dumux/discretization/staggered/freeflow/facevariables.hh>
...
@@ -53,8 +42,6 @@ NEW_TYPE_TAG(FreeFlow);
...
@@ -53,8 +42,6 @@ NEW_TYPE_TAG(FreeFlow);
SET_INT_PROP
(
FreeFlow
,
NumEqFace
,
1
);
//!< set the number of equations to 1
SET_INT_PROP
(
FreeFlow
,
NumEqFace
,
1
);
//!< set the number of equations to 1
//! The sub-controlvolume face
//! The sub-controlvolume face
SET_PROP
(
FreeFlow
,
SubControlVolumeFace
)
SET_PROP
(
FreeFlow
,
SubControlVolumeFace
)
{
{
...
@@ -78,7 +65,7 @@ public:
...
@@ -78,7 +65,7 @@ public:
//! The variables living on the faces
//! The variables living on the faces
SET_TYPE_PROP
(
FreeFlow
,
FaceVariables
,
StaggeredFaceVariables
<
TypeTag
>
);
SET_TYPE_PROP
(
FreeFlow
,
FaceVariables
,
StaggeredFaceVariables
<
TypeTag
>
);
//! A container class used to specify values for boundary conditions
SET_PROP
(
FreeFlow
,
BoundaryValues
)
SET_PROP
(
FreeFlow
,
BoundaryValues
)
{
{
private:
private:
...
@@ -95,43 +82,6 @@ SET_TYPE_PROP(FreeFlow,
...
@@ -95,43 +82,6 @@ SET_TYPE_PROP(FreeFlow,
BoundaryTypes
,
BoundaryTypes
,
StaggeredFreeFlowBoundaryTypes
<
GET_PROP_VALUE
(
TypeTag
,
NumEq
)
>
);
StaggeredFreeFlowBoundaryTypes
<
GET_PROP_VALUE
(
TypeTag
,
NumEq
)
>
);
// //! The flux variables for models involving flow in porous media
// SET_TYPE_PROP(FreeFlow, FluxVariables, PorousMediumFluxVariables<TypeTag>);
//
// //! The flux variables cache class for models involving flow in porous media
// SET_TYPE_PROP(FreeFlow, FluxVariablesCache, PorousMediumFluxVariablesCache<TypeTag>);
//
// //! By default, we use darcy's law for the advective fluxes
// SET_TYPE_PROP(FreeFlow, AdvectionType, DarcysLaw<TypeTag>);
//
// //! By default, we use fick's law for the diffusive fluxes
// SET_TYPE_PROP(FreeFlow, MolecularDiffusionType, FicksLaw<TypeTag>);
//
// //! By default, we use fourier's law as the default for heat conduction fluxes
// SET_TYPE_PROP(FreeFlow, HeatConductionType, FouriersLaw<TypeTag>);
//
// //! By default, parameters are solution-dependent
// SET_BOOL_PROP(FreeFlow, SolutionDependentAdvection, true);
// SET_BOOL_PROP(FreeFlow, SolutionDependentMolecularDiffusion, true);
// SET_BOOL_PROP(FreeFlow, SolutionDependentHeatConduction, true);
//
// //! By default, we evaluate the permeability in the volume
// SET_BOOL_PROP(FreeFlow, EvaluatePermeabilityAtScvfIP, false);
//
// //! The default implementation of the energy balance equation for flow problems in porous media.
// SET_TYPE_PROP(FreeFlow, EnergyLocalResidual, EnergyLocalResidual<TypeTag> );
//! Velocity output
// SET_TYPE_PROP(FreeFlow, VelocityOutput, ImplicitVelocityOutput<TypeTag>);
//! By default, we set an empty primary variables switch
// SET_TYPE_PROP(FreeFlow, PrimaryVariableSwitch, NoPrimaryVariableSwitch<TypeTag>);
}
// namespace Properties
}
// namespace Properties
}
// namespace Dumux
}
// namespace Dumux
...
...
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