From bb218f58edbc6b8317b8a4af7284152f78ca351c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
Date: Fri, 1 Nov 2019 18:51:13 +0100
Subject: [PATCH] Move gm/ below dune/uggrid/
---
CMakeLists.txt | 1 -
dune/uggrid/CMakeLists.txt | 1 +
dune/uggrid/domain/std_domain.cc | 2 +-
{gm => dune/uggrid/gm}/2Dversion | 0
{gm => dune/uggrid/gm}/3Dversion | 0
{gm => dune/uggrid/gm}/CMakeLists.txt | 0
{gm => dune/uggrid/gm}/GenerateRules.cc | 0
{gm => dune/uggrid/gm}/GenerateRules.h | 0
{gm => dune/uggrid/gm}/RefRules.cc | 0
{gm => dune/uggrid/gm}/algebra.cc | 0
{gm => dune/uggrid/gm}/algebra.h | 0
{gm => dune/uggrid/gm}/cw.cc | 0
{gm => dune/uggrid/gm}/cw.h | 0
{gm => dune/uggrid/gm}/dlmgr.cc | 0
{gm => dune/uggrid/gm}/dlmgr.h | 0
{gm => dune/uggrid/gm}/dlmgr.t | 0
{gm => dune/uggrid/gm}/elements.cc | 0
{gm => dune/uggrid/gm}/elements.h | 0
{gm => dune/uggrid/gm}/enrol.cc | 0
{gm => dune/uggrid/gm}/enrol.h | 0
{gm => dune/uggrid/gm}/er.cc | 0
{gm => dune/uggrid/gm}/er.h | 0
{gm => dune/uggrid/gm}/evalproc.cc | 0
{gm => dune/uggrid/gm}/evm.cc | 0
{gm => dune/uggrid/gm}/evm.h | 0
{gm => dune/uggrid/gm}/gm.doc | 0
{gm => dune/uggrid/gm}/gm.h | 0
{gm => dune/uggrid/gm}/gmcheck.cc | 0
{gm => dune/uggrid/gm}/initgm.cc | 0
{gm => dune/uggrid/gm}/initgm.h | 0
{gm => dune/uggrid/gm}/mgheapmgr.cc | 0
{gm => dune/uggrid/gm}/mgheapmgr.h | 0
{gm => dune/uggrid/gm}/mgio.cc | 0
{gm => dune/uggrid/gm}/mgio.h | 0
{gm => dune/uggrid/gm}/pargm.h | 0
{gm => dune/uggrid/gm}/refine.cc | 0
{gm => dune/uggrid/gm}/refine.h | 0
{gm => dune/uggrid/gm}/rm-show.cc | 6 +++---
.../uggrid/gm}/rm-tetrahedron-rules-test.cc | 0
{gm => dune/uggrid/gm}/rm-write2file.cc | 8 ++++----
{gm => dune/uggrid/gm}/rm-write2file.h | 6 +++---
.../uggrid/gm}/rm-writeRefRules2file.cc | 2 +-
{gm => dune/uggrid/gm}/rm.cc | 0
{gm => dune/uggrid/gm}/rm.h | 0
{gm => dune/uggrid/gm}/shapes.cc | 0
{gm => dune/uggrid/gm}/shapes.h | 0
{gm => dune/uggrid/gm}/ugio.cc | 0
{gm => dune/uggrid/gm}/ugio.h | 0
{gm => dune/uggrid/gm}/ugm.cc | 0
{gm => dune/uggrid/gm}/ugm.h | 0
initug.cc | 2 +-
np/np.h | 4 ++--
np/udm/disctools.cc | 4 ++--
np/udm/disctools.h | 2 +-
np/udm/formats.cc | 8 ++++----
np/udm/formats.h | 2 +-
np/udm/udm.cc | 4 ++--
np/udm/udm.h | 2 +-
parallel/dddif/debugger.cc | 2 +-
parallel/dddif/gridcons.cc | 10 +++++-----
parallel/dddif/handler.cc | 14 ++++++-------
parallel/dddif/identify.cc | 8 ++++----
parallel/dddif/initddd.cc | 2 +-
parallel/dddif/lb.cc | 4 ++--
parallel/dddif/lbrcb.cc | 4 ++--
parallel/dddif/memmgr.cc | 2 +-
parallel/dddif/overlap.cc | 14 ++++++-------
parallel/dddif/parallel.h | 4 ++--
parallel/dddif/partition.cc | 14 ++++++-------
parallel/dddif/pgmcheck.cc | 10 +++++-----
parallel/dddif/priority.cc | 10 +++++-----
parallel/dddif/support.cc | 2 +-
parallel/dddif/trans.cc | 12 +++++------
ui/commands.cc | 20 +++++++++----------
ui/commands.h | 2 +-
75 files changed, 94 insertions(+), 94 deletions(-)
rename {gm => dune/uggrid/gm}/2Dversion (100%)
rename {gm => dune/uggrid/gm}/3Dversion (100%)
rename {gm => dune/uggrid/gm}/CMakeLists.txt (100%)
rename {gm => dune/uggrid/gm}/GenerateRules.cc (100%)
rename {gm => dune/uggrid/gm}/GenerateRules.h (100%)
rename {gm => dune/uggrid/gm}/RefRules.cc (100%)
rename {gm => dune/uggrid/gm}/algebra.cc (100%)
rename {gm => dune/uggrid/gm}/algebra.h (100%)
rename {gm => dune/uggrid/gm}/cw.cc (100%)
rename {gm => dune/uggrid/gm}/cw.h (100%)
rename {gm => dune/uggrid/gm}/dlmgr.cc (100%)
rename {gm => dune/uggrid/gm}/dlmgr.h (100%)
rename {gm => dune/uggrid/gm}/dlmgr.t (100%)
rename {gm => dune/uggrid/gm}/elements.cc (100%)
rename {gm => dune/uggrid/gm}/elements.h (100%)
rename {gm => dune/uggrid/gm}/enrol.cc (100%)
rename {gm => dune/uggrid/gm}/enrol.h (100%)
rename {gm => dune/uggrid/gm}/er.cc (100%)
rename {gm => dune/uggrid/gm}/er.h (100%)
rename {gm => dune/uggrid/gm}/evalproc.cc (100%)
rename {gm => dune/uggrid/gm}/evm.cc (100%)
rename {gm => dune/uggrid/gm}/evm.h (100%)
rename {gm => dune/uggrid/gm}/gm.doc (100%)
rename {gm => dune/uggrid/gm}/gm.h (100%)
rename {gm => dune/uggrid/gm}/gmcheck.cc (100%)
rename {gm => dune/uggrid/gm}/initgm.cc (100%)
rename {gm => dune/uggrid/gm}/initgm.h (100%)
rename {gm => dune/uggrid/gm}/mgheapmgr.cc (100%)
rename {gm => dune/uggrid/gm}/mgheapmgr.h (100%)
rename {gm => dune/uggrid/gm}/mgio.cc (100%)
rename {gm => dune/uggrid/gm}/mgio.h (100%)
rename {gm => dune/uggrid/gm}/pargm.h (100%)
rename {gm => dune/uggrid/gm}/refine.cc (100%)
rename {gm => dune/uggrid/gm}/refine.h (100%)
rename {gm => dune/uggrid/gm}/rm-show.cc (91%)
rename {gm => dune/uggrid/gm}/rm-tetrahedron-rules-test.cc (100%)
rename {gm => dune/uggrid/gm}/rm-write2file.cc (99%)
rename {gm => dune/uggrid/gm}/rm-write2file.h (93%)
rename {gm => dune/uggrid/gm}/rm-writeRefRules2file.cc (96%)
rename {gm => dune/uggrid/gm}/rm.cc (100%)
rename {gm => dune/uggrid/gm}/rm.h (100%)
rename {gm => dune/uggrid/gm}/shapes.cc (100%)
rename {gm => dune/uggrid/gm}/shapes.h (100%)
rename {gm => dune/uggrid/gm}/ugio.cc (100%)
rename {gm => dune/uggrid/gm}/ugio.h (100%)
rename {gm => dune/uggrid/gm}/ugm.cc (100%)
rename {gm => dune/uggrid/gm}/ugm.h (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c717308d5..89ad084d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -171,7 +171,6 @@ if(UG_ENABLE_PARALLEL)
endif()
add_subdirectory(dev)
add_subdirectory(dune)
-add_subdirectory(gm)
add_subdirectory(np)
add_subdirectory(ui)
add_subdirectory(cmake/modules)
diff --git a/dune/uggrid/CMakeLists.txt b/dune/uggrid/CMakeLists.txt
index 479a89a5a..fada1079a 100644
--- a/dune/uggrid/CMakeLists.txt
+++ b/dune/uggrid/CMakeLists.txt
@@ -1,4 +1,5 @@
add_subdirectory(domain)
+add_subdirectory(gm)
add_subdirectory(lib)
add_subdirectory(low)
add_subdirectory(parallel)
diff --git a/dune/uggrid/domain/std_domain.cc b/dune/uggrid/domain/std_domain.cc
index b3dd166b9..eb109f032 100644
--- a/dune/uggrid/domain/std_domain.cc
+++ b/dune/uggrid/domain/std_domain.cc
@@ -66,7 +66,7 @@
#include <dune/uggrid/low/ugenv.h>
#include <dune/uggrid/low/ugtypes.h>
-#include <gm/evm.h>
+#include <dune/uggrid/gm/evm.h>
/* dev modules */
#include <dev/ugdevices.h>
diff --git a/gm/2Dversion b/dune/uggrid/gm/2Dversion
similarity index 100%
rename from gm/2Dversion
rename to dune/uggrid/gm/2Dversion
diff --git a/gm/3Dversion b/dune/uggrid/gm/3Dversion
similarity index 100%
rename from gm/3Dversion
rename to dune/uggrid/gm/3Dversion
diff --git a/gm/CMakeLists.txt b/dune/uggrid/gm/CMakeLists.txt
similarity index 100%
rename from gm/CMakeLists.txt
rename to dune/uggrid/gm/CMakeLists.txt
diff --git a/gm/GenerateRules.cc b/dune/uggrid/gm/GenerateRules.cc
similarity index 100%
rename from gm/GenerateRules.cc
rename to dune/uggrid/gm/GenerateRules.cc
diff --git a/gm/GenerateRules.h b/dune/uggrid/gm/GenerateRules.h
similarity index 100%
rename from gm/GenerateRules.h
rename to dune/uggrid/gm/GenerateRules.h
diff --git a/gm/RefRules.cc b/dune/uggrid/gm/RefRules.cc
similarity index 100%
rename from gm/RefRules.cc
rename to dune/uggrid/gm/RefRules.cc
diff --git a/gm/algebra.cc b/dune/uggrid/gm/algebra.cc
similarity index 100%
rename from gm/algebra.cc
rename to dune/uggrid/gm/algebra.cc
diff --git a/gm/algebra.h b/dune/uggrid/gm/algebra.h
similarity index 100%
rename from gm/algebra.h
rename to dune/uggrid/gm/algebra.h
diff --git a/gm/cw.cc b/dune/uggrid/gm/cw.cc
similarity index 100%
rename from gm/cw.cc
rename to dune/uggrid/gm/cw.cc
diff --git a/gm/cw.h b/dune/uggrid/gm/cw.h
similarity index 100%
rename from gm/cw.h
rename to dune/uggrid/gm/cw.h
diff --git a/gm/dlmgr.cc b/dune/uggrid/gm/dlmgr.cc
similarity index 100%
rename from gm/dlmgr.cc
rename to dune/uggrid/gm/dlmgr.cc
diff --git a/gm/dlmgr.h b/dune/uggrid/gm/dlmgr.h
similarity index 100%
rename from gm/dlmgr.h
rename to dune/uggrid/gm/dlmgr.h
diff --git a/gm/dlmgr.t b/dune/uggrid/gm/dlmgr.t
similarity index 100%
rename from gm/dlmgr.t
rename to dune/uggrid/gm/dlmgr.t
diff --git a/gm/elements.cc b/dune/uggrid/gm/elements.cc
similarity index 100%
rename from gm/elements.cc
rename to dune/uggrid/gm/elements.cc
diff --git a/gm/elements.h b/dune/uggrid/gm/elements.h
similarity index 100%
rename from gm/elements.h
rename to dune/uggrid/gm/elements.h
diff --git a/gm/enrol.cc b/dune/uggrid/gm/enrol.cc
similarity index 100%
rename from gm/enrol.cc
rename to dune/uggrid/gm/enrol.cc
diff --git a/gm/enrol.h b/dune/uggrid/gm/enrol.h
similarity index 100%
rename from gm/enrol.h
rename to dune/uggrid/gm/enrol.h
diff --git a/gm/er.cc b/dune/uggrid/gm/er.cc
similarity index 100%
rename from gm/er.cc
rename to dune/uggrid/gm/er.cc
diff --git a/gm/er.h b/dune/uggrid/gm/er.h
similarity index 100%
rename from gm/er.h
rename to dune/uggrid/gm/er.h
diff --git a/gm/evalproc.cc b/dune/uggrid/gm/evalproc.cc
similarity index 100%
rename from gm/evalproc.cc
rename to dune/uggrid/gm/evalproc.cc
diff --git a/gm/evm.cc b/dune/uggrid/gm/evm.cc
similarity index 100%
rename from gm/evm.cc
rename to dune/uggrid/gm/evm.cc
diff --git a/gm/evm.h b/dune/uggrid/gm/evm.h
similarity index 100%
rename from gm/evm.h
rename to dune/uggrid/gm/evm.h
diff --git a/gm/gm.doc b/dune/uggrid/gm/gm.doc
similarity index 100%
rename from gm/gm.doc
rename to dune/uggrid/gm/gm.doc
diff --git a/gm/gm.h b/dune/uggrid/gm/gm.h
similarity index 100%
rename from gm/gm.h
rename to dune/uggrid/gm/gm.h
diff --git a/gm/gmcheck.cc b/dune/uggrid/gm/gmcheck.cc
similarity index 100%
rename from gm/gmcheck.cc
rename to dune/uggrid/gm/gmcheck.cc
diff --git a/gm/initgm.cc b/dune/uggrid/gm/initgm.cc
similarity index 100%
rename from gm/initgm.cc
rename to dune/uggrid/gm/initgm.cc
diff --git a/gm/initgm.h b/dune/uggrid/gm/initgm.h
similarity index 100%
rename from gm/initgm.h
rename to dune/uggrid/gm/initgm.h
diff --git a/gm/mgheapmgr.cc b/dune/uggrid/gm/mgheapmgr.cc
similarity index 100%
rename from gm/mgheapmgr.cc
rename to dune/uggrid/gm/mgheapmgr.cc
diff --git a/gm/mgheapmgr.h b/dune/uggrid/gm/mgheapmgr.h
similarity index 100%
rename from gm/mgheapmgr.h
rename to dune/uggrid/gm/mgheapmgr.h
diff --git a/gm/mgio.cc b/dune/uggrid/gm/mgio.cc
similarity index 100%
rename from gm/mgio.cc
rename to dune/uggrid/gm/mgio.cc
diff --git a/gm/mgio.h b/dune/uggrid/gm/mgio.h
similarity index 100%
rename from gm/mgio.h
rename to dune/uggrid/gm/mgio.h
diff --git a/gm/pargm.h b/dune/uggrid/gm/pargm.h
similarity index 100%
rename from gm/pargm.h
rename to dune/uggrid/gm/pargm.h
diff --git a/gm/refine.cc b/dune/uggrid/gm/refine.cc
similarity index 100%
rename from gm/refine.cc
rename to dune/uggrid/gm/refine.cc
diff --git a/gm/refine.h b/dune/uggrid/gm/refine.h
similarity index 100%
rename from gm/refine.h
rename to dune/uggrid/gm/refine.h
diff --git a/gm/rm-show.cc b/dune/uggrid/gm/rm-show.cc
similarity index 91%
rename from gm/rm-show.cc
rename to dune/uggrid/gm/rm-show.cc
index 9dcf692ae..ac5853517 100644
--- a/gm/rm-show.cc
+++ b/dune/uggrid/gm/rm-show.cc
@@ -8,10 +8,10 @@
#include <dune/uggrid/low/namespace.h>
#include <dune/uggrid/low/initlow.h>
#include <dev/ugdevices.h>
-#include <gm/initgm.h>
-#include <gm/rm.h>
+#include <dune/uggrid/gm/initgm.h>
+#include <dune/uggrid/gm/rm.h>
-#include <gm/rm-write2file.h>
+#include <dune/uggrid/gm/rm-write2file.h>
int main(int argc, char** argv)
{
diff --git a/gm/rm-tetrahedron-rules-test.cc b/dune/uggrid/gm/rm-tetrahedron-rules-test.cc
similarity index 100%
rename from gm/rm-tetrahedron-rules-test.cc
rename to dune/uggrid/gm/rm-tetrahedron-rules-test.cc
diff --git a/gm/rm-write2file.cc b/dune/uggrid/gm/rm-write2file.cc
similarity index 99%
rename from gm/rm-write2file.cc
rename to dune/uggrid/gm/rm-write2file.cc
index 347f6d791..4db1112dc 100644
--- a/gm/rm-write2file.cc
+++ b/dune/uggrid/gm/rm-write2file.cc
@@ -2,7 +2,7 @@
#include <dune/common/exceptions.hh>
-#include "gm/rm-write2file.h"
+#include "rm-write2file.h"
#ifdef __THREEDIM__
static NS_DIM_PREFIX REFRULE Empty_Rule =
@@ -87,7 +87,7 @@ int WriteSonData(std::FILE* const stream, NS_DIM_PREFIX sondata const& son)
// corners
num_chars += writeArray(stream, son.corners, MAX_CORNERS_OF_ELEM_DIM);
- num_chars += fprintf( stream,"},{");
+ num_chars += fprintf( stream,"},{");
// nb
num_chars += writeArray(stream, son.nb, MAX_SIDES_OF_ELEM_DIM);
@@ -126,7 +126,7 @@ void WriteRule2File(std::FILE* const stream, NS_DIM_PREFIX REFRULE const& theRul
{
char0 += fprintf( stream,"{%d,%d},",theRule.sonandnode[i][0],theRule.sonandnode[i][1]);
// new line after 6 sons
- if( (i%6) ==0 && i !=0)
+ if( (i%6) ==0 && i !=0)
{
// comment
if (!alreadyCommented)
@@ -151,7 +151,7 @@ void WriteRule2File(std::FILE* const stream, NS_DIM_PREFIX REFRULE const& theRul
{
fprintf( stream,"%*s// sons", comment_row - char0, " ");
alreadyCommented = !alreadyCommented;
- }
+ }
fprintf( stream,"\n ");
}
diff --git a/gm/rm-write2file.h b/dune/uggrid/gm/rm-write2file.h
similarity index 93%
rename from gm/rm-write2file.h
rename to dune/uggrid/gm/rm-write2file.h
index c7f232259..fa15b02c8 100644
--- a/gm/rm-write2file.h
+++ b/dune/uggrid/gm/rm-write2file.h
@@ -17,9 +17,9 @@
#include <iterator>
#include <dev/ugdevices.h>
-#include "gm/gm.h"
-#include "gm/rm.h"
-#include "gm/evm.h"
+#include "gm.h"
+#include "rm.h"
+#include "evm.h"
#define TET_RULE_FATHER_SIDE_OFFSET 20
diff --git a/gm/rm-writeRefRules2file.cc b/dune/uggrid/gm/rm-writeRefRules2file.cc
similarity index 96%
rename from gm/rm-writeRefRules2file.cc
rename to dune/uggrid/gm/rm-writeRefRules2file.cc
index 6eb2a19bf..b6e0b4c97 100644
--- a/gm/rm-writeRefRules2file.cc
+++ b/dune/uggrid/gm/rm-writeRefRules2file.cc
@@ -8,7 +8,7 @@
#include <dune/uggrid/low/namespace.h>
-#include <gm/rm-write2file.h>
+#include <dune/uggrid/gm/rm-write2file.h>
#include <iostream>
#include <memory>
diff --git a/gm/rm.cc b/dune/uggrid/gm/rm.cc
similarity index 100%
rename from gm/rm.cc
rename to dune/uggrid/gm/rm.cc
diff --git a/gm/rm.h b/dune/uggrid/gm/rm.h
similarity index 100%
rename from gm/rm.h
rename to dune/uggrid/gm/rm.h
diff --git a/gm/shapes.cc b/dune/uggrid/gm/shapes.cc
similarity index 100%
rename from gm/shapes.cc
rename to dune/uggrid/gm/shapes.cc
diff --git a/gm/shapes.h b/dune/uggrid/gm/shapes.h
similarity index 100%
rename from gm/shapes.h
rename to dune/uggrid/gm/shapes.h
diff --git a/gm/ugio.cc b/dune/uggrid/gm/ugio.cc
similarity index 100%
rename from gm/ugio.cc
rename to dune/uggrid/gm/ugio.cc
diff --git a/gm/ugio.h b/dune/uggrid/gm/ugio.h
similarity index 100%
rename from gm/ugio.h
rename to dune/uggrid/gm/ugio.h
diff --git a/gm/ugm.cc b/dune/uggrid/gm/ugm.cc
similarity index 100%
rename from gm/ugm.cc
rename to dune/uggrid/gm/ugm.cc
diff --git a/gm/ugm.h b/dune/uggrid/gm/ugm.h
similarity index 100%
rename from gm/ugm.h
rename to dune/uggrid/gm/ugm.h
diff --git a/initug.cc b/initug.cc
index 162ec0203..3eaf39749 100644
--- a/initug.cc
+++ b/initug.cc
@@ -64,7 +64,7 @@ using namespace PPIF;
#include <dune/uggrid/domain/domain.h>
/* grid manager module */
-#include <gm/initgm.h>
+#include <dune/uggrid/gm/initgm.h>
/* numerics module */
#include <np/initnumerics.h>
diff --git a/np/np.h b/np/np.h
index 53a6dffed..c717ecc8f 100644
--- a/np/np.h
+++ b/np/np.h
@@ -32,8 +32,8 @@
#ifndef __NP__
#define __NP__
-#include <gm/algebra.h>
-#include <gm/gm.h>
+#include <dune/uggrid/gm/algebra.h>
+#include <dune/uggrid/gm/gm.h>
#include <dune/uggrid/low/namespace.h>
#include <dune/uggrid/low/ugenv.h>
#include <dune/uggrid/low/ugtypes.h>
diff --git a/np/udm/disctools.cc b/np/udm/disctools.cc
index 40ccfd76c..08cd07c77 100644
--- a/np/udm/disctools.cc
+++ b/np/udm/disctools.cc
@@ -35,8 +35,8 @@
#include <cstring>
#include <cassert>
-#include <gm/evm.h> /* for data structure */
-#include <gm/gm.h> /* for data structure */
+#include <dune/uggrid/gm/evm.h> /* for data structure */
+#include <dune/uggrid/gm/gm.h> /* for data structure */
#include <dev/ugdevices.h>
#include <dune/uggrid/low/general.h>
diff --git a/np/udm/disctools.h b/np/udm/disctools.h
index a6f4c3976..222b6cc15 100644
--- a/np/udm/disctools.h
+++ b/np/udm/disctools.h
@@ -28,7 +28,7 @@
#ifndef __DISCTOOLS__
#define __DISCTOOLS__
-#include <gm/gm.h>
+#include <dune/uggrid/gm/gm.h>
#include <dune/uggrid/low/namespace.h>
#include <dune/uggrid/low/ugtypes.h>
#include <np/np.h>
diff --git a/np/udm/formats.cc b/np/udm/formats.cc
index ac9a8f9a6..54053be8c 100644
--- a/np/udm/formats.cc
+++ b/np/udm/formats.cc
@@ -34,10 +34,10 @@
#include <ctype.h>
#include <dev/ugdevices.h>
-#include <gm/algebra.h>
-#include <gm/enrol.h>
-#include <gm/gm.h>
-#include <gm/ugm.h>
+#include <dune/uggrid/gm/algebra.h>
+#include <dune/uggrid/gm/enrol.h>
+#include <dune/uggrid/gm/gm.h>
+#include <dune/uggrid/gm/ugm.h>
#include <dune/uggrid/low/misc.h>
#include <dune/uggrid/low/general.h>
#include <dune/uggrid/low/scan.h> // for ReadArgvChar
diff --git a/np/udm/formats.h b/np/udm/formats.h
index fb92a4a47..f61552e00 100644
--- a/np/udm/formats.h
+++ b/np/udm/formats.h
@@ -32,7 +32,7 @@
#ifndef __FORMATS__
#define __FORMATS__
-#include <gm/gm.h>
+#include <dune/uggrid/gm/gm.h>
#include <dune/uggrid/low/namespace.h>
#include "udm.h"
diff --git a/np/udm/udm.cc b/np/udm/udm.cc
index 85c1e9ce4..89f8174ab 100644
--- a/np/udm/udm.cc
+++ b/np/udm/udm.cc
@@ -33,8 +33,8 @@
#include <cstring>
#include <dev/ugdevices.h>
-#include <gm/gm.h>
-#include <gm/rm.h>
+#include <dune/uggrid/gm/gm.h>
+#include <dune/uggrid/gm/rm.h>
#include <dune/uggrid/low/architecture.h>
#include <dune/uggrid/low/debug.h>
#include <dune/uggrid/low/general.h>
diff --git a/np/udm/udm.h b/np/udm/udm.h
index ac9f0955b..72375aaa5 100644
--- a/np/udm/udm.h
+++ b/np/udm/udm.h
@@ -32,7 +32,7 @@
#ifndef __UDM__
#define __UDM__
-#include <gm/gm.h>
+#include <dune/uggrid/gm/gm.h>
#include <dune/uggrid/low/namespace.h>
#include <dune/uggrid/low/ugtypes.h>
#include <np/algebra/sm.h>
diff --git a/parallel/dddif/debugger.cc b/parallel/dddif/debugger.cc
index 1d9752ee3..68003786d 100644
--- a/parallel/dddif/debugger.cc
+++ b/parallel/dddif/debugger.cc
@@ -10,7 +10,7 @@
#include "parallel.h"
#include "memmgr.h"
-#include <gm/ugm.h>
+#include <dune/uggrid/gm/ugm.h>
#include <dev/ugdevices.h>
#include <dune/uggrid/low/general.h>
#include <dune/uggrid/low/namespace.h>
diff --git a/parallel/dddif/gridcons.cc b/parallel/dddif/gridcons.cc
index ffccbc556..f12616f28 100644
--- a/parallel/dddif/gridcons.cc
+++ b/parallel/dddif/gridcons.cc
@@ -35,11 +35,11 @@
#include <dune/uggrid/low/debug.h>
#include <dune/uggrid/low/general.h>
#include <dune/uggrid/low/namespace.h>
-#include <gm/evm.h>
-#include <gm/gm.h>
-#include <gm/refine.h>
-#include <gm/shapes.h>
-#include <gm/ugm.h>
+#include <dune/uggrid/gm/evm.h>
+#include <dune/uggrid/gm/gm.h>
+#include <dune/uggrid/gm/refine.h>
+#include <dune/uggrid/gm/shapes.h>
+#include <dune/uggrid/gm/ugm.h>
#include <dev/ugdevices.h>
/* UG namespaces: */
diff --git a/parallel/dddif/handler.cc b/parallel/dddif/handler.cc
index 54c17c399..c040fe4ce 100644
--- a/parallel/dddif/handler.cc
+++ b/parallel/dddif/handler.cc
@@ -43,13 +43,13 @@
#include <dev/ugdevices.h>
#include <dune/uggrid/domain/domain.h>
#include "parallel.h"
-#include <gm/algebra.h>
-#include <gm/evm.h>
-#include <gm/pargm.h>
-#include <gm/rm.h>
-#include <gm/refine.h>
-#include <gm/shapes.h>
-#include <gm/ugm.h>
+#include <dune/uggrid/gm/algebra.h>
+#include <dune/uggrid/gm/evm.h>
+#include <dune/uggrid/gm/pargm.h>
+#include <dune/uggrid/gm/rm.h>
+#include <dune/uggrid/gm/refine.h>
+#include <dune/uggrid/gm/shapes.h>
+#include <dune/uggrid/gm/ugm.h>
#include <dune/uggrid/low/architecture.h>
#include <dune/uggrid/low/debug.h>
#include <dune/uggrid/low/heaps.h>
diff --git a/parallel/dddif/identify.cc b/parallel/dddif/identify.cc
index e95eb585e..e531c6e91 100644
--- a/parallel/dddif/identify.cc
+++ b/parallel/dddif/identify.cc
@@ -36,10 +36,10 @@
#include <dev/ugdevices.h>
-#include <gm/gm.h>
-#include <gm/refine.h>
-#include <gm/rm.h>
-#include <gm/ugm.h>
+#include <dune/uggrid/gm/gm.h>
+#include <dune/uggrid/gm/refine.h>
+#include <dune/uggrid/gm/rm.h>
+#include <dune/uggrid/gm/ugm.h>
#include <dune/uggrid/low/debug.h>
#include <dune/uggrid/low/general.h>
#include <dune/uggrid/low/ugtypes.h>
diff --git a/parallel/dddif/initddd.cc b/parallel/dddif/initddd.cc
index 6f3785d55..d75bac1a0 100644
--- a/parallel/dddif/initddd.cc
+++ b/parallel/dddif/initddd.cc
@@ -35,7 +35,7 @@
#include <dune/uggrid/low/debug.h>
#include <dune/uggrid/low/general.h>
#include <dune/uggrid/low/namespace.h>
-#include <gm/ugm.h> /* for GetFreeOBJT() */
+#include <dune/uggrid/gm/ugm.h> /* for GetFreeOBJT() */
#include "memmgr.h"
#include <dev/ugdevices.h>
diff --git a/parallel/dddif/lb.cc b/parallel/dddif/lb.cc
index 34c584620..4f798dc00 100644
--- a/parallel/dddif/lb.cc
+++ b/parallel/dddif/lb.cc
@@ -33,8 +33,8 @@
#include <cstdio>
#include "parallel.h"
-#include <gm/evm.h>
-#include <gm/ugm.h>
+#include <dune/uggrid/gm/evm.h>
+#include <dune/uggrid/gm/ugm.h>
#include <dev/ugdevices.h>
#include <dune/uggrid/low/general.h>
#include <dune/uggrid/low/namespace.h>
diff --git a/parallel/dddif/lbrcb.cc b/parallel/dddif/lbrcb.cc
index 0f43f3004..1973ab3fb 100644
--- a/parallel/dddif/lbrcb.cc
+++ b/parallel/dddif/lbrcb.cc
@@ -41,8 +41,8 @@
#include <dune/uggrid/low/general.h>
#include <dune/uggrid/low/namespace.h>
#include <dev/ugdevices.h>
-#include <gm/evm.h>
-#include <gm/ugm.h>
+#include <dune/uggrid/gm/evm.h>
+#include <dune/uggrid/gm/ugm.h>
USING_UG_NAMESPACES
using namespace PPIF;
diff --git a/parallel/dddif/memmgr.cc b/parallel/dddif/memmgr.cc
index 1a264b520..9060a7184 100644
--- a/parallel/dddif/memmgr.cc
+++ b/parallel/dddif/memmgr.cc
@@ -43,7 +43,7 @@
#include "parallel.h"
-#include <gm/ugm.h>
+#include <dune/uggrid/gm/ugm.h>
#include "memmgr.h"
/* UG namespaces */
diff --git a/parallel/dddif/overlap.cc b/parallel/dddif/overlap.cc
index fd76efac6..045dd51d4 100644
--- a/parallel/dddif/overlap.cc
+++ b/parallel/dddif/overlap.cc
@@ -46,13 +46,13 @@
#include <dev/ugdevices.h>
/* gm module */
-#include <gm/algebra.h>
-#include <gm/evm.h>
-#include <gm/gm.h>
-#include <gm/pargm.h>
-#include <gm/refine.h>
-#include <gm/rm.h>
-#include <gm/ugm.h>
+#include <dune/uggrid/gm/algebra.h>
+#include <dune/uggrid/gm/evm.h>
+#include <dune/uggrid/gm/gm.h>
+#include <dune/uggrid/gm/pargm.h>
+#include <dune/uggrid/gm/refine.h>
+#include <dune/uggrid/gm/rm.h>
+#include <dune/uggrid/gm/ugm.h>
/* parallel modules */
#include <parallel/ddd/include/ddd.h>
diff --git a/parallel/dddif/parallel.h b/parallel/dddif/parallel.h
index a64541822..154fd106f 100644
--- a/parallel/dddif/parallel.h
+++ b/parallel/dddif/parallel.h
@@ -45,8 +45,8 @@
#include <parallel/ddd/include/ddd.h>
#endif
-#include <gm/gm.h>
-#include <gm/pargm.h>
+#include <dune/uggrid/gm/gm.h>
+#include <dune/uggrid/gm/pargm.h>
START_UGDIM_NAMESPACE
diff --git a/parallel/dddif/partition.cc b/parallel/dddif/partition.cc
index 78a4cfade..93e116a59 100644
--- a/parallel/dddif/partition.cc
+++ b/parallel/dddif/partition.cc
@@ -47,13 +47,13 @@
#include <dev/ugdevices.h>
/* gm module */
-#include <gm/algebra.h>
-#include <gm/evm.h>
-#include <gm/gm.h>
-#include <gm/pargm.h>
-#include <gm/refine.h>
-#include <gm/rm.h>
-#include <gm/ugm.h>
+#include <dune/uggrid/gm/algebra.h>
+#include <dune/uggrid/gm/evm.h>
+#include <dune/uggrid/gm/gm.h>
+#include <dune/uggrid/gm/pargm.h>
+#include <dune/uggrid/gm/refine.h>
+#include <dune/uggrid/gm/rm.h>
+#include <dune/uggrid/gm/ugm.h>
/* parallel modules */
#include <parallel/ddd/include/ddd.h>
diff --git a/parallel/dddif/pgmcheck.cc b/parallel/dddif/pgmcheck.cc
index 558c30bf5..d9eef2f78 100644
--- a/parallel/dddif/pgmcheck.cc
+++ b/parallel/dddif/pgmcheck.cc
@@ -36,11 +36,11 @@
#include "parallel.h"
#include <dev/ugdevices.h>
-#include <gm/evm.h>
-#include <gm/gm.h>
-#include <gm/refine.h>
-#include <gm/shapes.h>
-#include <gm/ugm.h>
+#include <dune/uggrid/gm/evm.h>
+#include <dune/uggrid/gm/gm.h>
+#include <dune/uggrid/gm/refine.h>
+#include <dune/uggrid/gm/shapes.h>
+#include <dune/uggrid/gm/ugm.h>
#include <dune/uggrid/low/debug.h>
#include <dune/uggrid/low/general.h>
#include <dune/uggrid/low/namespace.h>
diff --git a/parallel/dddif/priority.cc b/parallel/dddif/priority.cc
index 5a9471283..8afbc730f 100644
--- a/parallel/dddif/priority.cc
+++ b/parallel/dddif/priority.cc
@@ -34,11 +34,11 @@
#include "parallel.h"
#include <dev/ugdevices.h>
-#include <gm/evm.h>
-#include <gm/gm.h>
-#include <gm/refine.h>
-#include <gm/shapes.h>
-#include <gm/ugm.h>
+#include <dune/uggrid/gm/evm.h>
+#include <dune/uggrid/gm/gm.h>
+#include <dune/uggrid/gm/refine.h>
+#include <dune/uggrid/gm/shapes.h>
+#include <dune/uggrid/gm/ugm.h>
#include <dune/uggrid/low/debug.h>
#include <dune/uggrid/low/general.h>
#include <dune/uggrid/low/namespace.h>
diff --git a/parallel/dddif/support.cc b/parallel/dddif/support.cc
index 5f73ec8e9..33d0eb01f 100644
--- a/parallel/dddif/support.cc
+++ b/parallel/dddif/support.cc
@@ -48,7 +48,7 @@
#include <dune/uggrid/low/ugtypes.h>
#include <parallel/ddd/include/memmgr.h>
-#include <gm/pargm.h>
+#include <dune/uggrid/gm/pargm.h>
/* UG namespaces: */
diff --git a/parallel/dddif/trans.cc b/parallel/dddif/trans.cc
index 5516cc915..d8632b0d2 100644
--- a/parallel/dddif/trans.cc
+++ b/parallel/dddif/trans.cc
@@ -39,12 +39,12 @@
#include "parallel.h"
#include <dev/ugdevices.h>
#include <dune/uggrid/domain/domain.h>
-#include <gm/algebra.h>
-#include <gm/evm.h>
-#include <gm/gm.h>
-#include <gm/mgheapmgr.h>
-#include <gm/refine.h>
-#include <gm/ugm.h>
+#include <dune/uggrid/gm/algebra.h>
+#include <dune/uggrid/gm/evm.h>
+#include <dune/uggrid/gm/gm.h>
+#include <dune/uggrid/gm/mgheapmgr.h>
+#include <dune/uggrid/gm/refine.h>
+#include <dune/uggrid/gm/ugm.h>
#include <dune/uggrid/low/debug.h>
#include <dune/uggrid/low/general.h>
#include <dune/uggrid/low/namespace.h>
diff --git a/ui/commands.cc b/ui/commands.cc
index 542d6351d..74faed0d3 100644
--- a/ui/commands.cc
+++ b/ui/commands.cc
@@ -65,16 +65,16 @@
#include <dev/ugdevices.h>
/* grid manager module */
-#include <gm/algebra.h>
-#include <gm/cw.h>
-#include <gm/elements.h>
-#include <gm/evm.h>
-#include <gm/gm.h>
-#include <gm/mgio.h>
-#include <gm/pargm.h>
-#include <gm/rm.h>
-#include <gm/shapes.h>
-#include <gm/ugm.h>
+#include <dune/uggrid/gm/algebra.h>
+#include <dune/uggrid/gm/cw.h>
+#include <dune/uggrid/gm/elements.h>
+#include <dune/uggrid/gm/evm.h>
+#include <dune/uggrid/gm/gm.h>
+#include <dune/uggrid/gm/mgio.h>
+#include <dune/uggrid/gm/pargm.h>
+#include <dune/uggrid/gm/rm.h>
+#include <dune/uggrid/gm/shapes.h>
+#include <dune/uggrid/gm/ugm.h>
/* numerics module */
#include <np/np.h>
diff --git a/ui/commands.h b/ui/commands.h
index 4c27e8bb9..6e38860e3 100644
--- a/ui/commands.h
+++ b/ui/commands.h
@@ -35,7 +35,7 @@
#include <dune/uggrid/parallel/ppif/ppiftypes.hh>
-#include <gm/gm.h>
+#include <dune/uggrid/gm/gm.h>
#include <dune/uggrid/low/namespace.h>
#include <dune/uggrid/low/ugtypes.h>
--
GitLab