From 4f5d91a424f1ad906d2f80a2ccc5d3c4ecb33417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20He=C3=9F?= <rene.hess@iwr.uni-heidelberg.de>
Date: Fri, 27 Oct 2017 13:12:06 +0200
Subject: [PATCH] [WIP] Taylor green still broken but exactly like generated
code
---
test/navier-stokes/howto/dgstokes.cc | 4 ++--
test/navier-stokes/howto/taylor-green.cc | 16 ++++++++++++----
test/navier-stokes/howto/taylor-green.ini | 2 +-
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/test/navier-stokes/howto/dgstokes.cc b/test/navier-stokes/howto/dgstokes.cc
index 1175c58c..6b560503 100644
--- a/test/navier-stokes/howto/dgstokes.cc
+++ b/test/navier-stokes/howto/dgstokes.cc
@@ -132,10 +132,10 @@ void stokes (const GV& gv, const Dune::ParameterTree& configuration, std::string
using V = Dune::PDELab::Backend::Vector<GFS,RF>;
V x(gfs);
- typedef BCTypeParamGlobalDirichlet BType;
- BType b;
typedef ZeroVectorFunction<ES,RF,dim> FType;
FType f(es);
+ typedef BCTypeParamGlobalDirichlet BType;
+ BType b;
typedef HagenPoiseuilleVelocityBox<ES,RF,dim> VType;
VType v(es);
typedef ZeroScalarFunction<ES,RF> PType;
diff --git a/test/navier-stokes/howto/taylor-green.cc b/test/navier-stokes/howto/taylor-green.cc
index 29cca4bc..074f8025 100644
--- a/test/navier-stokes/howto/taylor-green.cc
+++ b/test/navier-stokes/howto/taylor-green.cc
@@ -37,6 +37,7 @@
#include "dune/grid/io/file/vtk/vtksequencewriter.hh"
#include "taylor-green.hh"
+#include "/home/rene/phd/dune-les/build-optimized-clang38-python3/dune-perftool/test/navier-stokes/navierstokes_2d_dg_quadrilateral_symdiff_operator.hh"
#define PERIODIC
@@ -81,7 +82,6 @@ void taylor_green (const GV& gv, const Dune::ParameterTree& configuration, std::
// constraints
#ifdef PERIODIC
using Con = Dune::PDELab::P0ParallelConstraints;
- Con con;
#else
using Con = Dune::PDELab::NoConstraints;
#endif
@@ -132,10 +132,10 @@ void taylor_green (const GV& gv, const Dune::ParameterTree& configuration, std::
std::cout << "cc with " << cc.size() << " dofs generated "<< std::endl;
// Parameter functions
- using BType = BCTypeParamGlobalDirichlet;
- BType b;
using FType = ZeroVectorFunction<ES,RF,dim>;
FType f(es);
+ using BType = BCTypeParamGlobalDirichlet;
+ BType b;
using VType = TaylorGreenVelocity<ES,RF,dim>;
VType v(es);
using PType = TaylorGreenPressure<ES,RF>;
@@ -149,10 +149,18 @@ void taylor_green (const GV& gv, const Dune::ParameterTree& configuration, std::
using LOP = Dune::PDELab::DGNavierStokes<LOP_Parameters>;
const int superintegration_order = 0;
LOP lop(lop_parameters,superintegration_order);
-
using LOP_M = Dune::PDELab::NavierStokesMass<LOP_Parameters>;
LOP_M lop_m(lop_parameters,1);
+ // Dune::ParameterTree initree;
+ // Dune::ParameterTreeParser::readINITree("palpo.ini", initree);
+ // using LOP = LocalOperatorR<GFS,GFS,RF>;
+ // LocalOperatorRParams params_r;
+ // LOP lop(gfs,gfs, initree, params_r);
+ // using LOP_M = LocalOperatorMass<GFS,GFS,RF>;
+ // LocalOperatorMassParams params_mass;
+ // LOP_M lop_m(gfs,gfs, initree, params_mass);
+
// Grid operator
using MBE = Dune::PDELab::istl::BCRSMatrixBackend<>;
MBE mbe(75); // Maximal number of nonzeroes per row can be cross-checked by patternStatistics().
diff --git a/test/navier-stokes/howto/taylor-green.ini b/test/navier-stokes/howto/taylor-green.ini
index e88e6a06..15113f38 100644
--- a/test/navier-stokes/howto/taylor-green.ini
+++ b/test/navier-stokes/howto/taylor-green.ini
@@ -2,7 +2,7 @@
[parameters]
rho = 1.0
-mu = 1.0
+mu = 0.01
[parameters.dg]
epsilon = -1
sigma = 1.0
--
GitLab