From ee2274661aa7676e583d001a4c81ee7b0c13bb36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
Date: Fri, 1 Nov 2019 20:01:23 +0100
Subject: [PATCH] Move ui/, dev/, initug.* to dune/uggrid/*
---
CMakeLists.txt | 5 -----
dev/CMakeLists.txt | 5 -----
dune/uggrid/CMakeLists.txt | 7 +++++++
{ui => dune/uggrid}/commands.cc | 4 ++--
{ui => dune/uggrid}/commands.doc | 0
{ui => dune/uggrid}/commands.h | 0
dune/uggrid/domain/std_domain.cc | 2 +-
dune/uggrid/gm/algebra.cc | 2 +-
dune/uggrid/gm/cw.cc | 2 +-
dune/uggrid/gm/elements.cc | 2 +-
dune/uggrid/gm/enrol.cc | 2 +-
dune/uggrid/gm/er.cc | 2 +-
dune/uggrid/gm/evalproc.cc | 2 +-
dune/uggrid/gm/evm.cc | 2 +-
dune/uggrid/gm/gmcheck.cc | 2 +-
dune/uggrid/gm/refine.cc | 2 +-
dune/uggrid/gm/rm-show.cc | 2 +-
dune/uggrid/gm/rm-tetrahedron-rules-test.cc | 2 +-
dune/uggrid/gm/rm-write2file.h | 2 +-
dune/uggrid/gm/rm.cc | 2 +-
dune/uggrid/gm/ugio.cc | 2 +-
dune/uggrid/gm/ugm.cc | 2 +-
initug.cc => dune/uggrid/initug.cc | 2 +-
initug.h => dune/uggrid/initug.h | 0
dune/uggrid/lib/CMakeLists.txt | 2 +-
dune/uggrid/low/debug.cc | 2 +-
dune/uggrid/low/fileopen.cc | 2 +-
dune/uggrid/low/heaps.cc | 2 +-
dune/uggrid/low/ugenv.cc | 2 +-
{dev => dune/uggrid}/ugdevices.cc | 2 +-
{dev => dune/uggrid}/ugdevices.doc | 0
{dev => dune/uggrid}/ugdevices.h | 0
np/udm/disctools.cc | 2 +-
np/udm/formats.cc | 2 +-
np/udm/udm.cc | 2 +-
parallel/dddif/debugger.cc | 2 +-
parallel/dddif/gridcons.cc | 2 +-
parallel/dddif/handler.cc | 2 +-
parallel/dddif/identify.cc | 2 +-
parallel/dddif/initddd.cc | 2 +-
parallel/dddif/lb.cc | 2 +-
parallel/dddif/lbrcb.cc | 2 +-
parallel/dddif/memmgr.cc | 2 +-
parallel/dddif/overlap.cc | 2 +-
parallel/dddif/partition.cc | 2 +-
parallel/dddif/pgmcheck.cc | 2 +-
parallel/dddif/priority.cc | 2 +-
parallel/dddif/trans.cc | 2 +-
ui/CMakeLists.txt | 3 ---
49 files changed, 48 insertions(+), 54 deletions(-)
delete mode 100644 dev/CMakeLists.txt
rename {ui => dune/uggrid}/commands.cc (99%)
rename {ui => dune/uggrid}/commands.doc (100%)
rename {ui => dune/uggrid}/commands.h (100%)
rename initug.cc => dune/uggrid/initug.cc (99%)
rename initug.h => dune/uggrid/initug.h (100%)
rename {dev => dune/uggrid}/ugdevices.cc (99%)
rename {dev => dune/uggrid}/ugdevices.doc (100%)
rename {dev => dune/uggrid}/ugdevices.h (100%)
delete mode 100644 ui/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89ad084d8..69e3a3ac5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,16 +163,11 @@ configure_file(libug.pc.in libug.pc)
configure_file(ug-config.cmake.in ug-config.cmake @ONLY)
configure_file(ug-config-version.cmake.in ug-config-version.cmake @ONLY)
-#install header
-install(FILES initug.h DESTINATION ${CMAKE_INSTALL_PKGINCLUDEDIR})
-
if(UG_ENABLE_PARALLEL)
add_subdirectory(parallel)
endif()
-add_subdirectory(dev)
add_subdirectory(dune)
add_subdirectory(np)
-add_subdirectory(ui)
add_subdirectory(cmake/modules)
# set variable names for config.h
set(DDD_MAX_PROCBITS_IN_GID ${UG_DDD_MACROBITS})
diff --git a/dev/CMakeLists.txt b/dev/CMakeLists.txt
deleted file mode 100644
index f49283ad8..000000000
--- a/dev/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-set(SOURCES ugdevices.cc)
-set(devinclude_HEADERS ugdevices.h)
-
-add_library(devices OBJECT ${SOURCES})
-install(FILES ${devinclude_HEADERS} DESTINATION ${CMAKE_INSTALL_PKGINCLUDEDIR})
diff --git a/dune/uggrid/CMakeLists.txt b/dune/uggrid/CMakeLists.txt
index fada1079a..146b3a215 100644
--- a/dune/uggrid/CMakeLists.txt
+++ b/dune/uggrid/CMakeLists.txt
@@ -3,3 +3,10 @@ add_subdirectory(gm)
add_subdirectory(lib)
add_subdirectory(low)
add_subdirectory(parallel)
+
+install(
+ FILES ugdevices.h commands.h initug.h
+ DESTINATION ${CMAKE_INSTALL_PKGINCLUDEDIR})
+
+add_library(devices OBJECT ugdevices.cc)
+ug_add_dim_libs(ugui OBJECT ugdevices.cc commands.cc)
diff --git a/ui/commands.cc b/dune/uggrid/commands.cc
similarity index 99%
rename from ui/commands.cc
rename to dune/uggrid/commands.cc
index 74faed0d3..9cf317d76 100644
--- a/ui/commands.cc
+++ b/dune/uggrid/commands.cc
@@ -46,7 +46,7 @@
#include <ctime>
#include <cassert>
-#include <initug.h>
+#include <dune/uggrid/initug.h>
/* low module */
#include <dune/uggrid/low/architecture.h>
@@ -62,7 +62,7 @@
#include <dune/uggrid/low/ugtypes.h>
/* devices module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
/* grid manager module */
#include <dune/uggrid/gm/algebra.h>
diff --git a/ui/commands.doc b/dune/uggrid/commands.doc
similarity index 100%
rename from ui/commands.doc
rename to dune/uggrid/commands.doc
diff --git a/ui/commands.h b/dune/uggrid/commands.h
similarity index 100%
rename from ui/commands.h
rename to dune/uggrid/commands.h
diff --git a/dune/uggrid/domain/std_domain.cc b/dune/uggrid/domain/std_domain.cc
index eb109f032..2bdf675cf 100644
--- a/dune/uggrid/domain/std_domain.cc
+++ b/dune/uggrid/domain/std_domain.cc
@@ -69,7 +69,7 @@
#include <dune/uggrid/gm/evm.h>
/* dev modules */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
/* domain module */
#include "domain.h"
diff --git a/dune/uggrid/gm/algebra.cc b/dune/uggrid/gm/algebra.cc
index 4ba7714bd..5a72e424a 100644
--- a/dune/uggrid/gm/algebra.cc
+++ b/dune/uggrid/gm/algebra.cc
@@ -73,7 +73,7 @@
#include <dune/uggrid/low/ugenv.h>
#include <dune/uggrid/low/ugtypes.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include "algebra.h"
#include "cw.h"
diff --git a/dune/uggrid/gm/cw.cc b/dune/uggrid/gm/cw.cc
index 8acf17ad0..143e5162c 100644
--- a/dune/uggrid/gm/cw.cc
+++ b/dune/uggrid/gm/cw.cc
@@ -27,7 +27,7 @@
#define __COMPILE_CW__
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include <dune/uggrid/low/architecture.h>
#include <dune/uggrid/low/debug.h>
#include <dune/uggrid/low/general.h>
diff --git a/dune/uggrid/gm/elements.cc b/dune/uggrid/gm/elements.cc
index 41acaa1ef..3bb4d68f3 100644
--- a/dune/uggrid/gm/elements.cc
+++ b/dune/uggrid/gm/elements.cc
@@ -24,7 +24,7 @@
#include <cassert>
#include <dune/uggrid/low/general.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include "gm.h"
#include "ugm.h"
diff --git a/dune/uggrid/gm/enrol.cc b/dune/uggrid/gm/enrol.cc
index 98d4c564f..db89fad76 100644
--- a/dune/uggrid/gm/enrol.cc
+++ b/dune/uggrid/gm/enrol.cc
@@ -51,7 +51,7 @@
#include <dune/uggrid/low/ugtypes.h>
/* devices module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
/* grid manager module */
#include "gm.h"
diff --git a/dune/uggrid/gm/er.cc b/dune/uggrid/gm/er.cc
index e2bd1831e..1e0023645 100644
--- a/dune/uggrid/gm/er.cc
+++ b/dune/uggrid/gm/er.cc
@@ -76,7 +76,7 @@
#include "elements.h"
/* ui (for new memory model, remove later) */
-#include <ui/commands.h>
+#include <dune/uggrid/commands.h>
/* own header */
#include "er.h"
diff --git a/dune/uggrid/gm/evalproc.cc b/dune/uggrid/gm/evalproc.cc
index e2909f7b9..8e68a2ce2 100644
--- a/dune/uggrid/gm/evalproc.cc
+++ b/dune/uggrid/gm/evalproc.cc
@@ -38,7 +38,7 @@
#include "gm.h"
#include "evm.h"
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include "shapes.h"
#include "elements.h"
diff --git a/dune/uggrid/gm/evm.cc b/dune/uggrid/gm/evm.cc
index 81e702c9e..2dd6e5b3a 100644
--- a/dune/uggrid/gm/evm.cc
+++ b/dune/uggrid/gm/evm.cc
@@ -39,7 +39,7 @@
#include <dune/uggrid/low/architecture.h>
#include <dune/uggrid/low/general.h>
#include <dune/uggrid/low/misc.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include <dune/uggrid/low/ugtypes.h>
#include "elements.h"
diff --git a/dune/uggrid/gm/gmcheck.cc b/dune/uggrid/gm/gmcheck.cc
index 369d4c3ff..9d0b31aff 100644
--- a/dune/uggrid/gm/gmcheck.cc
+++ b/dune/uggrid/gm/gmcheck.cc
@@ -49,7 +49,7 @@
#include <dune/uggrid/low/ugstruct.h>
#include <dune/uggrid/low/ugtypes.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include "evm.h"
#include "gm.h"
diff --git a/dune/uggrid/gm/refine.cc b/dune/uggrid/gm/refine.cc
index 535b34da9..a570c8749 100644
--- a/dune/uggrid/gm/refine.cc
+++ b/dune/uggrid/gm/refine.cc
@@ -76,7 +76,7 @@
#include <dune/uggrid/low/ugtypes.h>
/* dev module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
/* gm module */
#include "algebra.h"
diff --git a/dune/uggrid/gm/rm-show.cc b/dune/uggrid/gm/rm-show.cc
index ac5853517..5a1ad3790 100644
--- a/dune/uggrid/gm/rm-show.cc
+++ b/dune/uggrid/gm/rm-show.cc
@@ -7,7 +7,7 @@
#include <dune/uggrid/low/namespace.h>
#include <dune/uggrid/low/initlow.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include <dune/uggrid/gm/initgm.h>
#include <dune/uggrid/gm/rm.h>
diff --git a/dune/uggrid/gm/rm-tetrahedron-rules-test.cc b/dune/uggrid/gm/rm-tetrahedron-rules-test.cc
index fbd3c86f5..ca5c0563c 100644
--- a/dune/uggrid/gm/rm-tetrahedron-rules-test.cc
+++ b/dune/uggrid/gm/rm-tetrahedron-rules-test.cc
@@ -5,7 +5,7 @@
#include <dune/common/parallel/mpihelper.hh>
#include <dune/common/test/testsuite.hh>
-#include <initug.h>
+#include <dune/uggrid/initug.h>
#include "evm.h"
#include "gm.h"
diff --git a/dune/uggrid/gm/rm-write2file.h b/dune/uggrid/gm/rm-write2file.h
index fa15b02c8..5444adf6c 100644
--- a/dune/uggrid/gm/rm-write2file.h
+++ b/dune/uggrid/gm/rm-write2file.h
@@ -16,7 +16,7 @@
#include <algorithm>
#include <iterator>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include "gm.h"
#include "rm.h"
#include "evm.h"
diff --git a/dune/uggrid/gm/rm.cc b/dune/uggrid/gm/rm.cc
index d713f640e..e99960c3d 100644
--- a/dune/uggrid/gm/rm.cc
+++ b/dune/uggrid/gm/rm.cc
@@ -43,7 +43,7 @@
#include <dune/uggrid/low/misc.h>
/* dev module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
/* gm module */
#include "evm.h"
diff --git a/dune/uggrid/gm/ugio.cc b/dune/uggrid/gm/ugio.cc
index a3eb5838a..0f08ddcb7 100644
--- a/dune/uggrid/gm/ugio.cc
+++ b/dune/uggrid/gm/ugio.cc
@@ -53,7 +53,7 @@
#include <dune/uggrid/low/ugstruct.h>
#include <dune/uggrid/low/ugtypes.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#ifdef ModelP
#include <parallel/dddif/parallel.h>
#endif
diff --git a/dune/uggrid/gm/ugm.cc b/dune/uggrid/gm/ugm.cc
index d25c8f5ff..98de0425c 100644
--- a/dune/uggrid/gm/ugm.cc
+++ b/dune/uggrid/gm/ugm.cc
@@ -56,7 +56,7 @@
#include <dune/uggrid/low/ugstruct.h>
#include <dune/uggrid/low/ugtypes.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include <dune/common/unused.hh>
#include "cw.h"
diff --git a/initug.cc b/dune/uggrid/initug.cc
similarity index 99%
rename from initug.cc
rename to dune/uggrid/initug.cc
index 3eaf39749..982c759c3 100644
--- a/initug.cc
+++ b/dune/uggrid/initug.cc
@@ -58,7 +58,7 @@ using namespace PPIF;
#endif
/* devices module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
/* domain module */
#include <dune/uggrid/domain/domain.h>
diff --git a/initug.h b/dune/uggrid/initug.h
similarity index 100%
rename from initug.h
rename to dune/uggrid/initug.h
diff --git a/dune/uggrid/lib/CMakeLists.txt b/dune/uggrid/lib/CMakeLists.txt
index b036bc75f..05a2c0df9 100644
--- a/dune/uggrid/lib/CMakeLists.txt
+++ b/dune/uggrid/lib/CMakeLists.txt
@@ -15,7 +15,7 @@ dune_add_library(ugL $<TARGET_OBJECTS:devices> $<TARGET_OBJECTS:low> ${_parallel
../parallel/ppif/ppifcontext.cc
ADD_LIBS ${DUNE_LIBS}
)
-ug_add_dim_libs(ugS APPEND DUNE SOURCES ../../../initug.cc
+ug_add_dim_libs(ugS APPEND DUNE SOURCES ../initug.cc
OBJECT_DIM_LIBS ${_dim_libs} domS ${_parallel_dim_libs}
ADD_LIBS ugL ${DUNE_LIBS}
)
diff --git a/dune/uggrid/low/debug.cc b/dune/uggrid/low/debug.cc
index 304d866a7..b559d88e6 100644
--- a/dune/uggrid/low/debug.cc
+++ b/dune/uggrid/low/debug.cc
@@ -39,7 +39,7 @@
#include <cstdio>
#include <stdarg.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include "fileopen.h"
#include "debug.h"
diff --git a/dune/uggrid/low/fileopen.cc b/dune/uggrid/low/fileopen.cc
index 48fc76fe9..b7c9bd33b 100644
--- a/dune/uggrid/low/fileopen.cc
+++ b/dune/uggrid/low/fileopen.cc
@@ -70,7 +70,7 @@
#include "defaults.h"
#include "general.h"
#include "ugenv.h"
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include "fileopen.h"
diff --git a/dune/uggrid/low/heaps.cc b/dune/uggrid/low/heaps.cc
index 1c7f1f95f..1e3891809 100644
--- a/dune/uggrid/low/heaps.cc
+++ b/dune/uggrid/low/heaps.cc
@@ -42,7 +42,7 @@
#include "misc.h"
#include "general.h"
#include "debug.h"
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include "namespace.h"
USING_UG_NAMESPACE
diff --git a/dune/uggrid/low/ugenv.cc b/dune/uggrid/low/ugenv.cc
index bcfa39d59..101d75e18 100644
--- a/dune/uggrid/low/ugenv.cc
+++ b/dune/uggrid/low/ugenv.cc
@@ -37,7 +37,7 @@
#include "misc.h"
#include "ugenv.h"
/** \todo this is a hierarchy conflict, remove. (VR) */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
USING_UG_NAMESPACE
diff --git a/dev/ugdevices.cc b/dune/uggrid/ugdevices.cc
similarity index 99%
rename from dev/ugdevices.cc
rename to dune/uggrid/ugdevices.cc
index 9b276601f..2cdbb889a 100644
--- a/dev/ugdevices.cc
+++ b/dune/uggrid/ugdevices.cc
@@ -46,7 +46,7 @@
#include <dune/uggrid/low/ugtypes.h>
/* dev module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
/* dddif module */
#ifdef ModelP
diff --git a/dev/ugdevices.doc b/dune/uggrid/ugdevices.doc
similarity index 100%
rename from dev/ugdevices.doc
rename to dune/uggrid/ugdevices.doc
diff --git a/dev/ugdevices.h b/dune/uggrid/ugdevices.h
similarity index 100%
rename from dev/ugdevices.h
rename to dune/uggrid/ugdevices.h
diff --git a/np/udm/disctools.cc b/np/udm/disctools.cc
index 08cd07c77..0e3976566 100644
--- a/np/udm/disctools.cc
+++ b/np/udm/disctools.cc
@@ -37,7 +37,7 @@
#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/ugdevices.h>
#include <dune/uggrid/low/general.h>
#include "disctools.h"
diff --git a/np/udm/formats.cc b/np/udm/formats.cc
index 54053be8c..1cc63f537 100644
--- a/np/udm/formats.cc
+++ b/np/udm/formats.cc
@@ -33,7 +33,7 @@
#include <cstring>
#include <ctype.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include <dune/uggrid/gm/algebra.h>
#include <dune/uggrid/gm/enrol.h>
#include <dune/uggrid/gm/gm.h>
diff --git a/np/udm/udm.cc b/np/udm/udm.cc
index 89f8174ab..49996c812 100644
--- a/np/udm/udm.cc
+++ b/np/udm/udm.cc
@@ -32,7 +32,7 @@
#include <cstring>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include <dune/uggrid/gm/gm.h>
#include <dune/uggrid/gm/rm.h>
#include <dune/uggrid/low/architecture.h>
diff --git a/parallel/dddif/debugger.cc b/parallel/dddif/debugger.cc
index 68003786d..5edaedfa1 100644
--- a/parallel/dddif/debugger.cc
+++ b/parallel/dddif/debugger.cc
@@ -11,7 +11,7 @@
#include "parallel.h"
#include "memmgr.h"
#include <dune/uggrid/gm/ugm.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/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 f12616f28..f3ccd41df 100644
--- a/parallel/dddif/gridcons.cc
+++ b/parallel/dddif/gridcons.cc
@@ -40,7 +40,7 @@
#include <dune/uggrid/gm/refine.h>
#include <dune/uggrid/gm/shapes.h>
#include <dune/uggrid/gm/ugm.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
/* UG namespaces: */
USING_UG_NAMESPACES
diff --git a/parallel/dddif/handler.cc b/parallel/dddif/handler.cc
index c040fe4ce..7c9bacb37 100644
--- a/parallel/dddif/handler.cc
+++ b/parallel/dddif/handler.cc
@@ -40,7 +40,7 @@
#include <dune/common/unused.hh>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include <dune/uggrid/domain/domain.h>
#include "parallel.h"
#include <dune/uggrid/gm/algebra.h>
diff --git a/parallel/dddif/identify.cc b/parallel/dddif/identify.cc
index e531c6e91..efb3b517a 100644
--- a/parallel/dddif/identify.cc
+++ b/parallel/dddif/identify.cc
@@ -34,7 +34,7 @@
#include <dune/common/unused.hh>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include <dune/uggrid/gm/gm.h>
#include <dune/uggrid/gm/refine.h>
diff --git a/parallel/dddif/initddd.cc b/parallel/dddif/initddd.cc
index d75bac1a0..ea90568d0 100644
--- a/parallel/dddif/initddd.cc
+++ b/parallel/dddif/initddd.cc
@@ -37,7 +37,7 @@
#include <dune/uggrid/low/namespace.h>
#include <dune/uggrid/gm/ugm.h> /* for GetFreeOBJT() */
#include "memmgr.h"
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
/* UG namespaces: */
USING_UG_NAMESPACES
diff --git a/parallel/dddif/lb.cc b/parallel/dddif/lb.cc
index 4f798dc00..65d3f6725 100644
--- a/parallel/dddif/lb.cc
+++ b/parallel/dddif/lb.cc
@@ -35,7 +35,7 @@
#include "parallel.h"
#include <dune/uggrid/gm/evm.h>
#include <dune/uggrid/gm/ugm.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/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 1973ab3fb..738dee18c 100644
--- a/parallel/dddif/lbrcb.cc
+++ b/parallel/dddif/lbrcb.cc
@@ -40,7 +40,7 @@
#include "parallel.h"
#include <dune/uggrid/low/general.h>
#include <dune/uggrid/low/namespace.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include <dune/uggrid/gm/evm.h>
#include <dune/uggrid/gm/ugm.h>
diff --git a/parallel/dddif/memmgr.cc b/parallel/dddif/memmgr.cc
index 9060a7184..848616f89 100644
--- a/parallel/dddif/memmgr.cc
+++ b/parallel/dddif/memmgr.cc
@@ -39,7 +39,7 @@
#include <dune/uggrid/low/misc.h>
#include <dune/uggrid/low/namespace.h>
#include <dune/uggrid/low/ugtypes.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include "parallel.h"
diff --git a/parallel/dddif/overlap.cc b/parallel/dddif/overlap.cc
index 045dd51d4..5867c4de6 100644
--- a/parallel/dddif/overlap.cc
+++ b/parallel/dddif/overlap.cc
@@ -43,7 +43,7 @@
#include <dune/uggrid/low/ugtypes.h>
/* dev module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
/* gm module */
#include <dune/uggrid/gm/algebra.h>
diff --git a/parallel/dddif/partition.cc b/parallel/dddif/partition.cc
index 93e116a59..7428df407 100644
--- a/parallel/dddif/partition.cc
+++ b/parallel/dddif/partition.cc
@@ -44,7 +44,7 @@
#include <dune/uggrid/low/ugtypes.h>
/* dev module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
/* gm module */
#include <dune/uggrid/gm/algebra.h>
diff --git a/parallel/dddif/pgmcheck.cc b/parallel/dddif/pgmcheck.cc
index d9eef2f78..578e9ef5a 100644
--- a/parallel/dddif/pgmcheck.cc
+++ b/parallel/dddif/pgmcheck.cc
@@ -35,7 +35,7 @@
#include <cstdlib>
#include "parallel.h"
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include <dune/uggrid/gm/evm.h>
#include <dune/uggrid/gm/gm.h>
#include <dune/uggrid/gm/refine.h>
diff --git a/parallel/dddif/priority.cc b/parallel/dddif/priority.cc
index 8afbc730f..fb535e277 100644
--- a/parallel/dddif/priority.cc
+++ b/parallel/dddif/priority.cc
@@ -33,7 +33,7 @@
#include <cstdlib>
#include "parallel.h"
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include <dune/uggrid/gm/evm.h>
#include <dune/uggrid/gm/gm.h>
#include <dune/uggrid/gm/refine.h>
diff --git a/parallel/dddif/trans.cc b/parallel/dddif/trans.cc
index d8632b0d2..b005432a6 100644
--- a/parallel/dddif/trans.cc
+++ b/parallel/dddif/trans.cc
@@ -37,7 +37,7 @@
#include <dune/uggrid/parallel/ppif/ppifcontext.hh>
#include "parallel.h"
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
#include <dune/uggrid/domain/domain.h>
#include <dune/uggrid/gm/algebra.h>
#include <dune/uggrid/gm/evm.h>
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
deleted file mode 100644
index 618f6539b..000000000
--- a/ui/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-install(FILES commands.h
- DESTINATION ${CMAKE_INSTALL_PKGINCLUDEDIR})
-ug_add_dim_libs(ugui OBJECT SOURCES commands.cc)
--
GitLab