From ee43cb0c7dec91396954177c0722d5d8ca47e7dd Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Mon, 1 Oct 2012 15:27:51 +0000
Subject: [PATCH] Added Makefile.am for dumux/boxmodels/co2(ni). Fixed scoping
problem of g++ 4.7. Fixed make headercheck for 2p2cadaptiveproperties.hh.
(reviewed by karens)
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9155 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
configure.ac | 2 ++
dumux/boxmodels/Makefile.am | 2 +-
dumux/boxmodels/co2/Makefile.am | 4 ++++
dumux/boxmodels/co2/co2volumevariables.hh | 4 ++--
dumux/boxmodels/co2ni/Makefile.am | 4 ++++
dumux/decoupled/2p2c/2p2cadaptiveproperties.hh | 1 +
6 files changed, 14 insertions(+), 3 deletions(-)
create mode 100644 dumux/boxmodels/co2/Makefile.am
create mode 100644 dumux/boxmodels/co2ni/Makefile.am
diff --git a/configure.ac b/configure.ac
index 129be261b3..352558eea3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,8 @@ AC_CONFIG_FILES([dumux.pc
dumux/boxmodels/3p3c/Makefile
dumux/boxmodels/3p3cni/Makefile
dumux/boxmodels/common/Makefile
+ dumux/boxmodels/co2/Makefile
+ dumux/boxmodels/co2ni/Makefile
dumux/boxmodels/mpnc/Makefile
dumux/boxmodels/mpnc/diffusion/Makefile
dumux/boxmodels/mpnc/energy/Makefile
diff --git a/dumux/boxmodels/Makefile.am b/dumux/boxmodels/Makefile.am
index 5f36478f48..eff7632454 100644
--- a/dumux/boxmodels/Makefile.am
+++ b/dumux/boxmodels/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = common 1p 1p2c 2p 2p2c 2p2cni 2pni 3p3c 3p3cni mpnc richards
+SUBDIRS = common co2 co2ni 1p 1p2c 2p 2p2c 2p2cni 2pni 3p3c 3p3cni mpnc richards
boxmodelsdir = $(includedir)/dumux/boxmodels
diff --git a/dumux/boxmodels/co2/Makefile.am b/dumux/boxmodels/co2/Makefile.am
new file mode 100644
index 0000000000..52b76eb57e
--- /dev/null
+++ b/dumux/boxmodels/co2/Makefile.am
@@ -0,0 +1,4 @@
+co2dir = $(includedir)/dumux/boxmodels/co2
+co2_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/co2/co2volumevariables.hh b/dumux/boxmodels/co2/co2volumevariables.hh
index feecbdfa58..b6a654ece4 100644
--- a/dumux/boxmodels/co2/co2volumevariables.hh
+++ b/dumux/boxmodels/co2/co2volumevariables.hh
@@ -307,10 +307,10 @@ public:
// relative permeabilities
Scalar kr;
if (phaseIdx == wPhaseIdx)
- kr = MaterialLaw::krw(materialParams, saturation(wPhaseIdx));
+ kr = MaterialLaw::krw(materialParams, this->saturation(wPhaseIdx));
else // ATTENTION: krn requires the liquid saturation
// as parameter!
- kr = MaterialLaw::krn(materialParams, saturation(wPhaseIdx));
+ kr = MaterialLaw::krn(materialParams, this->saturation(wPhaseIdx));
ParentType::relativePermeability_[phaseIdx] = kr;
Valgrind::CheckDefined(ParentType::relativePermeability_[phaseIdx]);
diff --git a/dumux/boxmodels/co2ni/Makefile.am b/dumux/boxmodels/co2ni/Makefile.am
new file mode 100644
index 0000000000..e1f4e38102
--- /dev/null
+++ b/dumux/boxmodels/co2ni/Makefile.am
@@ -0,0 +1,4 @@
+co2nidir = $(includedir)/dumux/boxmodels/co2ni
+co2ni_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh b/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
index f280920501..5196800ba3 100644
--- a/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
+++ b/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
@@ -58,6 +58,7 @@ NEW_PROP_TAG( GridAdaptEnableSecondHalfEdge ); //!< Uses second interaction volu
}}
//Dumux includes
+#include <dumux/decoupled/common/gridadaptproperties.hh>
#include <dumux/decoupled/2p2c/fvpressure2p2cadaptive.hh>
#include <dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh>
#include <dumux/decoupled/2p2c/variableclass2p2cadaptive.hh>
--
GitLab