From b4cf8df6bf77da458dcc5a1cd79f54b2824b6f83 Mon Sep 17 00:00:00 2001
From: Lars von Wolff <lars.von-wolff@ians.uni-stuttgart.de>
Date: Tue, 19 Jan 2021 18:32:52 +0100
Subject: [PATCH] Cleaned up some includes
---
dune/phasefield/porenetwork/fem_1p_navierstokes.hh | 2 +-
dune/phasefield/porenetwork/pn_1pflow.hh | 1 +
src/pntest/pntest.cc | 12 +++++++-----
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/dune/phasefield/porenetwork/fem_1p_navierstokes.hh b/dune/phasefield/porenetwork/fem_1p_navierstokes.hh
index aa3294a..1f6c2c7 100644
--- a/dune/phasefield/porenetwork/fem_1p_navierstokes.hh
+++ b/dune/phasefield/porenetwork/fem_1p_navierstokes.hh
@@ -8,7 +8,7 @@
#include<dune/pdelab/localoperator/variablefactories.hh>
#include<dune/pdelab/gridfunctionspace/gridfunctionspace.hh>
-#include"fem_base_porenetwork.hh"
+#include<dune/phasefield/porenetwork/fem_base_porenetwork.hh>
diff --git a/dune/phasefield/porenetwork/pn_1pflow.hh b/dune/phasefield/porenetwork/pn_1pflow.hh
index fa1e81f..cac91ea 100644
--- a/dune/phasefield/porenetwork/pn_1pflow.hh
+++ b/dune/phasefield/porenetwork/pn_1pflow.hh
@@ -9,6 +9,7 @@
#include<dune/grid/io/file/vtk.hh>
#include<dune/pdelab/newton/newton.hh>
#include<dune/pdelab/common/functionutilities.hh>
+#include<dune/pdelab/finiteelementmap/pkfem.hh>
#include<dune/pdelab/function/callableadapter.hh>
#include <dune/phasefield/porenetwork/fem_1p_cahnhilliard_r.hh>
diff --git a/src/pntest/pntest.cc b/src/pntest/pntest.cc
index 2900352..d1a8d99 100644
--- a/src/pntest/pntest.cc
+++ b/src/pntest/pntest.cc
@@ -9,12 +9,7 @@
#include<dune/common/timer.hh>
#if HAVE_DUNE_ALUGRID
#include<dune/alugrid/grid.hh>
-#include<dune/alugrid/dgf.hh>
-#include<dune/grid/io/file/dgfparser/dgfparser.hh>
#endif
-// pdelab includes
-#include<dune/pdelab/finiteelementmap/pkfem.hh>
-#include<dune/pdelab/finiteelementmap/qkfem.hh>
// phasefield includes
#include<dune/phasefield/porenetwork/pn_1pflow.hh>
@@ -41,6 +36,7 @@ int main(int argc, char** argv)
ptreeparser.readINITree("pn1p.ini",ptree);
ptreeparser.readOptions(argc,argv,ptree);
+ // Define Template Options
typedef double RF;
typedef Params_fs_r< RF,
//DoubleWell_limited< RF, DoubleWell_poly<RF>, Limiter_FakeDiverging<RF> >,
@@ -51,10 +47,16 @@ int main(int argc, char** argv)
//VelDissipation_Quadratic_Shifted<RF>
> Parameters;
Parameters param(ptree);
+
+ //Set input/output filenamens
std::string GridFilename = ptree.get("domain.filename","square.msh");
std::string OutputFilename = ptree.get("output.filename","output");
+
+ //Create Simulation
Pn_1PFlow<Parameters> pn_1pFlow(GridFilename,OutputFilename,param);
+
+ //Example of usecase for Pn_1PFlow
std::cout << "Kf = " << pn_1pFlow.getKf() << " phiSolid = " << pn_1pFlow.getPhiSolid() << std::endl;
pn_1pFlow.writeVTK(0.0);
pn_1pFlow.grow(0.2);
--
GitLab