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

[fix] wrong copy of 3p3c header

See merge request !709

dumux/porousmediumflow/3pwateroil/model.hh

@@ -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>
 

dumux/porousmediumflow/3pwateroil/primaryvariableswitch.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>
 

dumux/porousmediumflow/3pwateroil/vtkoutputfields.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>