From 49499d20847d2558af127ec6807418d0319732c1 Mon Sep 17 00:00:00 2001
From: Lisa Julia Nebel <lisa_julia.nebel@tu-dresden.de>
Date: Thu, 26 Oct 2023 19:27:01 +0200
Subject: [PATCH] Move assembler-files into a separate assembler folder
---
CHANGELOG.md | 3 +++
dune/gfe/CMakeLists.txt | 1 +
dune/gfe/assemblers/CMakeLists.txt | 25 +++++++++++++++++++
.../{ => assemblers}/chiralskyrmionenergy.hh | 2 +-
.../cosseratenergystiffness.hh | 6 ++---
.../gfe/{ => assemblers}/cosseratrodenergy.hh | 2 +-
.../{ => assemblers}/geodesicfeassembler.hh | 0
.../geodesicfeassemblerwrapper.hh | 2 +-
dune/gfe/{ => assemblers}/harmonicenergy.hh | 2 +-
.../l2distancesquaredenergy.hh | 2 +-
dune/gfe/{ => assemblers}/localenergy.hh | 0
.../{ => assemblers}/localfirstordermodel.hh | 2 +-
.../localgeodesicfeadolcstiffness.hh | 4 +--
.../localgeodesicfefdstiffness.hh | 2 +-
.../localgeodesicfestiffness.hh | 2 +-
.../{ => assemblers}/localintegralenergy.hh | 2 +-
.../gfe/{ => assemblers}/mixedgfeassembler.hh | 2 +-
.../mixedlocalgeodesicfestiffness.hh | 0
.../mixedlocalgfeadolcstiffness.hh | 2 +-
.../nonplanarcosseratshellenergy.hh | 6 ++---
dune/gfe/{ => assemblers}/simofoxenergy.hh | 4 +--
dune/gfe/{ => assemblers}/sumenergy.hh | 4 +--
.../{ => assemblers}/surfacecosseratenergy.hh | 4 +--
.../surfacecosseratstressassembler.hh | 0
.../gfe/{ => assemblers}/weightedsumenergy.hh | 2 +-
dune/gfe/mixedriemanniantrsolver.hh | 2 +-
dune/gfe/riemanniantrsolver.hh | 2 +-
src/cosserat-continuum.cc | 12 ++++-----
src/film-on-substrate-stress-plot.cc | 2 +-
src/film-on-substrate.cc | 12 ++++-----
src/gradient-flow.cc | 10 ++++----
src/harmonicmaps.cc | 8 +++---
src/rod3d.cc | 6 ++---
src/simofoxshell.cc | 8 +++---
test/adolctest-scalar-and-vector-mode.cc | 10 ++++----
test/adolctest.cc | 8 +++---
test/cosseratenergytest.cc | 2 +-
test/cosseratrodenergytest.cc | 2 +-
test/cosseratrodtest.cc | 4 +--
test/geodesicfeassemblerwrappertest.cc | 14 +++++------
test/harmonicenergytest.cc | 2 +-
test/harmonicmaptest.cc | 6 ++---
test/nonplanarcosseratenergytest.cc | 2 +-
test/surfacecosseratstressassemblertest.cc | 2 +-
44 files changed, 112 insertions(+), 83 deletions(-)
create mode 100644 dune/gfe/assemblers/CMakeLists.txt
rename dune/gfe/{ => assemblers}/chiralskyrmionenergy.hh (99%)
rename dune/gfe/{ => assemblers}/cosseratenergystiffness.hh (99%)
rename dune/gfe/{ => assemblers}/cosseratrodenergy.hh (99%)
rename dune/gfe/{ => assemblers}/geodesicfeassembler.hh (100%)
rename dune/gfe/{ => assemblers}/geodesicfeassemblerwrapper.hh (99%)
rename dune/gfe/{ => assemblers}/harmonicenergy.hh (98%)
rename dune/gfe/{ => assemblers}/l2distancesquaredenergy.hh (98%)
rename dune/gfe/{ => assemblers}/localenergy.hh (100%)
rename dune/gfe/{ => assemblers}/localfirstordermodel.hh (93%)
rename dune/gfe/{ => assemblers}/localgeodesicfeadolcstiffness.hh (99%)
rename dune/gfe/{ => assemblers}/localgeodesicfefdstiffness.hh (99%)
rename dune/gfe/{ => assemblers}/localgeodesicfestiffness.hh (97%)
rename dune/gfe/{ => assemblers}/localintegralenergy.hh (98%)
rename dune/gfe/{ => assemblers}/mixedgfeassembler.hh (99%)
rename dune/gfe/{ => assemblers}/mixedlocalgeodesicfestiffness.hh (100%)
rename dune/gfe/{ => assemblers}/mixedlocalgfeadolcstiffness.hh (99%)
rename dune/gfe/{ => assemblers}/nonplanarcosseratshellenergy.hh (99%)
rename dune/gfe/{ => assemblers}/simofoxenergy.hh (99%)
rename dune/gfe/{ => assemblers}/sumenergy.hh (94%)
rename dune/gfe/{ => assemblers}/surfacecosseratenergy.hh (99%)
rename dune/gfe/{ => assemblers}/surfacecosseratstressassembler.hh (100%)
rename dune/gfe/{ => assemblers}/weightedsumenergy.hh (96%)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26d0bd10..6fcba588 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
# Master
+- All files that implement assemblers have been moved to the
+ `assemblers` subdirectory.
+
- All files that implement target spaces have been moved to the
`spaces` subdirectory.
diff --git a/dune/gfe/CMakeLists.txt b/dune/gfe/CMakeLists.txt
index 52fdc576..45eb2012 100644
--- a/dune/gfe/CMakeLists.txt
+++ b/dune/gfe/CMakeLists.txt
@@ -2,3 +2,4 @@
install(FILES gfe.hh DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/gfe)
add_subdirectory("spaces")
+add_subdirectory("assemblers")
\ No newline at end of file
diff --git a/dune/gfe/assemblers/CMakeLists.txt b/dune/gfe/assemblers/CMakeLists.txt
new file mode 100644
index 00000000..a890d6ab
--- /dev/null
+++ b/dune/gfe/assemblers/CMakeLists.txt
@@ -0,0 +1,25 @@
+#install headers
+install(FILES
+ chiralskyrmionenergy.hh
+ cosseratenergystiffness.hh
+ cosseratrodenergy.hh
+ geodesicfeassembler.hh
+ geodesicfeassemblerwrapper.hh
+ harmonicenergy.hh
+ l2distancesquaredenergy.hh
+ localenergy.hh
+ localfirstordermodel.hh
+ localgeodesicfeadolcstiffness.hh
+ localgeodesicfefdstiffness.hh
+ localgeodesicfestiffness.hh
+ localintegralenergy.hh
+ mixedgfeassembler.hh
+ mixedlocalgeodesicfestiffness.hh
+ mixedlocalgfeadolcstiffness.hh
+ nonplanarcosseratshellenergy.hh
+ simofoxenergy.hh
+ sumenergy.hh
+ surfacecosseratenergy.hh
+ surfacecosseratstressassembler.hh
+ weightedsumenergy.hh
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/gfe/assemblers)
diff --git a/dune/gfe/chiralskyrmionenergy.hh b/dune/gfe/assemblers/chiralskyrmionenergy.hh
similarity index 99%
rename from dune/gfe/chiralskyrmionenergy.hh
rename to dune/gfe/assemblers/chiralskyrmionenergy.hh
index 69b4b7e2..059fa068 100644
--- a/dune/gfe/chiralskyrmionenergy.hh
+++ b/dune/gfe/assemblers/chiralskyrmionenergy.hh
@@ -4,7 +4,7 @@
#include <dune/common/fmatrix.hh>
#include <dune/geometry/quadraturerules.hh>
-#include <dune/gfe/localenergy.hh>
+#include <dune/gfe/assemblers/localenergy.hh>
namespace Dune {
diff --git a/dune/gfe/cosseratenergystiffness.hh b/dune/gfe/assemblers/cosseratenergystiffness.hh
similarity index 99%
rename from dune/gfe/cosseratenergystiffness.hh
rename to dune/gfe/assemblers/cosseratenergystiffness.hh
index 4c1883ee..4e5eceee 100644
--- a/dune/gfe/cosseratenergystiffness.hh
+++ b/dune/gfe/assemblers/cosseratenergystiffness.hh
@@ -13,12 +13,12 @@
#include <dune/matrix-vector/transpose.hh>
#endif
-#include <dune/gfe/localenergy.hh>
-#include <dune/gfe/mixedlocalgeodesicfestiffness.hh>
+#include <dune/gfe/assemblers/localenergy.hh>
+#include <dune/gfe/assemblers/mixedlocalgeodesicfestiffness.hh>
#ifdef PROJECTED_INTERPOLATION
#include <dune/gfe/localprojectedfefunction.hh>
#else
-#include "localgeodesicfefunction.hh"
+#include <dune/gfe/localgeodesicfefunction.hh>
#endif
#include <dune/gfe/tensor3.hh>
#include <dune/gfe/cosseratstrain.hh>
diff --git a/dune/gfe/cosseratrodenergy.hh b/dune/gfe/assemblers/cosseratrodenergy.hh
similarity index 99%
rename from dune/gfe/cosseratrodenergy.hh
rename to dune/gfe/assemblers/cosseratrodenergy.hh
index be436f1d..11707523 100644
--- a/dune/gfe/cosseratrodenergy.hh
+++ b/dune/gfe/assemblers/cosseratrodenergy.hh
@@ -16,7 +16,7 @@
#include <dune/fufem/boundarypatch.hh>
-#include <dune/gfe/localenergy.hh>
+#include <dune/gfe/assemblers/localenergy.hh>
#include <dune/gfe/spaces/rigidbodymotion.hh>
namespace Dune::GFE {
diff --git a/dune/gfe/geodesicfeassembler.hh b/dune/gfe/assemblers/geodesicfeassembler.hh
similarity index 100%
rename from dune/gfe/geodesicfeassembler.hh
rename to dune/gfe/assemblers/geodesicfeassembler.hh
diff --git a/dune/gfe/geodesicfeassemblerwrapper.hh b/dune/gfe/assemblers/geodesicfeassemblerwrapper.hh
similarity index 99%
rename from dune/gfe/geodesicfeassemblerwrapper.hh
rename to dune/gfe/assemblers/geodesicfeassemblerwrapper.hh
index 5b2ad650..3294bb50 100644
--- a/dune/gfe/geodesicfeassemblerwrapper.hh
+++ b/dune/gfe/assemblers/geodesicfeassemblerwrapper.hh
@@ -1,7 +1,7 @@
#ifndef GLOBAL_GEODESIC_FE_ASSEMBLERWRAPPER_HH
#define GLOBAL_GEODESIC_FE_ASSEMBLERWRAPPER_HH
-#include <dune/gfe/mixedgfeassembler.hh>
+#include <dune/gfe/assemblers/mixedgfeassembler.hh>
#include <dune/common/tuplevector.hh>
#include <dune/gfe/spaces/productmanifold.hh>
#include <dune/gfe/spaces/rigidbodymotion.hh>
diff --git a/dune/gfe/harmonicenergy.hh b/dune/gfe/assemblers/harmonicenergy.hh
similarity index 98%
rename from dune/gfe/harmonicenergy.hh
rename to dune/gfe/assemblers/harmonicenergy.hh
index eaa0421d..f157a319 100644
--- a/dune/gfe/harmonicenergy.hh
+++ b/dune/gfe/assemblers/harmonicenergy.hh
@@ -4,7 +4,7 @@
#include <dune/common/fmatrix.hh>
#include <dune/geometry/quadraturerules.hh>
-#include <dune/gfe/localenergy.hh>
+#include <dune/gfe/assemblers/localenergy.hh>
template<class Basis, class LocalInterpolationRule, class TargetSpace>
class HarmonicEnergy
diff --git a/dune/gfe/l2distancesquaredenergy.hh b/dune/gfe/assemblers/l2distancesquaredenergy.hh
similarity index 98%
rename from dune/gfe/l2distancesquaredenergy.hh
rename to dune/gfe/assemblers/l2distancesquaredenergy.hh
index 05e460c9..46d526bc 100644
--- a/dune/gfe/l2distancesquaredenergy.hh
+++ b/dune/gfe/assemblers/l2distancesquaredenergy.hh
@@ -6,7 +6,7 @@
#include <dune/geometry/quadraturerules.hh>
#include <dune/gfe/globalgfefunction.hh>
-#include <dune/gfe/localenergy.hh>
+#include <dune/gfe/assemblers/localenergy.hh>
#include <dune/gfe/localgeodesicfefunction.hh>
template<class Basis, class TargetSpace>
diff --git a/dune/gfe/localenergy.hh b/dune/gfe/assemblers/localenergy.hh
similarity index 100%
rename from dune/gfe/localenergy.hh
rename to dune/gfe/assemblers/localenergy.hh
diff --git a/dune/gfe/localfirstordermodel.hh b/dune/gfe/assemblers/localfirstordermodel.hh
similarity index 93%
rename from dune/gfe/localfirstordermodel.hh
rename to dune/gfe/assemblers/localfirstordermodel.hh
index ad5c1903..3c937e8a 100644
--- a/dune/gfe/localfirstordermodel.hh
+++ b/dune/gfe/assemblers/localfirstordermodel.hh
@@ -1,7 +1,7 @@
#ifndef DUNE_GFE_LOCALFIRSTORDERMODEL_HH
#define DUNE_GFE_LOCALFIRSTORDERMODEL_HH
-#include <dune/gfe/localenergy.hh>
+#include <dune/gfe/assemblers/localenergy.hh>
namespace Dune {
diff --git a/dune/gfe/localgeodesicfeadolcstiffness.hh b/dune/gfe/assemblers/localgeodesicfeadolcstiffness.hh
similarity index 99%
rename from dune/gfe/localgeodesicfeadolcstiffness.hh
rename to dune/gfe/assemblers/localgeodesicfeadolcstiffness.hh
index 4b5382c2..3727c6d5 100644
--- a/dune/gfe/localgeodesicfeadolcstiffness.hh
+++ b/dune/gfe/assemblers/localgeodesicfeadolcstiffness.hh
@@ -12,8 +12,8 @@
#include <dune/common/fmatrix.hh>
#include <dune/istl/matrix.hh>
-#include <dune/gfe/localenergy.hh>
-#include <dune/gfe/localgeodesicfestiffness.hh>
+#include <dune/gfe/assemblers/localenergy.hh>
+#include <dune/gfe/assemblers/localgeodesicfestiffness.hh>
/** \brief Assembles energy gradient and Hessian with ADOL-C (automatic differentiation)
*/
diff --git a/dune/gfe/localgeodesicfefdstiffness.hh b/dune/gfe/assemblers/localgeodesicfefdstiffness.hh
similarity index 99%
rename from dune/gfe/localgeodesicfefdstiffness.hh
rename to dune/gfe/assemblers/localgeodesicfefdstiffness.hh
index 61d3cd25..5eaa6094 100644
--- a/dune/gfe/localgeodesicfefdstiffness.hh
+++ b/dune/gfe/assemblers/localgeodesicfefdstiffness.hh
@@ -4,7 +4,7 @@
#include <dune/common/fmatrix.hh>
#include <dune/istl/matrix.hh>
-#include <dune/gfe/localgeodesicfestiffness.hh>
+#include <dune/gfe/assemblers/localgeodesicfestiffness.hh>
/** \brief Assembles energy gradient and Hessian with finite difference approximations
*/
diff --git a/dune/gfe/localgeodesicfestiffness.hh b/dune/gfe/assemblers/localgeodesicfestiffness.hh
similarity index 97%
rename from dune/gfe/localgeodesicfestiffness.hh
rename to dune/gfe/assemblers/localgeodesicfestiffness.hh
index ff3d17ab..a916fbdb 100644
--- a/dune/gfe/localgeodesicfestiffness.hh
+++ b/dune/gfe/assemblers/localgeodesicfestiffness.hh
@@ -4,7 +4,7 @@
#include <dune/common/fmatrix.hh>
#include <dune/istl/matrix.hh>
-#include <dune/gfe/localfirstordermodel.hh>
+#include <dune/gfe/assemblers/localfirstordermodel.hh>
template<class Basis, class TargetSpace>
class LocalGeodesicFEStiffness
diff --git a/dune/gfe/localintegralenergy.hh b/dune/gfe/assemblers/localintegralenergy.hh
similarity index 98%
rename from dune/gfe/localintegralenergy.hh
rename to dune/gfe/assemblers/localintegralenergy.hh
index 30cbd6ee..05c4ed32 100644
--- a/dune/gfe/localintegralenergy.hh
+++ b/dune/gfe/assemblers/localintegralenergy.hh
@@ -6,7 +6,7 @@
#include <dune/geometry/quadraturerules.hh>
-#include <dune/gfe/localenergy.hh>
+#include <dune/gfe/assemblers/localenergy.hh>
#include <dune/gfe/spaces/realtuple.hh>
#include <dune/gfe/spaces/rigidbodymotion.hh>
diff --git a/dune/gfe/mixedgfeassembler.hh b/dune/gfe/assemblers/mixedgfeassembler.hh
similarity index 99%
rename from dune/gfe/mixedgfeassembler.hh
rename to dune/gfe/assemblers/mixedgfeassembler.hh
index a2bf0432..fe7b1f5b 100644
--- a/dune/gfe/mixedgfeassembler.hh
+++ b/dune/gfe/assemblers/mixedgfeassembler.hh
@@ -7,7 +7,7 @@
#include <dune/istl/matrix.hh>
#include <dune/istl/multitypeblockmatrix.hh>
-#include <dune/gfe/mixedlocalgeodesicfestiffness.hh>
+#include <dune/gfe/assemblers/mixedlocalgeodesicfestiffness.hh>
/** \brief A global FE assembler for problems involving functions that map into non-Euclidean spaces
diff --git a/dune/gfe/mixedlocalgeodesicfestiffness.hh b/dune/gfe/assemblers/mixedlocalgeodesicfestiffness.hh
similarity index 100%
rename from dune/gfe/mixedlocalgeodesicfestiffness.hh
rename to dune/gfe/assemblers/mixedlocalgeodesicfestiffness.hh
diff --git a/dune/gfe/mixedlocalgfeadolcstiffness.hh b/dune/gfe/assemblers/mixedlocalgfeadolcstiffness.hh
similarity index 99%
rename from dune/gfe/mixedlocalgfeadolcstiffness.hh
rename to dune/gfe/assemblers/mixedlocalgfeadolcstiffness.hh
index 92607e32..73265796 100644
--- a/dune/gfe/mixedlocalgfeadolcstiffness.hh
+++ b/dune/gfe/assemblers/mixedlocalgfeadolcstiffness.hh
@@ -12,7 +12,7 @@
#include <dune/common/fmatrix.hh>
#include <dune/istl/matrix.hh>
-#include <dune/gfe/mixedlocalgeodesicfestiffness.hh>
+#include <dune/gfe/assemblers/mixedlocalgeodesicfestiffness.hh>
/** \brief Assembles energy gradient and Hessian with ADOL-C (automatic differentiation)
*/
diff --git a/dune/gfe/nonplanarcosseratshellenergy.hh b/dune/gfe/assemblers/nonplanarcosseratshellenergy.hh
similarity index 99%
rename from dune/gfe/nonplanarcosseratshellenergy.hh
rename to dune/gfe/assemblers/nonplanarcosseratshellenergy.hh
index 33bd23c8..bd5385d3 100644
--- a/dune/gfe/nonplanarcosseratshellenergy.hh
+++ b/dune/gfe/assemblers/nonplanarcosseratshellenergy.hh
@@ -15,12 +15,12 @@
#include <dune/gmsh4/gridcreators/lagrangegridcreator.hh>
#endif
-#include <dune/gfe/cosseratenergystiffness.hh>
-#include <dune/gfe/localenergy.hh>
+#include <dune/gfe/assemblers/cosseratenergystiffness.hh>
+#include <dune/gfe/assemblers/localenergy.hh>
#include <dune/gfe/localgeodesicfefunction.hh>
#include <dune/gfe/tensor3.hh>
#include <dune/gfe/localprojectedfefunction.hh>
-#include <dune/gfe/mixedlocalgfeadolcstiffness.hh>
+#include <dune/gfe/assemblers/mixedlocalgfeadolcstiffness.hh>
#include <dune/gfe/spaces/rigidbodymotion.hh>
#include <dune/gfe/spaces/unitvector.hh>
diff --git a/dune/gfe/simofoxenergy.hh b/dune/gfe/assemblers/simofoxenergy.hh
similarity index 99%
rename from dune/gfe/simofoxenergy.hh
rename to dune/gfe/assemblers/simofoxenergy.hh
index 33f533ca..80fbcf21 100644
--- a/dune/gfe/simofoxenergy.hh
+++ b/dune/gfe/assemblers/simofoxenergy.hh
@@ -10,8 +10,8 @@
#include <dune/fufem/boundarypatch.hh>
#include <dune/geometry/quadraturerules.hh>
#include <dune/gfe/linearalgebra.hh>
-#include <dune/gfe/localenergy.hh>
-#include <dune/gfe/mixedlocalgeodesicfestiffness.hh>
+#include <dune/gfe/assemblers/localenergy.hh>
+#include <dune/gfe/assemblers/mixedlocalgeodesicfestiffness.hh>
#include <dune/gfe/spaces/realtuple.hh>
#include <dune/gfe/spaces/unitvector.hh>
diff --git a/dune/gfe/sumenergy.hh b/dune/gfe/assemblers/sumenergy.hh
similarity index 94%
rename from dune/gfe/sumenergy.hh
rename to dune/gfe/assemblers/sumenergy.hh
index d5074c6f..a7765747 100644
--- a/dune/gfe/sumenergy.hh
+++ b/dune/gfe/assemblers/sumenergy.hh
@@ -3,8 +3,8 @@
#include <vector>
-#include <dune/gfe/localenergy.hh>
-#include <dune/gfe/mixedlocalgeodesicfestiffness.hh>
+#include <dune/gfe/assemblers/localenergy.hh>
+#include <dune/gfe/assemblers/mixedlocalgeodesicfestiffness.hh>
namespace Dune::GFE {
diff --git a/dune/gfe/surfacecosseratenergy.hh b/dune/gfe/assemblers/surfacecosseratenergy.hh
similarity index 99%
rename from dune/gfe/surfacecosseratenergy.hh
rename to dune/gfe/assemblers/surfacecosseratenergy.hh
index 2174df54..df21fd02 100644
--- a/dune/gfe/surfacecosseratenergy.hh
+++ b/dune/gfe/assemblers/surfacecosseratenergy.hh
@@ -8,10 +8,10 @@
#include <dune/fufem/boundarypatch.hh>
#include <dune/gfe/cosseratstrain.hh>
-#include <dune/gfe/localenergy.hh>
+#include <dune/gfe/assemblers/localenergy.hh>
#include <dune/gfe/localgeodesicfefunction.hh>
#include <dune/gfe/localprojectedfefunction.hh>
-#include <dune/gfe/mixedlocalgeodesicfestiffness.hh>
+#include <dune/gfe/assemblers/mixedlocalgeodesicfestiffness.hh>
#include <dune/gfe/tensor3.hh>
#include <dune/gfe/spaces/rigidbodymotion.hh>
diff --git a/dune/gfe/surfacecosseratstressassembler.hh b/dune/gfe/assemblers/surfacecosseratstressassembler.hh
similarity index 100%
rename from dune/gfe/surfacecosseratstressassembler.hh
rename to dune/gfe/assemblers/surfacecosseratstressassembler.hh
diff --git a/dune/gfe/weightedsumenergy.hh b/dune/gfe/assemblers/weightedsumenergy.hh
similarity index 96%
rename from dune/gfe/weightedsumenergy.hh
rename to dune/gfe/assemblers/weightedsumenergy.hh
index aebc046a..6fd5df3d 100644
--- a/dune/gfe/weightedsumenergy.hh
+++ b/dune/gfe/assemblers/weightedsumenergy.hh
@@ -6,7 +6,7 @@
#include <dune/common/fmatrix.hh>
#include <dune/geometry/quadraturerules.hh>
-#include <dune/gfe/localenergy.hh>
+#include <dune/gfe/assemblers/localenergy.hh>
#include <dune/gfe/localgeodesicfefunction.hh>
template<class Basis, class TargetSpace>
diff --git a/dune/gfe/mixedriemanniantrsolver.hh b/dune/gfe/mixedriemanniantrsolver.hh
index aafe7b3f..107f3da5 100644
--- a/dune/gfe/mixedriemanniantrsolver.hh
+++ b/dune/gfe/mixedriemanniantrsolver.hh
@@ -19,7 +19,7 @@
#include <dune/solvers/solvers/loopsolver.hh>
#include <dune/solvers/iterationsteps/mmgstep.hh>
-#include <dune/gfe/mixedgfeassembler.hh>
+#include <dune/gfe/assemblers/mixedgfeassembler.hh>
/** \brief Riemannian trust-region solver for geodesic finite-element problems */
template <class GridType,
diff --git a/dune/gfe/riemanniantrsolver.hh b/dune/gfe/riemanniantrsolver.hh
index 61017f95..78eacc6f 100644
--- a/dune/gfe/riemanniantrsolver.hh
+++ b/dune/gfe/riemanniantrsolver.hh
@@ -16,7 +16,7 @@
#include <dune/solvers/solvers/iterativesolver.hh>
#include <dune/solvers/solvers/loopsolver.hh>
-#include "geodesicfeassembler.hh"
+#include <dune/gfe/assemblers/geodesicfeassembler.hh>
#include <dune/grid/utility/globalindexset.hh>
#include <dune/gfe/parallel/globalmapper.hh>
#include <dune/gfe/parallel/globalp1mapper.hh>
diff --git a/src/cosserat-continuum.cc b/src/cosserat-continuum.cc
index 0efd6fce..b8428902 100644
--- a/src/cosserat-continuum.cc
+++ b/src/cosserat-continuum.cc
@@ -55,19 +55,19 @@
#include <dune/gfe/localgeodesicfefunction.hh>
#include <dune/gfe/localprojectedfefunction.hh>
-#include <dune/gfe/mixedlocalgfeadolcstiffness.hh>
-#include <dune/gfe/cosseratenergystiffness.hh>
-#include <dune/gfe/nonplanarcosseratshellenergy.hh>
+#include <dune/gfe/assemblers/mixedlocalgfeadolcstiffness.hh>
+#include <dune/gfe/assemblers/cosseratenergystiffness.hh>
+#include <dune/gfe/assemblers/nonplanarcosseratshellenergy.hh>
#include <dune/gfe/cosseratvtkwriter.hh>
#include <dune/gfe/cosseratvtkreader.hh>
-#include <dune/gfe/geodesicfeassembler.hh>
+#include <dune/gfe/assemblers/geodesicfeassembler.hh>
#include <dune/gfe/embeddedglobalgfefunction.hh>
-#include <dune/gfe/mixedgfeassembler.hh>
+#include <dune/gfe/assemblers/mixedgfeassembler.hh>
#if MIXED_SPACE
#include <dune/gfe/mixedriemanniantrsolver.hh>
#else
-#include <dune/gfe/geodesicfeassemblerwrapper.hh>
+#include <dune/gfe/assemblers/geodesicfeassemblerwrapper.hh>
#include <dune/gfe/riemannianpnsolver.hh>
#include <dune/gfe/riemanniantrsolver.hh>
#include <dune/gfe/spaces/rigidbodymotion.hh>
diff --git a/src/film-on-substrate-stress-plot.cc b/src/film-on-substrate-stress-plot.cc
index 388828b6..a21523f4 100644
--- a/src/film-on-substrate-stress-plot.cc
+++ b/src/film-on-substrate-stress-plot.cc
@@ -34,7 +34,7 @@
#include <dune/grid/io/file/vtk.hh>
#include <dune/gfe/filereader.hh>
-#include <dune/gfe/surfacecosseratstressassembler.hh>
+#include <dune/gfe/assemblers/surfacecosseratstressassembler.hh>
#include <dune/gfe/spaces/rotation.hh>
// grid dimension
diff --git a/src/film-on-substrate.cc b/src/film-on-substrate.cc
index fda9a0cb..8c7d2bea 100644
--- a/src/film-on-substrate.cc
+++ b/src/film-on-substrate.cc
@@ -56,17 +56,17 @@
#include <dune/grid/io/file/vtk.hh>
#include <dune/gfe/cosseratvtkwriter.hh>
-#include <dune/gfe/localintegralenergy.hh>
-#include <dune/gfe/mixedgfeassembler.hh>
-#include <dune/gfe/mixedlocalgfeadolcstiffness.hh>
+#include <dune/gfe/assemblers/localintegralenergy.hh>
+#include <dune/gfe/assemblers/mixedgfeassembler.hh>
+#include <dune/gfe/assemblers/mixedlocalgfeadolcstiffness.hh>
#include <dune/gfe/neumannenergy.hh>
-#include <dune/gfe/surfacecosseratenergy.hh>
-#include <dune/gfe/sumenergy.hh>
+#include <dune/gfe/assemblers/surfacecosseratenergy.hh>
+#include <dune/gfe/assemblers/sumenergy.hh>
#if MIXED_SPACE
#include <dune/gfe/mixedriemanniantrsolver.hh>
#else
-#include <dune/gfe/geodesicfeassemblerwrapper.hh>
+#include <dune/gfe/assemblers/geodesicfeassemblerwrapper.hh>
#include <dune/gfe/riemannianpnsolver.hh>
#include <dune/gfe/riemanniantrsolver.hh>
#include <dune/gfe/spaces/rigidbodymotion.hh>
diff --git a/src/gradient-flow.cc b/src/gradient-flow.cc
index bb8dc917..6ffe0055 100644
--- a/src/gradient-flow.cc
+++ b/src/gradient-flow.cc
@@ -34,14 +34,14 @@
#include <dune/solvers/solvers/iterativesolver.hh>
#include <dune/solvers/norms/energynorm.hh>
-#include <dune/gfe/localgeodesicfeadolcstiffness.hh>
-#include <dune/gfe/geodesicfeassembler.hh>
+#include <dune/gfe/assemblers/localgeodesicfeadolcstiffness.hh>
+#include <dune/gfe/assemblers/geodesicfeassembler.hh>
#include <dune/gfe/riemanniantrsolver.hh>
#include <dune/gfe/globalgfefunction.hh>
#include <dune/gfe/embeddedglobalgfefunction.hh>
-#include <dune/gfe/harmonicenergy.hh>
-#include <dune/gfe/l2distancesquaredenergy.hh>
-#include <dune/gfe/weightedsumenergy.hh>
+#include <dune/gfe/assemblers/harmonicenergy.hh>
+#include <dune/gfe/assemblers/l2distancesquaredenergy.hh>
+#include <dune/gfe/assemblers/weightedsumenergy.hh>
#include <dune/gfe/spaces/unitvector.hh>
// grid dimension
diff --git a/src/harmonicmaps.cc b/src/harmonicmaps.cc
index cf9c5243..8a45a3a8 100644
--- a/src/harmonicmaps.cc
+++ b/src/harmonicmaps.cc
@@ -40,10 +40,10 @@
#include <dune/gfe/localgeodesicfefunction.hh>
#include <dune/gfe/localprojectedfefunction.hh>
-#include <dune/gfe/localgeodesicfeadolcstiffness.hh>
-#include <dune/gfe/harmonicenergy.hh>
-#include <dune/gfe/chiralskyrmionenergy.hh>
-#include <dune/gfe/geodesicfeassembler.hh>
+#include <dune/gfe/assemblers/localgeodesicfeadolcstiffness.hh>
+#include <dune/gfe/assemblers/harmonicenergy.hh>
+#include <dune/gfe/assemblers/chiralskyrmionenergy.hh>
+#include <dune/gfe/assemblers/geodesicfeassembler.hh>
#include <dune/gfe/riemanniantrsolver.hh>
#include <dune/gfe/embeddedglobalgfefunction.hh>
#include <dune/gfe/spaces/realtuple.hh>
diff --git a/src/rod3d.cc b/src/rod3d.cc
index 63112aa1..f1009140 100644
--- a/src/rod3d.cc
+++ b/src/rod3d.cc
@@ -33,9 +33,9 @@
#include <dune/fufem/boundarypatch.hh>
#include <dune/fufem/functiontools/boundarydofs.hh>
-#include <dune/gfe/cosseratrodenergy.hh>
-#include <dune/gfe/geodesicfeassembler.hh>
-#include <dune/gfe/localgeodesicfeadolcstiffness.hh>
+#include <dune/gfe/assemblers/cosseratrodenergy.hh>
+#include <dune/gfe/assemblers/geodesicfeassembler.hh>
+#include <dune/gfe/assemblers/localgeodesicfeadolcstiffness.hh>
#include <dune/gfe/localgeodesicfefunction.hh>
#include <dune/gfe/localprojectedfefunction.hh>
#include <dune/gfe/riemanniantrsolver.hh>
diff --git a/src/simofoxshell.cc b/src/simofoxshell.cc
index 7285a45c..8904851f 100644
--- a/src/simofoxshell.cc
+++ b/src/simofoxshell.cc
@@ -21,18 +21,18 @@
#include <dune/fufem/functiontools/boundarydofs.hh>
#include <dune/fufem/dunepython.hh>
-#include <dune/gfe/mixedlocalgfeadolcstiffness.hh>
-#include <dune/gfe/simofoxenergy.hh>
+#include <dune/gfe/assemblers/mixedlocalgfeadolcstiffness.hh>
+#include <dune/gfe/assemblers/simofoxenergy.hh>
#include <dune/gfe/cosseratvtkwriter.hh>
#include <dune/gfe/embeddedglobalgfefunction.hh>
-#include <dune/gfe/mixedgfeassembler.hh>
+#include <dune/gfe/assemblers/mixedgfeassembler.hh>
#include <dune/gfe/mixedriemanniantrsolver.hh>
#include <dune/gfe/localgeodesicfefunction.hh>
#include <dune/gfe/localprojectedfefunction.hh>
#include <dune/gfe/spaces/unitvector.hh>
#if !MIXED_SPACE
-#include <dune/gfe/geodesicfeassemblerwrapper.hh>
+#include <dune/gfe/assemblers/geodesicfeassemblerwrapper.hh>
#include <dune/gfe/riemannianpnsolver.hh>
#include <dune/gfe/spaces/productmanifold.hh>
#endif
diff --git a/test/adolctest-scalar-and-vector-mode.cc b/test/adolctest-scalar-and-vector-mode.cc
index a85a7b51..a989ac63 100644
--- a/test/adolctest-scalar-and-vector-mode.cc
+++ b/test/adolctest-scalar-and-vector-mode.cc
@@ -22,11 +22,11 @@
#include <dune/grid/utility/structuredgridfactory.hh>
#include <dune/grid/uggrid.hh>
-#include <dune/gfe/cosseratenergystiffness.hh>
-#include <dune/gfe/geodesicfeassembler.hh>
-#include <dune/gfe/localgeodesicfeadolcstiffness.hh>
-#include <dune/gfe/mixedgfeassembler.hh>
-#include <dune/gfe/mixedlocalgfeadolcstiffness.hh>
+#include <dune/gfe/assemblers/cosseratenergystiffness.hh>
+#include <dune/gfe/assemblers/geodesicfeassembler.hh>
+#include <dune/gfe/assemblers/localgeodesicfeadolcstiffness.hh>
+#include <dune/gfe/assemblers/mixedgfeassembler.hh>
+#include <dune/gfe/assemblers/mixedlocalgfeadolcstiffness.hh>
#include <dune/istl/multitypeblockmatrix.hh>
#include <dune/istl/multitypeblockvector.hh>
diff --git a/test/adolctest.cc b/test/adolctest.cc
index 34de35df..6529617f 100644
--- a/test/adolctest.cc
+++ b/test/adolctest.cc
@@ -37,11 +37,11 @@ typedef double FDType;
#include <dune/functions/functionspacebases/interpolate.hh>
#include <dune/functions/functionspacebases/powerbasis.hh>
-#include <dune/gfe/localgeodesicfestiffness.hh>
+#include <dune/gfe/assemblers/localgeodesicfestiffness.hh>
#include <dune/gfe/localgeodesicfefunction.hh>
-#include <dune/gfe/cosseratenergystiffness.hh>
-#include <dune/gfe/localgeodesicfeadolcstiffness.hh>
-#include <dune/gfe/localgeodesicfefdstiffness.hh>
+#include <dune/gfe/assemblers/cosseratenergystiffness.hh>
+#include <dune/gfe/assemblers/localgeodesicfeadolcstiffness.hh>
+#include <dune/gfe/assemblers/localgeodesicfefdstiffness.hh>
#include <dune/gfe/spaces/rigidbodymotion.hh>
// grid dimension
diff --git a/test/cosseratenergytest.cc b/test/cosseratenergytest.cc
index 65c7dc1d..85fc3b25 100644
--- a/test/cosseratenergytest.cc
+++ b/test/cosseratenergytest.cc
@@ -7,7 +7,7 @@
#include <dune/functions/functionspacebases/lagrangebasis.hh>
-#include <dune/gfe/cosseratenergystiffness.hh>
+#include <dune/gfe/assemblers/cosseratenergystiffness.hh>
#include <dune/gfe/spaces/rigidbodymotion.hh>
#include "multiindex.hh"
diff --git a/test/cosseratrodenergytest.cc b/test/cosseratrodenergytest.cc
index 9cd83397..1430f72d 100644
--- a/test/cosseratrodenergytest.cc
+++ b/test/cosseratrodenergytest.cc
@@ -4,7 +4,7 @@
#include <dune/functions/functionspacebases/lagrangebasis.hh>
-#include <dune/gfe/cosseratrodenergy.hh>
+#include <dune/gfe/assemblers/cosseratrodenergy.hh>
#include <dune/gfe/localgeodesicfefunction.hh>
#include <dune/gfe/spaces/rigidbodymotion.hh>
diff --git a/test/cosseratrodtest.cc b/test/cosseratrodtest.cc
index 7c7ad4fc..72366414 100644
--- a/test/cosseratrodtest.cc
+++ b/test/cosseratrodtest.cc
@@ -16,9 +16,9 @@
#include <dune/fufem/boundarypatch.hh>
#include <dune/fufem/functiontools/boundarydofs.hh>
-#include <dune/gfe/cosseratrodenergy.hh>
+#include <dune/gfe/assemblers/cosseratrodenergy.hh>
#include <dune/gfe/geodesicfeassembler.hh>
-#include <dune/gfe/localgeodesicfeadolcstiffness.hh>
+#include <dune/gfe/assemblers/localgeodesicfeadolcstiffness.hh>
#include <dune/gfe/localgeodesicfefunction.hh>
#include <dune/gfe/localprojectedfefunction.hh>
#include <dune/gfe/riemanniantrsolver.hh>
diff --git a/test/geodesicfeassemblerwrappertest.cc b/test/geodesicfeassemblerwrappertest.cc
index 173a5d7c..737e5d25 100644
--- a/test/geodesicfeassemblerwrappertest.cc
+++ b/test/geodesicfeassemblerwrappertest.cc
@@ -22,16 +22,16 @@
#include <dune/grid/utility/structuredgridfactory.hh>
#include <dune/grid/uggrid.hh>
-#include <dune/gfe/cosseratenergystiffness.hh>
-#include <dune/gfe/geodesicfeassembler.hh>
-#include <dune/gfe/harmonicenergy.hh>
-#include <dune/gfe/localgeodesicfeadolcstiffness.hh>
+#include <dune/gfe/assemblers/cosseratenergystiffness.hh>
+#include <dune/gfe/assemblers/geodesicfeassembler.hh>
+#include <dune/gfe/assemblers/harmonicenergy.hh>
+#include <dune/gfe/assemblers/localgeodesicfeadolcstiffness.hh>
#include <dune/gfe/localprojectedfefunction.hh>
-#include <dune/gfe/mixedgfeassembler.hh>
-#include <dune/gfe/mixedlocalgfeadolcstiffness.hh>
+#include <dune/gfe/assemblers/mixedgfeassembler.hh>
+#include <dune/gfe/assemblers/mixedlocalgfeadolcstiffness.hh>
#include <dune/gfe/riemanniantrsolver.hh>
-#include <dune/gfe/geodesicfeassemblerwrapper.hh>
+#include <dune/gfe/assemblers/geodesicfeassemblerwrapper.hh>
#include <dune/istl/multitypeblockmatrix.hh>
#include <dune/istl/multitypeblockvector.hh>
diff --git a/test/harmonicenergytest.cc b/test/harmonicenergytest.cc
index b66466f1..6ed8ca93 100644
--- a/test/harmonicenergytest.cc
+++ b/test/harmonicenergytest.cc
@@ -4,7 +4,7 @@
#include <dune/functions/functionspacebases/lagrangebasis.hh>
-#include <dune/gfe/harmonicenergy.hh>
+#include <dune/gfe/assemblers/harmonicenergy.hh>
#include <dune/gfe/localgeodesicfefunction.hh>
#include <dune/gfe/spaces/unitvector.hh>
diff --git a/test/harmonicmaptest.cc b/test/harmonicmaptest.cc
index 0025d9f7..bca635fd 100644
--- a/test/harmonicmaptest.cc
+++ b/test/harmonicmaptest.cc
@@ -23,9 +23,9 @@
#include <dune/gfe/localgeodesicfefunction.hh>
#include <dune/gfe/localprojectedfefunction.hh>
-#include <dune/gfe/localgeodesicfeadolcstiffness.hh>
-#include <dune/gfe/harmonicenergy.hh>
-#include <dune/gfe/geodesicfeassembler.hh>
+#include <dune/gfe/assemblers/localgeodesicfeadolcstiffness.hh>
+#include <dune/gfe/assemblers/harmonicenergy.hh>
+#include <dune/gfe/assemblers/geodesicfeassembler.hh>
#include <dune/gfe/riemanniantrsolver.hh>
#include <dune/gfe/spaces/unitvector.hh>
diff --git a/test/nonplanarcosseratenergytest.cc b/test/nonplanarcosseratenergytest.cc
index 8756dd62..17c3c3f9 100644
--- a/test/nonplanarcosseratenergytest.cc
+++ b/test/nonplanarcosseratenergytest.cc
@@ -12,7 +12,7 @@
#include <dune/functions/functionspacebases/powerbasis.hh>
#include <dune/gfe/cosseratvtkwriter.hh>
-#include <dune/gfe/nonplanarcosseratshellenergy.hh>
+#include <dune/gfe/assemblers/nonplanarcosseratshellenergy.hh>
#include <dune/gfe/spaces/rigidbodymotion.hh>
#include "multiindex.hh"
diff --git a/test/surfacecosseratstressassemblertest.cc b/test/surfacecosseratstressassemblertest.cc
index bf8e64a6..e3752141 100644
--- a/test/surfacecosseratstressassemblertest.cc
+++ b/test/surfacecosseratstressassemblertest.cc
@@ -26,7 +26,7 @@
#include <dune/grid/utility/structuredgridfactory.hh>
#include <dune/gfe/filereader.hh>
-#include <dune/gfe/surfacecosseratstressassembler.hh>
+#include <dune/gfe/assemblers/surfacecosseratstressassembler.hh>
#include <dune/gfe/spaces/rotation.hh>
#include <dune/matrix-vector/transpose.hh>
--
GitLab