Skip to content
Snippets Groups Projects
Commit f0295d48 authored by Oliver Sander's avatar Oliver Sander
Browse files

[!358] [ug] Don't use dune-uggrid's symlinks

Merge branch 'feaure/dont-use-ug-symlinks' into 'master'

ref:core/dune-grid Use proper include paths instead

This breaks compatibility with UG 3.13, not dune-uggrid.

Requires [staging/dune-uggrid!143]

See merge request [!358]

  [staging/dune-uggrid!143]: gitlab.dune-project.org/staging/dune-uggrid/merge_requests/143
  [!358]: gitlab.dune-project.org/core/dune-grid/merge_requests/358
parents f1fe83ed cbfe7826
No related branches found
No related tags found
1 merge request!358[ug] Don't use dune-uggrid's symlinks
Pipeline #22906 passed
......@@ -74,6 +74,8 @@
by DUNE 2.7 will differ from the same file written in DUNE 2.6. If you are using VTK files for testing
results, make sure to use fuzzy float comparisons!
- UG 3.x is no longer supported. Use dune-uggrid instead.
# Release 2.6
......
......@@ -66,7 +66,7 @@ function(add_dune_ug_flags)
set_property(${_prefix} ${ADD_UG_UNPARSED_ARGUMENTS}
APPEND PROPERTY
COMPILE_DEFINITIONS ${UG_DEFINITIONS})
if(UG_PARALLEL STREQUAL "yes")
if(UG_PARALLEL)
# Add mpi flags.
add_dune_mpi_flags(${ADD_UG_UNPARSED_ARGUMENTS} ${_source_only} ${_object})
endif()
......
......@@ -12,19 +12,20 @@
therein.
*/
#include <ug/gm.h>
#include <ug/std_domain.h>
#include <ug/initug.h>
#include <ug/commands.h>
#include <ug/formats.h>
#include <ug/elements.h>
#include <ug/shapes.h>
#include <ug/algebra.h>
#include <ug/refine.h>
#include <ug/ugm.h>
#include <ug/rm.h>
#include <dune/uggrid/gm/gm.h>
#include <dune/uggrid/domain/std_domain.h>
#include <dune/uggrid/initug.h>
#include <dune/uggrid/commands.h>
#include <dune/uggrid/numerics/formats.h>
#include <dune/uggrid/gm/elements.h>
#include <dune/uggrid/gm/algebra.h>
#include <dune/uggrid/gm/shapes.h>
#include <dune/uggrid/gm/refine.h>
#include <dune/uggrid/gm/ugm.h>
#include <dune/uggrid/gm/rm.h>
#if defined ModelP
#include <ug/parallel.h>
#include <dune/uggrid/parallel/dddif/parallel.h>
#endif
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment