From c0b2769759fe3215b6d8c3a16c28fc7a9acf081d Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt Date: Fri, 9 Mar 2018 07:38:32 +0100 Subject: [PATCH 1/5] fixup navierstokes model --- dumux/freeflow/navierstokes/model.hh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dumux/freeflow/navierstokes/model.hh b/dumux/freeflow/navierstokes/model.hh index cd828f6b17..7fc7b2029c 100644 --- a/dumux/freeflow/navierstokes/model.hh +++ b/dumux/freeflow/navierstokes/model.hh @@ -148,10 +148,9 @@ public: SET_PROP(NavierStokes, VtkOutputFields) { private: - using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables); using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry); public: - using type = NavierStokesVtkOutputFields; + using type = NavierStokesVtkOutputFields; }; ////////////////////////////////////////////////////////////////// // Property values for isothermal model required for the general non-isothermal model @@ -170,10 +169,9 @@ public: SET_PROP(NavierStokesNI, IsothermalVtkOutputFields) { private: - using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables); using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry); public: - using type = NavierStokesVtkOutputFields; + using type = NavierStokesVtkOutputFields; }; //! The number of equations for the isothermal model -- GitLab From 944e53817a0e0910a0c611bec6743fb4662cc092 Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt Date: Fri, 9 Mar 2018 07:38:46 +0100 Subject: [PATCH 2/5] fixup navierstokes vtkoutpufields --- dumux/freeflow/navierstokes/vtkoutputfields.hh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dumux/freeflow/navierstokes/vtkoutputfields.hh b/dumux/freeflow/navierstokes/vtkoutputfields.hh index 72ec003590..c13234c310 100644 --- a/dumux/freeflow/navierstokes/vtkoutputfields.hh +++ b/dumux/freeflow/navierstokes/vtkoutputfields.hh @@ -36,10 +36,11 @@ namespace Dumux * \ingroup NavierStokesModel * \brief Adds vtk output fields for the Navier-Stokes model */ -template +template class NavierStokesVtkOutputFields { - using GlobalPosition = Dune::FieldVector; + using ctype = typename FVGridGeometry::GridView::ctype; + using GlobalPosition = Dune::FieldVector; // Helper type used for tag dispatching (to add discretization-specific fields). template @@ -70,10 +71,10 @@ private: const bool writeFaceVars = getParamFromGroup(vtk.paramGroup(), "Vtk.WriteFaceData", false); if(writeFaceVars) { - auto faceVelocityVector = [](const typename FVGridGeometry::SubControlVolumeFace& scvf, const FaceVariables& f) + auto faceVelocityVector = [](const typename FVGridGeometry::SubControlVolumeFace& scvf, const auto& faceVars) { GlobalPosition velocity(0.0); - velocity[scvf.directionIndex()] = f.velocitySelf(); + velocity[scvf.directionIndex()] = faceVars.velocitySelf(); return velocity; }; -- GitLab From 0cbdc5f0652fa1710acf520155a8f2c8d44de1f4 Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt Date: Fri, 9 Mar 2018 07:38:56 +0100 Subject: [PATCH 3/5] fixup navierstokesnc model --- dumux/freeflow/navierstokesnc/model.hh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dumux/freeflow/navierstokesnc/model.hh b/dumux/freeflow/navierstokesnc/model.hh index 6654b264da..d3468ef03c 100644 --- a/dumux/freeflow/navierstokesnc/model.hh +++ b/dumux/freeflow/navierstokesnc/model.hh @@ -159,12 +159,11 @@ public: SET_PROP(NavierStokesNC, VtkOutputFields) { private: - using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables); using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry); using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem); static constexpr int phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx); public: - using type = NavierStokesNCVtkOutputFields; + using type = NavierStokesNCVtkOutputFields; }; /*! @@ -205,12 +204,11 @@ public: SET_PROP(NavierStokesNCNI, IsothermalVtkOutputFields) { private: - using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables); using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry); using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem); static constexpr int phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx); public: - using type = NavierStokesNCVtkOutputFields; + using type = NavierStokesNCVtkOutputFields; }; //! The number of equations for the isothermal model -- GitLab From 43ed17648b617be7a72fbf11b899ea1d5514fd1e Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt Date: Fri, 9 Mar 2018 07:39:18 +0100 Subject: [PATCH 4/5] fixup navierstokes vtkoutputfields --- dumux/freeflow/navierstokesnc/vtkoutputfields.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dumux/freeflow/navierstokesnc/vtkoutputfields.hh b/dumux/freeflow/navierstokesnc/vtkoutputfields.hh index 391d8c8add..2ffa7778ef 100644 --- a/dumux/freeflow/navierstokesnc/vtkoutputfields.hh +++ b/dumux/freeflow/navierstokesnc/vtkoutputfields.hh @@ -34,7 +34,7 @@ namespace Dumux * \ingroup NavierStokesNCModel * \brief Adds vtk output fields specific to the NavierStokesNC model */ -template +template class NavierStokesNCVtkOutputFields { @@ -43,7 +43,7 @@ public: template static void init(VtkOutputModule& vtk) { - NavierStokesVtkOutputFields::init(vtk); + NavierStokesVtkOutputFields::init(vtk); vtk.addVolumeVariable([](const auto& v){ return v.molarDensity(); }, "rhoMolar"); vtk.addVolumeVariable([](const auto& v){ return v.density(); }, "rho"); -- GitLab From ac1ee113ab91d6a3c9a4f9b6f07b2828295740d8 Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt Date: Fri, 9 Mar 2018 07:39:32 +0100 Subject: [PATCH 5/5] fixup staggeredvtkoutputmodule --- dumux/io/staggeredvtkoutputmodule.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dumux/io/staggeredvtkoutputmodule.hh b/dumux/io/staggeredvtkoutputmodule.hh index b31595e350..fd21d18ef2 100644 --- a/dumux/io/staggeredvtkoutputmodule.hh +++ b/dumux/io/staggeredvtkoutputmodule.hh @@ -92,7 +92,7 @@ public: const std::string& paramGroup = "", bool verbose = true, Dune::VTK::DataMode dm = Dune::VTK::conforming) - : ParentType(problem, fvGridGeometry, gridVariables, sol, name, paramGroup,verbose, dm) + : ParentType(problem, fvGridGeometry, gridVariables, sol, name, paramGroup, verbose, dm) , problem_(problem) , gridGeom_(fvGridGeometry) , gridVariables_(gridVariables) -- GitLab