Commit 0b3198f9 authored by Katharina Heck's avatar Katharina Heck
Browse files

Merge branch 'fix/3pwateroil-headerguard' into 'next'

[fix] wrong copy of 3p3c header

See merge request !709
parents 2e9956d5 d5d14d1f
......@@ -68,8 +68,8 @@
* </ul>
*/
#ifndef DUMUX_3PWATEROIL_MODEL_HH
#define DUMUX_3PWATEROIL_MODEL_HH
#ifndef DUMUX_3P2CNI_MODEL_HH
#define DUMUX_3P2CNI_MODEL_HH
#include <dumux/common/properties.hh>
......
......@@ -21,8 +21,8 @@
* \ingroup ThreePWaterOilModel
* \brief The primary variable switch for the 3p3c model
*/
#ifndef DUMUX_3P3C_PRIMARY_VARIABLE_SWITCH_HH
#define DUMUX_3P3C_PRIMARY_VARIABLE_SWITCH_HH
#ifndef DUMUX_3P2CNI_PRIMARY_VARIABLE_SWITCH_HH
#define DUMUX_3P2CNI_PRIMARY_VARIABLE_SWITCH_HH
#include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
......
......@@ -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>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment