Skip to content
Snippets Groups Projects

Slides/exercise fractures

Merged David Lipp requested to merge slides/exercise-fractures into master
All threads resolved!
6 files
+ 91
91
Compare changes
  • Side-by-side
  • Inline
Files
6
diff -ruN exercises/exercise-basic/2p2cmain.cc exercises/solution/exercise-basic/2p2cmain.cc
diff -ruN exercises/exercise-basic/2p2cmain.cc exercises/solution/exercise-basic/2p2cmain.cc
--- exercises/exercise-basic/2p2cmain.cc 2024-05-21 14:15:07.137554735 +0200
--- exercises/exercise-basic/2p2cmain.cc 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/2p2cmain.cc 1970-01-01 01:00:00.000000000 +0100
+++ exercises/solution/exercise-basic/2p2cmain.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,154 +0,0 @@
@@ -1,154 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -157,7 +157,7 @@ diff -ruN exercises/exercise-basic/2p2cmain.cc exercises/solution/exercise-basic
@@ -157,7 +157,7 @@ diff -ruN exercises/exercise-basic/2p2cmain.cc exercises/solution/exercise-basic
- return 0;
- return 0;
-} // end main
-} // end main
diff -ruN exercises/exercise-basic/2pmain.cc exercises/solution/exercise-basic/2pmain.cc
diff -ruN exercises/exercise-basic/2pmain.cc exercises/solution/exercise-basic/2pmain.cc
--- exercises/exercise-basic/2pmain.cc 2024-05-21 14:15:07.137554735 +0200
--- exercises/exercise-basic/2pmain.cc 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/2pmain.cc 1970-01-01 01:00:00.000000000 +0100
+++ exercises/solution/exercise-basic/2pmain.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,157 +0,0 @@
@@ -1,157 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -319,7 +319,7 @@ diff -ruN exercises/exercise-basic/2pmain.cc exercises/solution/exercise-basic/2
@@ -319,7 +319,7 @@ diff -ruN exercises/exercise-basic/2pmain.cc exercises/solution/exercise-basic/2
-} // end main
-} // end main
diff -ruN exercises/exercise-basic/2pnimain.cc exercises/solution/exercise-basic/2pnimain.cc
diff -ruN exercises/exercise-basic/2pnimain.cc exercises/solution/exercise-basic/2pnimain.cc
--- exercises/exercise-basic/2pnimain.cc 1970-01-01 01:00:00.000000000 +0100
--- exercises/exercise-basic/2pnimain.cc 1970-01-01 01:00:00.000000000 +0100
+++ exercises/solution/exercise-basic/2pnimain.cc 2024-05-21 14:15:07.205555067 +0200
+++ exercises/solution/exercise-basic/2pnimain.cc 2024-07-10 10:56:47.811814205 +0200
@@ -0,0 +1,150 @@
@@ -0,0 +1,150 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+// vi: set et ts=4 sw=4 sts=4:
@@ -472,8 +472,8 @@ diff -ruN exercises/exercise-basic/2pnimain.cc exercises/solution/exercise-basic
@@ -472,8 +472,8 @@ diff -ruN exercises/exercise-basic/2pnimain.cc exercises/solution/exercise-basic
+ return 0;
+ return 0;
+} // end main
+} // end main
diff -ruN exercises/exercise-basic/CMakeLists.txt exercises/solution/exercise-basic/CMakeLists.txt
diff -ruN exercises/exercise-basic/CMakeLists.txt exercises/solution/exercise-basic/CMakeLists.txt
--- exercises/exercise-basic/CMakeLists.txt 2024-06-26 14:27:30.147478465 +0200
--- exercises/exercise-basic/CMakeLists.txt 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/CMakeLists.txt 2024-05-21 14:15:07.205555067 +0200
+++ exercises/solution/exercise-basic/CMakeLists.txt 2024-07-10 10:56:47.811814205 +0200
@@ -1,13 +1,6 @@
@@ -1,13 +1,6 @@
-# the immiscible two-phase simulation program
-# the immiscible two-phase simulation program
-dumux_add_test(NAME exercise_basic_2p
-dumux_add_test(NAME exercise_basic_2p
@@ -492,7 +492,7 @@ diff -ruN exercises/exercise-basic/CMakeLists.txt exercises/solution/exercise-ba
@@ -492,7 +492,7 @@ diff -ruN exercises/exercise-basic/CMakeLists.txt exercises/solution/exercise-ba
# add a symlink for each input file
# add a symlink for each input file
add_input_file_links()
add_input_file_links()
diff -ruN exercises/exercise-basic/injection2p2cproblem.hh exercises/solution/exercise-basic/injection2p2cproblem.hh
diff -ruN exercises/exercise-basic/injection2p2cproblem.hh exercises/solution/exercise-basic/injection2p2cproblem.hh
--- exercises/exercise-basic/injection2p2cproblem.hh 2024-05-21 14:15:07.137554735 +0200
--- exercises/exercise-basic/injection2p2cproblem.hh 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/injection2p2cproblem.hh 1970-01-01 01:00:00.000000000 +0100
+++ exercises/solution/exercise-basic/injection2p2cproblem.hh 1970-01-01 01:00:00.000000000 +0100
@@ -1,229 +0,0 @@
@@ -1,229 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -725,8 +725,8 @@ diff -ruN exercises/exercise-basic/injection2p2cproblem.hh exercises/solution/ex
@@ -725,8 +725,8 @@ diff -ruN exercises/exercise-basic/injection2p2cproblem.hh exercises/solution/ex
-
-
-#endif
-#endif
diff -ruN exercises/exercise-basic/injection2pniproblem.hh exercises/solution/exercise-basic/injection2pniproblem.hh
diff -ruN exercises/exercise-basic/injection2pniproblem.hh exercises/solution/exercise-basic/injection2pniproblem.hh
--- exercises/exercise-basic/injection2pniproblem.hh 2024-06-26 13:58:48.088032356 +0200
--- exercises/exercise-basic/injection2pniproblem.hh 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/injection2pniproblem.hh 2024-06-26 13:51:10.749132853 +0200
+++ exercises/solution/exercise-basic/injection2pniproblem.hh 2024-07-10 10:56:47.811814205 +0200
@@ -19,7 +19,7 @@
@@ -19,7 +19,7 @@
/*!
/*!
* \file
* \file
@@ -869,7 +869,7 @@ diff -ruN exercises/exercise-basic/injection2pniproblem.hh exercises/solution/ex
@@ -869,7 +869,7 @@ diff -ruN exercises/exercise-basic/injection2pniproblem.hh exercises/solution/ex
static constexpr Scalar eps_ = 1e-6;
static constexpr Scalar eps_ = 1e-6;
std::string name_; //! Problem name
std::string name_; //! Problem name
diff -ruN exercises/exercise-basic/injection2pproblem.hh exercises/solution/exercise-basic/injection2pproblem.hh
diff -ruN exercises/exercise-basic/injection2pproblem.hh exercises/solution/exercise-basic/injection2pproblem.hh
--- exercises/exercise-basic/injection2pproblem.hh 2024-05-21 14:15:07.137554735 +0200
--- exercises/exercise-basic/injection2pproblem.hh 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/injection2pproblem.hh 1970-01-01 01:00:00.000000000 +0100
+++ exercises/solution/exercise-basic/injection2pproblem.hh 1970-01-01 01:00:00.000000000 +0100
@@ -1,223 +0,0 @@
@@ -1,223 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -1096,8 +1096,8 @@ diff -ruN exercises/exercise-basic/injection2pproblem.hh exercises/solution/exer
@@ -1096,8 +1096,8 @@ diff -ruN exercises/exercise-basic/injection2pproblem.hh exercises/solution/exer
-
-
-#endif
-#endif
diff -ruN exercises/exercise-basic/params.input exercises/solution/exercise-basic/params.input
diff -ruN exercises/exercise-basic/params.input exercises/solution/exercise-basic/params.input
--- exercises/exercise-basic/params.input 2024-06-26 14:27:30.147478465 +0200
--- exercises/exercise-basic/params.input 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/params.input 2024-05-21 14:15:07.205555067 +0200
+++ exercises/solution/exercise-basic/params.input 2024-07-10 10:56:47.811814205 +0200
@@ -1,6 +1,6 @@
@@ -1,6 +1,6 @@
[TimeLoop]
[TimeLoop]
DtInitial = 3600 # in seconds
DtInitial = 3600 # in seconds
@@ -1119,7 +1119,7 @@ diff -ruN exercises/exercise-basic/params.input exercises/solution/exercise-basi
@@ -1119,7 +1119,7 @@ diff -ruN exercises/exercise-basic/params.input exercises/solution/exercise-basi
+SolidThermalConductivity = 2.8 # solid thermal conducitivity of granite
+SolidThermalConductivity = 2.8 # solid thermal conducitivity of granite
+SolidHeatCapacity = 790 # solid heat capacity of granite
+SolidHeatCapacity = 790 # solid heat capacity of granite
diff -ruN exercises/exercise-basic/properties2p2c.hh exercises/solution/exercise-basic/properties2p2c.hh
diff -ruN exercises/exercise-basic/properties2p2c.hh exercises/solution/exercise-basic/properties2p2c.hh
--- exercises/exercise-basic/properties2p2c.hh 2024-05-21 14:15:07.137554735 +0200
--- exercises/exercise-basic/properties2p2c.hh 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/properties2p2c.hh 1970-01-01 01:00:00.000000000 +0100
+++ exercises/solution/exercise-basic/properties2p2c.hh 1970-01-01 01:00:00.000000000 +0100
@@ -1,78 +0,0 @@
@@ -1,78 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -1201,7 +1201,7 @@ diff -ruN exercises/exercise-basic/properties2p2c.hh exercises/solution/exercise
@@ -1201,7 +1201,7 @@ diff -ruN exercises/exercise-basic/properties2p2c.hh exercises/solution/exercise
-
-
-#endif
-#endif
diff -ruN exercises/exercise-basic/properties2p.hh exercises/solution/exercise-basic/properties2p.hh
diff -ruN exercises/exercise-basic/properties2p.hh exercises/solution/exercise-basic/properties2p.hh
--- exercises/exercise-basic/properties2p.hh 2024-05-21 14:15:07.137554735 +0200
--- exercises/exercise-basic/properties2p.hh 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/properties2p.hh 1970-01-01 01:00:00.000000000 +0100
+++ exercises/solution/exercise-basic/properties2p.hh 1970-01-01 01:00:00.000000000 +0100
@@ -1,75 +0,0 @@
@@ -1,75 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -1280,8 +1280,8 @@ diff -ruN exercises/exercise-basic/properties2p.hh exercises/solution/exercise-b
@@ -1280,8 +1280,8 @@ diff -ruN exercises/exercise-basic/properties2p.hh exercises/solution/exercise-b
-
-
-#endif
-#endif
diff -ruN exercises/exercise-basic/properties2pni.hh exercises/solution/exercise-basic/properties2pni.hh
diff -ruN exercises/exercise-basic/properties2pni.hh exercises/solution/exercise-basic/properties2pni.hh
--- exercises/exercise-basic/properties2pni.hh 2024-06-26 14:27:30.147478465 +0200
--- exercises/exercise-basic/properties2pni.hh 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/properties2pni.hh 2024-05-21 14:15:07.205555067 +0200
+++ exercises/solution/exercise-basic/properties2pni.hh 2024-07-10 10:56:47.811814205 +0200
@@ -31,18 +31,14 @@
@@ -31,18 +31,14 @@
#include <dumux/porousmediumflow/2p/model.hh>
#include <dumux/porousmediumflow/2p/model.hh>
#include <dumux/material/fluidsystems/h2on2.hh>
#include <dumux/material/fluidsystems/h2on2.hh>
@@ -1315,7 +1315,7 @@ diff -ruN exercises/exercise-basic/properties2pni.hh exercises/solution/exercise
@@ -1315,7 +1315,7 @@ diff -ruN exercises/exercise-basic/properties2pni.hh exercises/solution/exercise
} // end namespace Dumux::Properties
} // end namespace Dumux::Properties
diff -ruN exercises/exercise-basic/README.md exercises/solution/exercise-basic/README.md
diff -ruN exercises/exercise-basic/README.md exercises/solution/exercise-basic/README.md
--- exercises/exercise-basic/README.md 2024-06-26 13:51:10.749132853 +0200
--- exercises/exercise-basic/README.md 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/README.md 1970-01-01 01:00:00.000000000 +0100
+++ exercises/solution/exercise-basic/README.md 1970-01-01 01:00:00.000000000 +0100
@@ -1,105 +0,0 @@
@@ -1,105 +0,0 @@
-# Exercise Basics (DuMuX course)
-# Exercise Basics (DuMuX course)
Loading