Skip to content
GitLab
Menu
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
0b3198f9
Commit
0b3198f9
authored
Dec 21, 2017
by
Katharina Heck
Browse files
Merge branch 'fix/3pwateroil-headerguard' into 'next'
[fix] wrong copy of 3p3c header See merge request
!709
parents
2e9956d5
d5d14d1f
Changes
3
Hide whitespace changes
Inline
Side-by-side
dumux/porousmediumflow/3pwateroil/model.hh
View file @
0b3198f9
...
...
@@ -68,8 +68,8 @@
* </ul>
*/
#ifndef DUMUX_3P
WATEROIL
_MODEL_HH
#define DUMUX_3P
WATEROIL
_MODEL_HH
#ifndef DUMUX_3P
2CNI
_MODEL_HH
#define DUMUX_3P
2CNI
_MODEL_HH
#include <dumux/common/properties.hh>
...
...
dumux/porousmediumflow/3pwateroil/primaryvariableswitch.hh
View file @
0b3198f9
...
...
@@ -21,8 +21,8 @@
* \ingroup ThreePWaterOilModel
* \brief The primary variable switch for the 3p3c model
*/
#ifndef DUMUX_3P
3C
_PRIMARY_VARIABLE_SWITCH_HH
#define DUMUX_3P
3C
_PRIMARY_VARIABLE_SWITCH_HH
#ifndef DUMUX_3P
2CNI
_PRIMARY_VARIABLE_SWITCH_HH
#define DUMUX_3P
2CNI
_PRIMARY_VARIABLE_SWITCH_HH
#include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
...
...
dumux/porousmediumflow/3pwateroil/vtkoutputfields.hh
View file @
0b3198f9
...
...
@@ -21,8 +21,8 @@
* \ingroup ThreePWaterOilModel
* \brief Adds vtk output fields specific to the twop model
*/
#ifndef DUMUX_
THREEPWATEROIL
_VTK_OUTPUT_FIELDS_HH
#define DUMUX_
THREEPWATEROIL
_VTK_OUTPUT_FIELDS_HH
#ifndef DUMUX_
3P2CNI
_VTK_OUTPUT_FIELDS_HH
#define DUMUX_
3P2CNI
_VTK_OUTPUT_FIELDS_HH
#include <dumux/common/properties.hh>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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