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
c75bb77e
Commit
c75bb77e
authored
3 years ago
by
Dennis Gläser
Browse files
Options
Downloads
Plain Diff
Merge branch 'cleanup/old-properties' into 'master'
Cleanup/old properties See merge request
!2786
parents
40c60bfa
a103b1ab
No related branches found
No related tags found
Loading
Pipeline
#7589
passed
3 years ago
Stage: trigger
Stage: downstream modules
Pipeline: dumux-lecture
#7595
Pipeline: dumux
#7593
Pipeline: dumux
#7592
+2
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/handbook/0_listingstyle.tex
+0
-5
0 additions, 5 deletions
doc/handbook/0_listingstyle.tex
test/common/propertysystem/test_propertysystem.cc
+4
-4
4 additions, 4 deletions
test/common/propertysystem/test_propertysystem.cc
with
4 additions
and
9 deletions
doc/handbook/0_listingstyle.tex
+
0
−
5
View file @
c75bb77e
...
@@ -87,11 +87,6 @@
...
@@ -87,11 +87,6 @@
keywordstyle=
\color
{
dumuxBlue
}
\ttfamily\let\textcolor\textcolordummy
,
keywordstyle=
\color
{
dumuxBlue
}
\ttfamily\let\textcolor\textcolordummy
,
stringstyle=
\color
{
BrickRed
}
\ttfamily\let\textcolor\textcolordummy
,
stringstyle=
\color
{
BrickRed
}
\ttfamily\let\textcolor\textcolordummy
,
commentstyle=
\color
[gray]
{
0.35
}
\ttfamily\itshape\let\textcolor\textcolordummy
,
commentstyle=
\color
[gray]
{
0.35
}
\ttfamily\itshape\let\textcolor\textcolordummy
,
emph=
{
NEW
_
TYPE
_
TAG, NEW
_
PROP
_
TAG, UNSET
_
PROP, TTAG, PTAG,
SET
_
PROP, GET
_
PROP, GET
_
PROP
_
VALUE, GET
_
PROP
_
TYPE,
SET
_
BOOL
_
PROP, SET
_
STRING
_
PROP, SET
_
SCALAR
_
PROP, SET
_
TYPE
_
PROP, SET
_
INT
_
PROP,
GET
_
BOOL
_
PROP, GET
_
STRING
_
PROP, GET
_
SCALAR
_
PROP, GET
_
TYPE
_
PROP, GET
_
INT
_
PROP,
GET
_
PARAM, GET
_
PARAM
_
FROM
_
GROUP, GET
_
RUNTIME
_
PARAM, GET
_
RUNTIME
_
PARAM
_
FROM
_
GROUP
}
,
emphstyle=
\color
{
OliveGreen
}
\let\textcolor\textcolordummy
,
emphstyle=
\color
{
OliveGreen
}
\let\textcolor\textcolordummy
,
directivestyle=
\color
{
Brown
}
\ttfamily\let\textcolor\textcolordummy
,
directivestyle=
\color
{
Brown
}
\ttfamily\let\textcolor\textcolordummy
,
}
}
...
...
This diff is collapsed.
Click to expand it.
test/common/propertysystem/test_propertysystem.cc
+
4
−
4
View file @
c75bb77e
...
@@ -34,10 +34,10 @@
...
@@ -34,10 +34,10 @@
namespace
Dumux
{
namespace
Dumux
{
namespace
Properties
{
namespace
Properties
{
// create some
P
roperties
(equivalent to old macro NEW_PROP_TAG(...))
// create some
p
roperties
:
// the first type tag is the actual TypeTag for which the property will be obtained
// the first type tag is the actual TypeTag for which the property will be obtained
// (can be used to make properties depend on other properties),
// (can be used to make properties depend on other properties),
// the second type tag is for par
i
tal specialization
(equivalent to old macro SET_PROP(...), see below)
// the second type tag is for part
i
al specialization
// the default property should be always undefined to produce a good error message
// the default property should be always undefined to produce a good error message
// if the user attempt to get an unset property
// if the user attempt to get an unset property
template
<
class
TypeTag
,
class
MyTypeTag
>
template
<
class
TypeTag
,
class
MyTypeTag
>
...
@@ -50,7 +50,7 @@ template<class TypeTag, class MyTypeTag>
...
@@ -50,7 +50,7 @@ template<class TypeTag, class MyTypeTag>
struct
UseTpfaFlux
{
using
type
=
UndefinedProperty
;
};
struct
UseTpfaFlux
{
using
type
=
UndefinedProperty
;
};
namespace
TTag
{
namespace
TTag
{
// create some
T
ype
Tags (equivalent to old macro NEW_TYPE_TAG(..., INHERITS_FROM(...)))
// create some
t
ype
tags:
// the tuple is sorted by precedence, the first one overwriting the following
// the tuple is sorted by precedence, the first one overwriting the following
struct
Base
{
};
struct
Base
{
};
struct
Grid
{
};
struct
Grid
{
};
...
@@ -61,7 +61,7 @@ struct OnePTest { using InheritsFrom = std::tuple<OnePModel, BoxDisc>; };
...
@@ -61,7 +61,7 @@ struct OnePTest { using InheritsFrom = std::tuple<OnePModel, BoxDisc>; };
}
// end namespace TTag
}
// end namespace TTag
// set and overwrite some properties
(equivalent to old macro SET_PROP(...){};)
// set and overwrite some properties
template
<
class
TypeTag
>
template
<
class
TypeTag
>
struct
Scalar
<
TypeTag
,
TTag
::
Base
>
{
using
type
=
float
;
};
struct
Scalar
<
TypeTag
,
TTag
::
Base
>
{
using
type
=
float
;
};
...
...
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