From 6fe244aa80d6a7fddda1f363741f0e8f73c57aa7 Mon Sep 17 00:00:00 2001
From: IvBu <ivan.buntic@iws.uni-stuttgart.de>
Date: Thu, 1 Aug 2024 11:15:55 +0200
Subject: [PATCH] [fluidsystem] Update patch.
---
.../exercise-fluidsystem.patch | 46 +++++++++----------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/.patches/exercise-fluidsystem/exercise-fluidsystem.patch b/.patches/exercise-fluidsystem/exercise-fluidsystem.patch
index c1237f76..5f89a35e 100644
--- a/.patches/exercise-fluidsystem/exercise-fluidsystem.patch
+++ b/.patches/exercise-fluidsystem/exercise-fluidsystem.patch
@@ -1,6 +1,6 @@
diff -ruN exercises/exercise-fluidsystem/2p2cproblem.hh exercises/solution/exercise-fluidsystem/2p2cproblem.hh
---- exercises/exercise-fluidsystem/2p2cproblem.hh 2024-07-17 15:44:09.856489072 +0200
-+++ exercises/solution/exercise-fluidsystem/2p2cproblem.hh 2024-07-17 15:44:09.860489129 +0200
+--- exercises/exercise-fluidsystem/2p2cproblem.hh 2024-07-18 13:47:42.192717667 +0200
++++ exercises/solution/exercise-fluidsystem/2p2cproblem.hh 2024-07-18 13:47:42.192717667 +0200
@@ -12,7 +12,7 @@
#ifndef DUMUX_EXERCISE_FLUIDSYSTEM_B_PROBLEM_HH
#define DUMUX_EXERCISE_FLUIDSYSTEM_B_PROBLEM_HH
@@ -11,8 +11,8 @@ diff -ruN exercises/exercise-fluidsystem/2p2cproblem.hh exercises/solution/exerc
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh>
diff -ruN exercises/exercise-fluidsystem/2pproperties.hh exercises/solution/exercise-fluidsystem/2pproperties.hh
---- exercises/exercise-fluidsystem/2pproperties.hh 2024-07-17 15:44:09.856489072 +0200
-+++ exercises/solution/exercise-fluidsystem/2pproperties.hh 2024-07-17 15:44:09.864489185 +0200
+--- exercises/exercise-fluidsystem/2pproperties.hh 2024-07-18 14:25:25.701687082 +0200
++++ exercises/solution/exercise-fluidsystem/2pproperties.hh 2024-07-18 13:47:42.196717705 +0200
@@ -25,15 +25,13 @@
#include "spatialparams.hh"
@@ -38,7 +38,7 @@ diff -ruN exercises/exercise-fluidsystem/2pproperties.hh exercises/solution/exer
-
- // TODO: dumux-course-task 2.2:
- // Select the corresponding component for the task
-- // Uncomment first line and comment second line for using the compressible component
+- // Comment first line and uncomment second line for using the compressible component
- using LiquidMyComponentPhase = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
- // using LiquidMyComponentPhase = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
+ /*!
@@ -52,8 +52,8 @@ diff -ruN exercises/exercise-fluidsystem/2pproperties.hh exercises/solution/exer
public:
using type = typename FluidSystems::TwoPImmiscible<Scalar, LiquidWaterPhase, LiquidMyComponentPhase>;
diff -ruN exercises/exercise-fluidsystem/aparams.input exercises/solution/exercise-fluidsystem/aparams.input
---- exercises/exercise-fluidsystem/aparams.input 2024-07-17 15:44:09.856489072 +0200
-+++ exercises/solution/exercise-fluidsystem/aparams.input 2024-07-17 15:44:09.864489185 +0200
+--- exercises/exercise-fluidsystem/aparams.input 2024-07-18 13:47:42.192717667 +0200
++++ exercises/solution/exercise-fluidsystem/aparams.input 2024-07-18 13:47:42.196717705 +0200
@@ -3,7 +3,7 @@
DtInitial = 10 # initial time step size [s]
@@ -70,8 +70,8 @@ diff -ruN exercises/exercise-fluidsystem/aparams.input exercises/solution/exerci
-PlotDensity = false # plot density over pressure for your component
+PlotDensity = true # plot density over pressure for your component
diff -ruN exercises/exercise-fluidsystem/bparams.input exercises/solution/exercise-fluidsystem/bparams.input
---- exercises/exercise-fluidsystem/bparams.input 2024-07-17 15:44:09.856489072 +0200
-+++ exercises/solution/exercise-fluidsystem/bparams.input 2024-07-17 15:44:09.864489185 +0200
+--- exercises/exercise-fluidsystem/bparams.input 2024-07-18 13:47:42.192717667 +0200
++++ exercises/solution/exercise-fluidsystem/bparams.input 2024-07-18 13:47:42.196717705 +0200
@@ -3,7 +3,7 @@
DtInitial = 10 # initial time step size [s]
@@ -110,8 +110,8 @@ diff -ruN exercises/exercise-fluidsystem/CMakeLists.txt exercises/solution/exerc
-# add a symlink for the grids folder
-dune_symlink_to_source_files(FILES grids)
diff -ruN exercises/exercise-fluidsystem/components/mycompressiblecomponent.hh exercises/solution/exercise-fluidsystem/components/mycompressiblecomponent.hh
---- exercises/exercise-fluidsystem/components/mycompressiblecomponent.hh 2024-07-17 15:44:09.856489072 +0200
-+++ exercises/solution/exercise-fluidsystem/components/mycompressiblecomponent.hh 2024-07-17 15:44:09.864489185 +0200
+--- exercises/exercise-fluidsystem/components/mycompressiblecomponent.hh 2024-07-18 13:47:42.192717667 +0200
++++ exercises/solution/exercise-fluidsystem/components/mycompressiblecomponent.hh 2024-07-18 13:47:42.196717705 +0200
@@ -38,7 +38,7 @@
static std::string name()
{ return "MyCompressibleComponent"; }
@@ -173,8 +173,8 @@ diff -ruN exercises/exercise-fluidsystem/components/mycompressiblecomponent.hh e
};
diff -ruN exercises/exercise-fluidsystem/components/myincompressiblecomponent.hh exercises/solution/exercise-fluidsystem/components/myincompressiblecomponent.hh
---- exercises/exercise-fluidsystem/components/myincompressiblecomponent.hh 2024-07-17 15:44:09.856489072 +0200
-+++ exercises/solution/exercise-fluidsystem/components/myincompressiblecomponent.hh 2024-07-17 15:44:09.864489185 +0200
+--- exercises/exercise-fluidsystem/components/myincompressiblecomponent.hh 2024-07-18 13:47:42.192717667 +0200
++++ exercises/solution/exercise-fluidsystem/components/myincompressiblecomponent.hh 2024-07-18 13:47:42.196717705 +0200
@@ -48,10 +48,7 @@
*/
static Scalar molarMass()
@@ -213,7 +213,7 @@ diff -ruN exercises/exercise-fluidsystem/components/myincompressiblecomponent.hh
diff -ruN exercises/exercise-fluidsystem/components/plotdensityfunction.py exercises/solution/exercise-fluidsystem/components/plotdensityfunction.py
--- exercises/exercise-fluidsystem/components/plotdensityfunction.py 1970-01-01 01:00:00.000000000 +0100
-+++ exercises/solution/exercise-fluidsystem/components/plotdensityfunction.py 2024-07-17 15:44:09.864489185 +0200
++++ exercises/solution/exercise-fluidsystem/components/plotdensityfunction.py 2024-07-18 13:47:42.196717705 +0200
@@ -0,0 +1,22 @@
+#!usr/bin/env python
+# SPDX-FileCopyrightInfo: Copyright © DuMux-Course contributors, see AUTHORS.md in root folder
@@ -238,8 +238,8 @@ diff -ruN exercises/exercise-fluidsystem/components/plotdensityfunction.py exerc
+plt.semilogx(p, r)
+plt.show()
diff -ruN exercises/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent.hh exercises/solution/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent.hh
---- exercises/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent.hh 2024-07-17 17:00:18.522719081 +0200
-+++ exercises/solution/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent.hh 2024-07-17 17:06:06.331393948 +0200
+--- exercises/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent.hh 2024-07-18 13:47:42.192717667 +0200
++++ exercises/solution/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent.hh 2024-07-18 13:47:42.196717705 +0200
@@ -20,10 +20,10 @@
#include <dumux/material/fluidsystems/base.hh>
@@ -276,8 +276,8 @@ diff -ruN exercises/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent
else
{
diff -ruN exercises/exercise-fluidsystem/main.cc exercises/solution/exercise-fluidsystem/main.cc
---- exercises/exercise-fluidsystem/main.cc 2024-07-17 15:44:09.860489129 +0200
-+++ exercises/solution/exercise-fluidsystem/main.cc 2024-07-17 15:44:09.864489185 +0200
+--- exercises/exercise-fluidsystem/main.cc 2024-07-18 13:47:42.192717667 +0200
++++ exercises/solution/exercise-fluidsystem/main.cc 2024-07-18 13:47:42.196717705 +0200
@@ -36,7 +36,7 @@
int main(int argc, char** argv)
{
@@ -303,7 +303,7 @@ diff -ruN exercises/exercise-fluidsystem/main.cc exercises/solution/exercise-flu
using IOFields = GetPropType<TypeTag, Properties::IOFields>;
VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
diff -ruN exercises/exercise-fluidsystem/README.md exercises/solution/exercise-fluidsystem/README.md
---- exercises/exercise-fluidsystem/README.md 2024-07-17 15:44:09.856489072 +0200
+--- exercises/exercise-fluidsystem/README.md 2024-07-18 14:23:13.194674429 +0200
+++ exercises/solution/exercise-fluidsystem/README.md 1970-01-01 01:00:00.000000000 +0100
@@ -1,265 +0,0 @@
-# Exercise Fluidsystem (DuMuX Course)
@@ -412,7 +412,7 @@ diff -ruN exercises/exercise-fluidsystem/README.md exercises/solution/exercise-f
-
- // TODO: dumux-course-task 2.2:
- // Select the corresponding component for the task
-- // Uncomment first line and comment second line for using the compressible component
+- // Comment first line and uncomment second line for using the compressible component
- using LiquidMyComponentPhase = typename FluidSystems::OnePLiquid<Scalar, MyIncompressibleComponent<Scalar> >;
- // using LiquidMyComponentPhase = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
-
@@ -569,11 +569,11 @@ diff -ruN exercises/exercise-fluidsystem/README.md exercises/solution/exercise-f
-```bash
-cd build-cmake/exercises/exercise-fluidsystem
-make exercise_fluidsystem_b
--./exercise_fluidsystem_b exercise_fluidsystem_b.input
+-./exercise_fluidsystem_b bparams.input
-```
diff -ruN exercises/exercise-fluidsystem/spatialparams.hh exercises/solution/exercise-fluidsystem/spatialparams.hh
---- exercises/exercise-fluidsystem/spatialparams.hh 2024-07-17 15:44:09.860489129 +0200
-+++ exercises/solution/exercise-fluidsystem/spatialparams.hh 2024-07-17 15:44:09.864489185 +0200
+--- exercises/exercise-fluidsystem/spatialparams.hh 2024-07-18 13:47:42.192717667 +0200
++++ exercises/solution/exercise-fluidsystem/spatialparams.hh 2024-07-18 13:47:42.196717705 +0200
@@ -113,13 +113,17 @@
template<class FluidSystem>
int wettingPhaseAtPos(const GlobalPosition& globalPos) const
--
GitLab