From dc295824414a430c65c87e6e9491ad7997212db8 Mon Sep 17 00:00:00 2001
From: Martin Schneider <martin.schneider@iws.uni-stuttgart.de>
Date: Tue, 17 Jul 2018 14:49:40 +0200
Subject: [PATCH] [tutorial] Fix assert and warning when using debug opts
---
exercises/exercise-mainfile/1pproblem.hh | 10 +++++++++-
exercises/exercise-mainfile/exercise_1p_c.cc | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/exercises/exercise-mainfile/1pproblem.hh b/exercises/exercise-mainfile/1pproblem.hh
index e2e2ab62..32d4d5b8 100644
--- a/exercises/exercise-mainfile/1pproblem.hh
+++ b/exercises/exercise-mainfile/1pproblem.hh
@@ -114,11 +114,19 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
static constexpr int dimWorld = GridView::dimensionworld;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
public:
OnePTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
: ParentType(fvGridGeometry)
- {}
+ {
+ FluidSystem::Component::init(/*tempMin=*/272.15,
+ /*tempMax=*/294.15,
+ /*numTemp=*/10,
+ /*pMin=*/1.0e4,
+ /*pMax=*/1.0e6,
+ /*numP=*/200);
+ }
/*!
* \brief Specifies which kind of boundary condition should be
diff --git a/exercises/exercise-mainfile/exercise_1p_c.cc b/exercises/exercise-mainfile/exercise_1p_c.cc
index ab9ea80f..e6a91e62 100644
--- a/exercises/exercise-mainfile/exercise_1p_c.cc
+++ b/exercises/exercise-mainfile/exercise_1p_c.cc
@@ -99,7 +99,7 @@ int main(int argc, char** argv) try
// the grid variables
using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
- gridVariables->init(x);
+ gridVariables->init(x, xOld);
// intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
--
GitLab