Commit 7f47b54a authored by Roman Winter's avatar Roman Winter
Browse files

[cleanup] removed try and add boundarytypes

parent eaa37d6b
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
//////////////////////// ////////////////////////
// the main function // the main function
//////////////////////// ////////////////////////
int main(int argc, char** argv) try int main(int argc, char** argv)
{ {
using namespace Dumux; using namespace Dumux;
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
//////////////////////// ////////////////////////
// the main function // the main function
//////////////////////// ////////////////////////
int main(int argc, char** argv) try int main(int argc, char** argv)
{ {
using namespace Dumux; using namespace Dumux;
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#define DUMUX_EX_BASIC_PROBLEM_2P2C_HH #define DUMUX_EX_BASIC_PROBLEM_2P2C_HH
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/binarycoefficients/h2o_n2.hh> #include <dumux/material/binarycoefficients/h2o_n2.hh>
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#define DUMUX_EX_BASIC_PROBLEM_2PNI_HH #define DUMUX_EX_BASIC_PROBLEM_2PNI_HH
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux { namespace Dumux {
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#define DUMUX_EX_BASIC_PROBLEM_2P_HH #define DUMUX_EX_BASIC_PROBLEM_2P_HH
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux { namespace Dumux {
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#define DUMUX_EXERCISE_FOUR_PROBLEM_HH #define DUMUX_EXERCISE_FOUR_PROBLEM_HH
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
// TODO: dumux-course-task // TODO: dumux-course-task
......
...@@ -332,20 +332,14 @@ public: ...@@ -332,20 +332,14 @@ public:
// assume brine with viscosity effect of Ca for the liquid phase. // assume brine with viscosity effect of Ca for the liquid phase.
if (phaseIdx == liquidPhaseIdx) if (phaseIdx == liquidPhaseIdx)
{
return Brine::liquidViscosity(temperature, pressure); return Brine::liquidViscosity(temperature, pressure);
}
// assume pure CO2 for the gas phase. // assume pure CO2 for the gas phase.
else if (phaseIdx == gasPhaseIdx) else if (phaseIdx == gasPhaseIdx)
{
return CO2::gasViscosity(temperature, pressure); return CO2::gasViscosity(temperature, pressure);
}
else else
{
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx); DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
} }
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
//////////////////////// ////////////////////////
// the main function // the main function
//////////////////////// ////////////////////////
int main(int argc, char** argv) try int main(int argc, char** argv)
{ {
using namespace Dumux; using namespace Dumux;
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <dumux/freeflow/navierstokes/problem.hh> #include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
namespace Dumux { namespace Dumux {
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#include "properties.hh" #include "properties.hh"
int main(int argc, char** argv) try int main(int argc, char** argv)
{ {
using namespace Dumux; using namespace Dumux;
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
namespace Dumux { namespace Dumux {
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#define DUMUX_STOKES1P2C_SUBPROBLEM_HH #define DUMUX_STOKES1P2C_SUBPROBLEM_HH
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/timeloop.hh> #include <dumux/common/timeloop.hh>
#include <dumux/freeflow/navierstokes/problem.hh> #include <dumux/freeflow/navierstokes/problem.hh>
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#include "properties.hh" #include "properties.hh"
int main(int argc, char** argv) try int main(int argc, char** argv)
{ {
using namespace Dumux; using namespace Dumux;
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#define DUMUX_DARCY_SUBPROBLEM_HH #define DUMUX_DARCY_SUBPROBLEM_HH
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/timeloop.hh> #include <dumux/common/timeloop.hh>
#include <dumux/io/gnuplotinterface.hh> #include <dumux/io/gnuplotinterface.hh>
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#define DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH #define DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/timeloop.hh> #include <dumux/common/timeloop.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh> #include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#include "properties.hh" #include "properties.hh"
int main(int argc, char** argv) try int main(int argc, char** argv)
{ {
using namespace Dumux; using namespace Dumux;
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#define DUMUX_DARCY2P2C_SUBPROBLEM_HH #define DUMUX_DARCY2P2C_SUBPROBLEM_HH
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh> #include <dumux/common/timeloop.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh> #include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
// The base porous media box problem // The base porous media box problem
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
namespace Dumux { namespace Dumux {
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
// The porous media base problem // The porous media base problem
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
// The water component // The water component
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
//////////////////////// ////////////////////////
// the main function // the main function
//////////////////////// ////////////////////////
int main(int argc, char** argv) try int main(int argc, char** argv)
{ {
using namespace Dumux; using namespace Dumux;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment