From fff183a133ffb9efc5e11bd57de5b82046537a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20Gr=C3=A4ser?= <graeser@mi.fu-berlin.de> Date: Tue, 6 Jun 2023 20:43:41 +0200 Subject: [PATCH] Rename directory and manual files This is to prepare incorporation into dune-fufem --- doc/manual/CMakeLists.txt | 2 +- .../{dune-fufem-forms.bib => dune-fufem.bib} | 0 .../{dune-fufem-forms.tex => dune-fufem.tex} | 2 +- dune/CMakeLists.txt | 2 +- dune/fufem-forms/forms.hh | 27 ------------------- dune/fufem/CMakeLists.txt | 1 + .../forms}/CMakeLists.txt | 2 +- .../{fufem-forms => fufem/forms}/baseclass.hh | 0 .../forms}/boundunaryoperator.hh | 6 ++--- dune/fufem/forms/forms.hh | 27 +++++++++++++++++++ .../{fufem-forms => fufem/forms}/integrate.hh | 9 ++++--- .../forms}/integratedbilinearform.hh | 6 ++--- .../forms}/integratedboundarybilinearform.hh | 6 ++--- .../forms}/integratedboundarylinearform.hh | 6 ++--- .../forms}/integratedlinearform.hh | 6 ++--- .../forms}/localoperators.hh | 0 .../forms}/localsumassembler.hh | 0 .../forms}/nullaryoperators.hh | 2 +- .../{fufem-forms => fufem/forms}/operators.hh | 10 +++---- .../forms}/productoperator.hh | 8 +++--- .../forms}/shapefunctioncache.hh | 0 .../forms}/sumoperator.hh | 2 +- .../forms}/transformedoperator.hh | 2 +- .../forms}/unaryoperators.hh | 4 +-- src/benchmark.cc | 2 +- src/fracture.cc | 2 +- src/poisson-mfem.cc | 2 +- src/poisson-pq2.cc | 2 +- src/primal-plasticity.cc | 2 +- src/showcase.cc | 2 +- src/stokes-taylorhood.cc | 2 +- 31 files changed, 73 insertions(+), 71 deletions(-) rename doc/manual/{dune-fufem-forms.bib => dune-fufem.bib} (100%) rename doc/manual/{dune-fufem-forms.tex => dune-fufem.tex} (99%) delete mode 100644 dune/fufem-forms/forms.hh create mode 100644 dune/fufem/CMakeLists.txt rename dune/{fufem-forms => fufem/forms}/CMakeLists.txt (87%) rename dune/{fufem-forms => fufem/forms}/baseclass.hh (100%) rename dune/{fufem-forms => fufem/forms}/boundunaryoperator.hh (98%) create mode 100644 dune/fufem/forms/forms.hh rename dune/{fufem-forms => fufem/forms}/integrate.hh (91%) rename dune/{fufem-forms => fufem/forms}/integratedbilinearform.hh (96%) rename dune/{fufem-forms => fufem/forms}/integratedboundarybilinearform.hh (97%) rename dune/{fufem-forms => fufem/forms}/integratedboundarylinearform.hh (96%) rename dune/{fufem-forms => fufem/forms}/integratedlinearform.hh (96%) rename dune/{fufem-forms => fufem/forms}/localoperators.hh (100%) rename dune/{fufem-forms => fufem/forms}/localsumassembler.hh (100%) rename dune/{fufem-forms => fufem/forms}/nullaryoperators.hh (97%) rename dune/{fufem-forms => fufem/forms}/operators.hh (93%) rename dune/{fufem-forms => fufem/forms}/productoperator.hh (98%) rename dune/{fufem-forms => fufem/forms}/shapefunctioncache.hh (100%) rename dune/{fufem-forms => fufem/forms}/sumoperator.hh (99%) rename dune/{fufem-forms => fufem/forms}/transformedoperator.hh (99%) rename dune/{fufem-forms => fufem/forms}/unaryoperators.hh (99%) diff --git a/doc/manual/CMakeLists.txt b/doc/manual/CMakeLists.txt index c8583de..f68f9d7 100644 --- a/doc/manual/CMakeLists.txt +++ b/doc/manual/CMakeLists.txt @@ -1,4 +1,4 @@ dune_add_latex_document( - SOURCE dune-fufem-forms.tex + SOURCE dune-fufem.tex FATHER_TARGET doc INSTALL ${CMAKE_INSTALL_DOCDIR}) diff --git a/doc/manual/dune-fufem-forms.bib b/doc/manual/dune-fufem.bib similarity index 100% rename from doc/manual/dune-fufem-forms.bib rename to doc/manual/dune-fufem.bib diff --git a/doc/manual/dune-fufem-forms.tex b/doc/manual/dune-fufem.tex similarity index 99% rename from doc/manual/dune-fufem-forms.tex rename to doc/manual/dune-fufem.tex index 9dcc0e8..383ecbc 100644 --- a/doc/manual/dune-fufem-forms.tex +++ b/doc/manual/dune-fufem.tex @@ -966,6 +966,6 @@ auto L = integrate(dot(f,v)); \bibliographystyle{plainnat} -\bibliography{dune-fufem-forms} +\bibliography{dune-fufem} \end{document} diff --git a/dune/CMakeLists.txt b/dune/CMakeLists.txt index 7567b35..60339af 100644 --- a/dune/CMakeLists.txt +++ b/dune/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory(fufem-forms) +add_subdirectory(fufem) diff --git a/dune/fufem-forms/forms.hh b/dune/fufem-forms/forms.hh deleted file mode 100644 index 53f201b..0000000 --- a/dune/fufem-forms/forms.hh +++ /dev/null @@ -1,27 +0,0 @@ -// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- -// vi: set et ts=4 sw=2 sts=2: -#ifndef DUNE_FUFEM_ASSEMBLERS_FORMS_HH -#define DUNE_FUFEM_ASSEMBLERS_FORMS_HH - - -#include <dune/fufem-forms/shapefunctioncache.hh> - -#include <dune/fufem-forms/baseclass.hh> -#include <dune/fufem-forms/localoperators.hh> -#include <dune/fufem-forms/nullaryoperators.hh> -#include <dune/fufem-forms/transformedoperator.hh> -#include <dune/fufem-forms/unaryoperators.hh> -#include <dune/fufem-forms/sumoperator.hh> -#include <dune/fufem-forms/productoperator.hh> -#include <dune/fufem-forms/operators.hh> -#include <dune/fufem-forms/localsumassembler.hh> -#include <dune/fufem-forms/integratedlinearform.hh> -#include <dune/fufem-forms/integratedbilinearform.hh> -#include <dune/fufem-forms/integratedboundarylinearform.hh> -#include <dune/fufem-forms/integratedboundarybilinearform.hh> -#include <dune/fufem-forms/integrate.hh> -#include <dune/fufem-forms/boundunaryoperator.hh> - - - -#endif // DUNE_FUFEM_ASSEMBLERS_FORMS_HH diff --git a/dune/fufem/CMakeLists.txt b/dune/fufem/CMakeLists.txt new file mode 100644 index 0000000..7f95779 --- /dev/null +++ b/dune/fufem/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(forms) diff --git a/dune/fufem-forms/CMakeLists.txt b/dune/fufem/forms/CMakeLists.txt similarity index 87% rename from dune/fufem-forms/CMakeLists.txt rename to dune/fufem/forms/CMakeLists.txt index 1242ab7..43b8015 100644 --- a/dune/fufem-forms/CMakeLists.txt +++ b/dune/fufem/forms/CMakeLists.txt @@ -17,4 +17,4 @@ install(FILES sumoperator.hh transformedoperator.hh unaryoperators.hh - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/fufem-forms) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/fufem/forms) diff --git a/dune/fufem-forms/baseclass.hh b/dune/fufem/forms/baseclass.hh similarity index 100% rename from dune/fufem-forms/baseclass.hh rename to dune/fufem/forms/baseclass.hh diff --git a/dune/fufem-forms/boundunaryoperator.hh b/dune/fufem/forms/boundunaryoperator.hh similarity index 98% rename from dune/fufem-forms/boundunaryoperator.hh rename to dune/fufem/forms/boundunaryoperator.hh index 2a06602..7e1c7c8 100644 --- a/dune/fufem-forms/boundunaryoperator.hh +++ b/dune/fufem/forms/boundunaryoperator.hh @@ -8,9 +8,9 @@ #include <tuple> #include <utility> -#include <dune/fufem-forms/baseclass.hh> -#include <dune/fufem-forms/transformedoperator.hh> -#include <dune/fufem-forms/sumoperator.hh> +#include <dune/fufem/forms/baseclass.hh> +#include <dune/fufem/forms/transformedoperator.hh> +#include <dune/fufem/forms/sumoperator.hh> diff --git a/dune/fufem/forms/forms.hh b/dune/fufem/forms/forms.hh new file mode 100644 index 0000000..c02240f --- /dev/null +++ b/dune/fufem/forms/forms.hh @@ -0,0 +1,27 @@ +// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- +// vi: set et ts=4 sw=2 sts=2: +#ifndef DUNE_FUFEM_ASSEMBLERS_FORMS_HH +#define DUNE_FUFEM_ASSEMBLERS_FORMS_HH + + +#include <dune/fufem/forms/shapefunctioncache.hh> + +#include <dune/fufem/forms/baseclass.hh> +#include <dune/fufem/forms/localoperators.hh> +#include <dune/fufem/forms/nullaryoperators.hh> +#include <dune/fufem/forms/transformedoperator.hh> +#include <dune/fufem/forms/unaryoperators.hh> +#include <dune/fufem/forms/sumoperator.hh> +#include <dune/fufem/forms/productoperator.hh> +#include <dune/fufem/forms/operators.hh> +#include <dune/fufem/forms/localsumassembler.hh> +#include <dune/fufem/forms/integratedlinearform.hh> +#include <dune/fufem/forms/integratedbilinearform.hh> +#include <dune/fufem/forms/integratedboundarylinearform.hh> +#include <dune/fufem/forms/integratedboundarybilinearform.hh> +#include <dune/fufem/forms/integrate.hh> +#include <dune/fufem/forms/boundunaryoperator.hh> + + + +#endif // DUNE_FUFEM_ASSEMBLERS_FORMS_HH diff --git a/dune/fufem-forms/integrate.hh b/dune/fufem/forms/integrate.hh similarity index 91% rename from dune/fufem-forms/integrate.hh rename to dune/fufem/forms/integrate.hh index a3946f4..adb96d0 100644 --- a/dune/fufem-forms/integrate.hh +++ b/dune/fufem/forms/integrate.hh @@ -8,11 +8,12 @@ #include <dune/fufem/boundarypatch.hh> -#include <dune/fufem-forms/baseclass.hh> +#include <dune/fufem/forms/baseclass.hh> -#include <dune/fufem-forms/integratedlinearform.hh> -#include <dune/fufem-forms/integratedbilinearform.hh> -#include <dune/fufem-forms/integratedboundarylinearform.hh> +#include <dune/fufem/forms/integratedlinearform.hh> +#include <dune/fufem/forms/integratedbilinearform.hh> +#include <dune/fufem/forms/integratedboundarylinearform.hh> +#include <dune/fufem/forms/integratedboundarybilinearform.hh> diff --git a/dune/fufem-forms/integratedbilinearform.hh b/dune/fufem/forms/integratedbilinearform.hh similarity index 96% rename from dune/fufem-forms/integratedbilinearform.hh rename to dune/fufem/forms/integratedbilinearform.hh index c9f39cd..7dbecc1 100644 --- a/dune/fufem-forms/integratedbilinearform.hh +++ b/dune/fufem/forms/integratedbilinearform.hh @@ -11,9 +11,9 @@ #include <dune/typetree/childextraction.hh> -#include <dune/fufem-forms/shapefunctioncache.hh> -#include <dune/fufem-forms/baseclass.hh> -#include <dune/fufem-forms/localsumassembler.hh> +#include <dune/fufem/forms/shapefunctioncache.hh> +#include <dune/fufem/forms/baseclass.hh> +#include <dune/fufem/forms/localsumassembler.hh> diff --git a/dune/fufem-forms/integratedboundarybilinearform.hh b/dune/fufem/forms/integratedboundarybilinearform.hh similarity index 97% rename from dune/fufem-forms/integratedboundarybilinearform.hh rename to dune/fufem/forms/integratedboundarybilinearform.hh index 9ffe2eb..b9f9c17 100644 --- a/dune/fufem-forms/integratedboundarybilinearform.hh +++ b/dune/fufem/forms/integratedboundarybilinearform.hh @@ -11,9 +11,9 @@ #include <dune/typetree/childextraction.hh> -#include <dune/fufem-forms/shapefunctioncache.hh> -#include <dune/fufem-forms/baseclass.hh> -#include <dune/fufem-forms/localsumassembler.hh> +#include <dune/fufem/forms/shapefunctioncache.hh> +#include <dune/fufem/forms/baseclass.hh> +#include <dune/fufem/forms/localsumassembler.hh> diff --git a/dune/fufem-forms/integratedboundarylinearform.hh b/dune/fufem/forms/integratedboundarylinearform.hh similarity index 96% rename from dune/fufem-forms/integratedboundarylinearform.hh rename to dune/fufem/forms/integratedboundarylinearform.hh index 81adc6c..464f7c2 100644 --- a/dune/fufem-forms/integratedboundarylinearform.hh +++ b/dune/fufem/forms/integratedboundarylinearform.hh @@ -13,9 +13,9 @@ #include <dune/fufem/boundarypatch.hh> -#include <dune/fufem-forms/shapefunctioncache.hh> -#include <dune/fufem-forms/baseclass.hh> -#include <dune/fufem-forms/localsumassembler.hh> +#include <dune/fufem/forms/shapefunctioncache.hh> +#include <dune/fufem/forms/baseclass.hh> +#include <dune/fufem/forms/localsumassembler.hh> diff --git a/dune/fufem-forms/integratedlinearform.hh b/dune/fufem/forms/integratedlinearform.hh similarity index 96% rename from dune/fufem-forms/integratedlinearform.hh rename to dune/fufem/forms/integratedlinearform.hh index 6dfe7cd..2dbf2eb 100644 --- a/dune/fufem-forms/integratedlinearform.hh +++ b/dune/fufem/forms/integratedlinearform.hh @@ -11,9 +11,9 @@ #include <dune/typetree/childextraction.hh> -#include <dune/fufem-forms/shapefunctioncache.hh> -#include <dune/fufem-forms/baseclass.hh> -#include <dune/fufem-forms/localsumassembler.hh> +#include <dune/fufem/forms/shapefunctioncache.hh> +#include <dune/fufem/forms/baseclass.hh> +#include <dune/fufem/forms/localsumassembler.hh> diff --git a/dune/fufem-forms/localoperators.hh b/dune/fufem/forms/localoperators.hh similarity index 100% rename from dune/fufem-forms/localoperators.hh rename to dune/fufem/forms/localoperators.hh diff --git a/dune/fufem-forms/localsumassembler.hh b/dune/fufem/forms/localsumassembler.hh similarity index 100% rename from dune/fufem-forms/localsumassembler.hh rename to dune/fufem/forms/localsumassembler.hh diff --git a/dune/fufem-forms/nullaryoperators.hh b/dune/fufem/forms/nullaryoperators.hh similarity index 97% rename from dune/fufem-forms/nullaryoperators.hh rename to dune/fufem/forms/nullaryoperators.hh index e69f298..2a5888e 100644 --- a/dune/fufem-forms/nullaryoperators.hh +++ b/dune/fufem/forms/nullaryoperators.hh @@ -11,7 +11,7 @@ #include <dune/istl/matrix.hh> #include <dune/istl/matrixindexset.hh> -#include <dune/fufem-forms/baseclass.hh> +#include <dune/fufem/forms/baseclass.hh> diff --git a/dune/fufem-forms/operators.hh b/dune/fufem/forms/operators.hh similarity index 93% rename from dune/fufem-forms/operators.hh rename to dune/fufem/forms/operators.hh index e60afa5..b3ce59b 100644 --- a/dune/fufem-forms/operators.hh +++ b/dune/fufem/forms/operators.hh @@ -12,11 +12,11 @@ #include <dune/istl/scaledidmatrix.hh> -#include <dune/fufem-forms/baseclass.hh> -#include <dune/fufem-forms/localoperators.hh> -#include <dune/fufem-forms/transformedoperator.hh> -#include <dune/fufem-forms/unaryoperators.hh> -#include <dune/fufem-forms/productoperator.hh> +#include <dune/fufem/forms/baseclass.hh> +#include <dune/fufem/forms/localoperators.hh> +#include <dune/fufem/forms/transformedoperator.hh> +#include <dune/fufem/forms/unaryoperators.hh> +#include <dune/fufem/forms/productoperator.hh> diff --git a/dune/fufem-forms/productoperator.hh b/dune/fufem/forms/productoperator.hh similarity index 98% rename from dune/fufem-forms/productoperator.hh rename to dune/fufem/forms/productoperator.hh index 815e3d0..1dcc535 100644 --- a/dune/fufem-forms/productoperator.hh +++ b/dune/fufem/forms/productoperator.hh @@ -8,10 +8,10 @@ #include <tuple> #include <utility> -#include <dune/fufem-forms/baseclass.hh> -#include <dune/fufem-forms/localoperators.hh> -#include <dune/fufem-forms/transformedoperator.hh> -#include <dune/fufem-forms/sumoperator.hh> +#include <dune/fufem/forms/baseclass.hh> +#include <dune/fufem/forms/localoperators.hh> +#include <dune/fufem/forms/transformedoperator.hh> +#include <dune/fufem/forms/sumoperator.hh> diff --git a/dune/fufem-forms/shapefunctioncache.hh b/dune/fufem/forms/shapefunctioncache.hh similarity index 100% rename from dune/fufem-forms/shapefunctioncache.hh rename to dune/fufem/forms/shapefunctioncache.hh diff --git a/dune/fufem-forms/sumoperator.hh b/dune/fufem/forms/sumoperator.hh similarity index 99% rename from dune/fufem-forms/sumoperator.hh rename to dune/fufem/forms/sumoperator.hh index 436ce25..793e374 100644 --- a/dune/fufem-forms/sumoperator.hh +++ b/dune/fufem/forms/sumoperator.hh @@ -10,7 +10,7 @@ #include <dune/fufem/quadraturerules/quadraturerulecache.hh> -#include <dune/fufem-forms/baseclass.hh> +#include <dune/fufem/forms/baseclass.hh> diff --git a/dune/fufem-forms/transformedoperator.hh b/dune/fufem/forms/transformedoperator.hh similarity index 99% rename from dune/fufem-forms/transformedoperator.hh rename to dune/fufem/forms/transformedoperator.hh index 956e0c9..a38d5b6 100644 --- a/dune/fufem-forms/transformedoperator.hh +++ b/dune/fufem/forms/transformedoperator.hh @@ -8,7 +8,7 @@ #include <tuple> #include <utility> -#include <dune/fufem-forms/localoperators.hh> +#include <dune/fufem/forms/localoperators.hh> diff --git a/dune/fufem-forms/unaryoperators.hh b/dune/fufem/forms/unaryoperators.hh similarity index 99% rename from dune/fufem-forms/unaryoperators.hh rename to dune/fufem/forms/unaryoperators.hh index 444383a..b5ff189 100644 --- a/dune/fufem-forms/unaryoperators.hh +++ b/dune/fufem/forms/unaryoperators.hh @@ -19,8 +19,8 @@ #include <dune/fufem/quadraturerules/quadraturerulecache.hh> -#include <dune/fufem-forms/baseclass.hh> -#include <dune/fufem-forms/transformedoperator.hh> +#include <dune/fufem/forms/baseclass.hh> +#include <dune/fufem/forms/transformedoperator.hh> namespace Dune::Fufem::Forms { diff --git a/src/benchmark.cc b/src/benchmark.cc index 49d42bc..b8bf19e 100644 --- a/src/benchmark.cc +++ b/src/benchmark.cc @@ -37,7 +37,7 @@ #include <dune/fufem/assemblers/localassemblers/laplaceassembler.hh> -#include <dune/fufem-forms/forms.hh> +#include <dune/fufem/forms/forms.hh> using namespace Dune; diff --git a/src/fracture.cc b/src/fracture.cc index 2f9417e..757ac63 100644 --- a/src/fracture.cc +++ b/src/fracture.cc @@ -40,7 +40,7 @@ #include <dune/fufem/assemblers/dunefunctionsfunctionalassembler.hh> #include <dune/fufem/backends/istlmatrixbackend.hh> -#include <dune/fufem-forms/forms.hh> +#include <dune/fufem/forms/forms.hh> diff --git a/src/poisson-mfem.cc b/src/poisson-mfem.cc index 0cfd338..eb3d54e 100644 --- a/src/poisson-mfem.cc +++ b/src/poisson-mfem.cc @@ -38,7 +38,7 @@ #include <dune/fufem/backends/istlmatrixbackend.hh> #include <dune/fufem/parallel/elementcoloring.hh> -#include <dune/fufem-forms/forms.hh> +#include <dune/fufem/forms/forms.hh> #define DIM2 // Use a two-dimensional test, otherwise three-dimensional diff --git a/src/poisson-pq2.cc b/src/poisson-pq2.cc index a5a786d..a11e2e8 100644 --- a/src/poisson-pq2.cc +++ b/src/poisson-pq2.cc @@ -32,7 +32,7 @@ #include <dune/fufem/backends/istlmatrixbackend.hh> #include <dune/fufem/boundarypatch.hh> -#include <dune/fufem-forms/forms.hh> +#include <dune/fufem/forms/forms.hh> using namespace Dune; diff --git a/src/primal-plasticity.cc b/src/primal-plasticity.cc index f4b14f7..6675178 100644 --- a/src/primal-plasticity.cc +++ b/src/primal-plasticity.cc @@ -35,7 +35,7 @@ #include <dune/fufem/assemblers/dunefunctionsfunctionalassembler.hh> #include <dune/fufem/backends/istlmatrixbackend.hh> -#include <dune/fufem-forms/forms.hh> +#include <dune/fufem/forms/forms.hh> diff --git a/src/showcase.cc b/src/showcase.cc index e23b114..4e6ba94 100644 --- a/src/showcase.cc +++ b/src/showcase.cc @@ -32,7 +32,7 @@ #include <dune/fufem/backends/istlmatrixbackend.hh> #include <dune/fufem/boundarypatch.hh> -#include <dune/fufem-forms/forms.hh> +#include <dune/fufem/forms/forms.hh> using namespace Dune; diff --git a/src/stokes-taylorhood.cc b/src/stokes-taylorhood.cc index 0040383..29f55b9 100644 --- a/src/stokes-taylorhood.cc +++ b/src/stokes-taylorhood.cc @@ -41,7 +41,7 @@ #include <dune/fufem/assemblers/dunefunctionsfunctionalassembler.hh> #include <dune/fufem/backends/istlmatrixbackend.hh> -#include <dune/fufem-forms/forms.hh> +#include <dune/fufem/forms/forms.hh> -- GitLab