Commit edce36d9 authored by Hanchuan Wu's avatar Hanchuan Wu
Browse files

Merge branch 'fix/headercheck-for-3.4' into 'releases/3.4'

fix headercheck for the dumux folder

See merge request !2760
parents 8ce9057a ec7c98bb
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <vector> #include <vector>
#include <cassert> #include <cassert>
#include <algorithm>
namespace Dumux { namespace Dumux {
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#ifndef DUMUX_PORE_NETWORK_GRID_MANAGER_HH #ifndef DUMUX_PORE_NETWORK_GRID_MANAGER_HH
#define DUMUX_PORE_NETWORK_GRID_MANAGER_HH #define DUMUX_PORE_NETWORK_GRID_MANAGER_HH
#if HAVE_DUNE_FOAMGRID
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>
...@@ -32,12 +34,8 @@ ...@@ -32,12 +34,8 @@
#include <dune/common/timer.hh> #include <dune/common/timer.hh>
// FoamGrid specific includes // FoamGrid specific includes
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh> #include <dune/foamgrid/foamgrid.hh>
#include <dune/foamgrid/dgffoam.hh> #include <dune/foamgrid/dgffoam.hh>
#else
static_assert(false, "dune-foamgrid required!");
#endif
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
...@@ -445,4 +443,6 @@ private: ...@@ -445,4 +443,6 @@ private:
} }
#endif // HAVE_DUNE_FOAMGRID
#endif #endif
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#ifndef DUMUX_IO_STRUCTURED_LATTICE_GRID_CREATOR_HH #ifndef DUMUX_IO_STRUCTURED_LATTICE_GRID_CREATOR_HH
#define DUMUX_IO_STRUCTURED_LATTICE_GRID_CREATOR_HH #define DUMUX_IO_STRUCTURED_LATTICE_GRID_CREATOR_HH
#if HAVE_DUNE_FOAMGRID
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <type_traits> #include <type_traits>
...@@ -37,10 +39,8 @@ ...@@ -37,10 +39,8 @@
#include <dune/geometry/referenceelements.hh> #include <dune/geometry/referenceelements.hh>
// FoamGrid specific includes // FoamGrid specific includes
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh> #include <dune/foamgrid/foamgrid.hh>
#include <dune/foamgrid/dgffoam.hh> #include <dune/foamgrid/dgffoam.hh>
#endif
#include <dumux/io/grid/gridmanager_yasp.hh> #include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
...@@ -624,4 +624,6 @@ private: ...@@ -624,4 +624,6 @@ private:
} // end namespace Dumux::PoreNetwork } // end namespace Dumux::PoreNetwork
#endif // HAVE_DUNE_FOAMGRID
#endif #endif
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
#ifndef DUMUX_PNM_COMMON_OUTPUT_FIELDS_HH #ifndef DUMUX_PNM_COMMON_OUTPUT_FIELDS_HH
#define DUMUX_PNM_COMMON_OUTPUT_FIELDS_HH #define DUMUX_PNM_COMMON_OUTPUT_FIELDS_HH
#include <dumux/io/vtk/function.hh>
#include <dumux/io/vtk/fieldtype.hh>
namespace Dumux::PoreNetwork { namespace Dumux::PoreNetwork {
/*! /*!
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
* @author Markus Wolff * @author Markus Wolff
*/ */
#include <set>
#include "linteractionvolume3d.hh" #include "linteractionvolume3d.hh"
namespace Dumux namespace Dumux
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
// [[codeblock]] // [[codeblock]]
#include <assert.h> #include <assert.h>
#include <dumux/material/components/co2tablereader.hh>
namespace Dumux::ICP { namespace Dumux::ICP {
#include "co2valueslaboratory.inc" #include "co2valueslaboratory.inc"
}// end namespace Dumux::ICP }// end namespace Dumux::ICP
......
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