From 31516a22b2add1a97958eb542a2e6fb151d3a210 Mon Sep 17 00:00:00 2001
From: Alexander Jaust <alexander.jaust@ipvs.uni-stuttgart.de>
Date: Wed, 12 Jun 2019 12:53:36 +0200
Subject: [PATCH] moved precice-adapter into separate submodule and adapted
ff-pm coupling accordingly
---
.gitmodules | 3 +++
appl/coupling-ff-pm/iterative/CMakeLists.txt | 4 ++--
appl/coupling-ff-pm/iterative/main_ff.cc | 8 ++++----
appl/coupling-ff-pm/iterative/main_pm.cc | 8 ++++----
appl/coupling-ff-pm/monolithic/ffproblem.hh | 2 +-
appl/coupling-ff-pm/monolithic/pmproblem.hh | 2 +-
appl/precice-adapter | 1 +
7 files changed, 16 insertions(+), 12 deletions(-)
create mode 100644 .gitmodules
create mode 160000 appl/precice-adapter
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..3495399
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "appl/precice-adapter"]
+ path = appl/precice-adapter
+ url = git@gitlab-sgs.informatik.uni-stuttgart.de:jaustar/dumux-precice-wrapper.git
diff --git a/appl/coupling-ff-pm/iterative/CMakeLists.txt b/appl/coupling-ff-pm/iterative/CMakeLists.txt
index bc25cc0..c7f1369 100644
--- a/appl/coupling-ff-pm/iterative/CMakeLists.txt
+++ b/appl/coupling-ff-pm/iterative/CMakeLists.txt
@@ -11,8 +11,8 @@ find_package(Boost 1.65.1 REQUIRED COMPONENTS log system) #Require same version
# SOURCES main_pm.cc ../precice/preciceadapter.cc ../precice/dumuxpreciceindexwrapper.cc
# COMPILE_DEFINITIONS ENABLEMONOLITHIC=0)
-add_executable(test_ff EXCLUDE_FROM_ALL main_ff.cc ../precice/preciceadapter.cc ../precice/dumuxpreciceindexwrapper.cc)
-add_executable(test_pm EXCLUDE_FROM_ALL main_pm.cc ../precice/preciceadapter.cc ../precice/dumuxpreciceindexwrapper.cc)
+add_executable(test_ff EXCLUDE_FROM_ALL main_ff.cc ../../precice-adapter/src/preciceadapter.cc ../../precice-adapter/src/dumuxpreciceindexwrapper.cc)
+add_executable(test_pm EXCLUDE_FROM_ALL main_pm.cc ../../precice-adapter/src/preciceadapter.cc ../../precice-adapter/src/dumuxpreciceindexwrapper.cc)
target_compile_definitions(test_ff PUBLIC "ENABLEMONOLITHIC=0")
target_compile_definitions(test_pm PUBLIC "ENABLEMONOLITHIC=0")
diff --git a/appl/coupling-ff-pm/iterative/main_ff.cc b/appl/coupling-ff-pm/iterative/main_ff.cc
index 31e5f0b..30e58b7 100644
--- a/appl/coupling-ff-pm/iterative/main_ff.cc
+++ b/appl/coupling-ff-pm/iterative/main_ff.cc
@@ -47,7 +47,7 @@
#include "../monolithic/ffproblem.hh"
-#include "../precice/preciceadapter.hh"
+#include "../../precice-adapter/include/preciceadapter.hh"
//TODO
// Helper function to put pressure on interface
@@ -258,9 +258,9 @@ int main(int argc, char** argv) try
{
//Read checkpoint
sol = sol_checkpoint;
- //freeFlowGridVariables->update(sol);
- //freeFlowGridVariables->advanceTimeStep();
- freeFlowGridVariables->init(sol);
+ freeFlowGridVariables->update(sol);
+ freeFlowGridVariables->advanceTimeStep();
+ //freeFlowGridVariables->init(sol);
couplingInterface.announceIterationCheckpointRead();
}
else // coupling successful
diff --git a/appl/coupling-ff-pm/iterative/main_pm.cc b/appl/coupling-ff-pm/iterative/main_pm.cc
index 225ed24..f96b9e1 100644
--- a/appl/coupling-ff-pm/iterative/main_pm.cc
+++ b/appl/coupling-ff-pm/iterative/main_pm.cc
@@ -52,7 +52,7 @@
#include "../monolithic/pmproblem.hh"
-#include "../precice/preciceadapter.hh"
+#include "../../precice-adapter/include/preciceadapter.hh"
/*!
* \brief Returns the pressure at the interface using Darcy's law for reconstruction
@@ -278,9 +278,9 @@ int main(int argc, char** argv) try
{
//Read checkpoint
sol = sol_checkpoint;
- //darcyGridVariables->update(sol);
- //darcyGridVariables->advanceTimeStep();
- darcyGridVariables->init(sol);
+ darcyGridVariables->update(sol);
+ darcyGridVariables->advanceTimeStep();
+ //darcyGridVariables->init(sol);
couplingInterface.announceIterationCheckpointRead();
}
else // coupling successful
diff --git a/appl/coupling-ff-pm/monolithic/ffproblem.hh b/appl/coupling-ff-pm/monolithic/ffproblem.hh
index 130bcc1..1642fac 100644
--- a/appl/coupling-ff-pm/monolithic/ffproblem.hh
+++ b/appl/coupling-ff-pm/monolithic/ffproblem.hh
@@ -36,7 +36,7 @@
#include <dumux/discretization/staggered/freeflow/properties.hh>
#include <dumux/freeflow/navierstokes/model.hh>
-#include "../precice/preciceadapter.hh"
+#include "../../precice-adapter/include/preciceadapter.hh"
namespace Dumux
{
diff --git a/appl/coupling-ff-pm/monolithic/pmproblem.hh b/appl/coupling-ff-pm/monolithic/pmproblem.hh
index 7ed57e3..c097246 100644
--- a/appl/coupling-ff-pm/monolithic/pmproblem.hh
+++ b/appl/coupling-ff-pm/monolithic/pmproblem.hh
@@ -43,7 +43,7 @@
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
-#include "../precice/preciceadapter.hh"
+#include "../../precice-adapter/include/preciceadapter.hh"
namespace Dumux
{
diff --git a/appl/precice-adapter b/appl/precice-adapter
new file mode 160000
index 0000000..e3831bc
--- /dev/null
+++ b/appl/precice-adapter
@@ -0,0 +1 @@
+Subproject commit e3831bc787ebf9dfae27c88a7c0492af1ec1391b
--
GitLab