From 69b82b52ffa26e06d190471647ecaaa2e58cc123 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Mon, 13 Nov 2017 10:09:45 +0100
Subject: [PATCH] [freeflowNI] Adapt properties
---
dumux/freeflow/staggered/properties.hh | 3 ++-
dumux/freeflow/staggered/vtkoutputfields.hh | 15 +++------------
dumux/freeflow/staggeredni/propertydefaults.hh | 3 ++-
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/dumux/freeflow/staggered/properties.hh b/dumux/freeflow/staggered/properties.hh
index df88601308..26b696637d 100644
--- a/dumux/freeflow/staggered/properties.hh
+++ b/dumux/freeflow/staggered/properties.hh
@@ -30,11 +30,12 @@
#include <dumux/common/basicproperties.hh>
#include <dumux/freeflow/properties.hh>
-#include <dumux/freeflow/staggeredni/properties.hh>
#include <dumux/freeflow/staggeredni/localresidual.hh>
#include <dumux/freeflow/staggeredni/fluxvariables.hh>
#include <dumux/implicit/staggered/localresidual.hh>
+#include <dumux/freeflow/staggeredni/properties.hh>
+#include <dumux/freeflow/staggeredni/propertydefaults.hh>
#include "localresidual.hh"
#include "volumevariables.hh"
diff --git a/dumux/freeflow/staggered/vtkoutputfields.hh b/dumux/freeflow/staggered/vtkoutputfields.hh
index e990f49a23..e4273b4534 100644
--- a/dumux/freeflow/staggered/vtkoutputfields.hh
+++ b/dumux/freeflow/staggered/vtkoutputfields.hh
@@ -41,19 +41,10 @@ public:
template <class VtkOutputModule>
static void init(VtkOutputModule& vtk)
{
- // vtk.addSecondaryVariable("Sw", [](const VolumeVariables& v){ return v.saturation(Indices::wPhaseIdx); });
- // vtk.addSecondaryVariable("Sn", [](const VolumeVariables& v){ return v.saturation(Indices::nPhaseIdx); });
- // vtk.addSecondaryVariable("pw", [](const VolumeVariables& v){ return v.pressure(Indices::wPhaseIdx); });
- // vtk.addSecondaryVariable("pn", [](const VolumeVariables& v){ return v.pressure(Indices::nPhaseIdx); });
- // vtk.addSecondaryVariable("p", [](const VolumeVariables& v){ return v.pressure(); });
vtk.addVolumeVariable([](const VolumeVariables& v){ return v.pressure(); }, "p");
- // vtk.addSecondaryVariable("pc", [](const VolumeVariables& v){ return v.capillaryPressure(); });
- // vtk.addSecondaryVariable("rhoW", [](const VolumeVariables& v){ return v.density(Indices::wPhaseIdx); });
- // vtk.addSecondaryVariable("rhoN", [](const VolumeVariables& v){ return v.density(Indices::nPhaseIdx); });
- // vtk.addSecondaryVariable("mobW", [](const VolumeVariables& v){ return v.mobility(Indices::wPhaseIdx); });
- // vtk.addSecondaryVariable("mobN", [](const VolumeVariables& v){ return v.mobility(Indices::nPhaseIdx); });
- // vtk.addSecondaryVariable("temperature", [](const VolumeVariables& v){ return v.temperature(); });
- // vtk.addSecondaryVariable("porosity", [](const VolumeVariables& v){ return v.porosity(); });
+
+ if(GET_PROP_VALUE(TypeTag, EnableEnergyBalance))
+ vtk.addVolumeVariable( [](const VolumeVariables& v){ return v.temperature(); },"temperature");
}
};
diff --git a/dumux/freeflow/staggeredni/propertydefaults.hh b/dumux/freeflow/staggeredni/propertydefaults.hh
index e9cc5cbc1d..3a32e82eaa 100644
--- a/dumux/freeflow/staggeredni/propertydefaults.hh
+++ b/dumux/freeflow/staggeredni/propertydefaults.hh
@@ -28,6 +28,7 @@
#define DUMUX_NAVIER_STOKES_NI_PROPERTY_DEFAULTS_HH
#include "indices.hh"
+#include <dumux/discretization/fourierslaw.hh>
namespace Dumux
{
@@ -51,7 +52,7 @@ SET_TYPE_PROP(NavierStokesNonIsothermal, Indices, NavierStokesNonIsothermalIndic
SET_BOOL_PROP(NavierStokesNonIsothermal, EnableEnergyBalance, true);
-// SET_TYPE_PROP(NavierStokesNonIsothermal, HeatConductionType, FouriersLaw<TypeTag>); TODO
+SET_TYPE_PROP(NavierStokesNonIsothermal, HeatConductionType, FouriersLaw<TypeTag>);
} // end namespace Properties
--
GitLab