Skip to content
Snippets Groups Projects

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

Merged Christoph Grüninger requested to merge feaure/dont-use-ug-symlinks into master

Use proper include paths instead

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

Requires staging/dune-uggrid!143 (merged)

Edited by Christoph Grüninger

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
12 12 therein.
13 13 */
14 14
15 #include <ug/gm.h>
16 #include <ug/std_domain.h>
17 #include <ug/initug.h>
18 #include <ug/commands.h>
19 #include <ug/formats.h>
20 #include <ug/elements.h>
21 #include <ug/shapes.h>
22 #include <ug/algebra.h>
23 #include <ug/refine.h>
24 #include <ug/ugm.h>
25 #include <ug/rm.h>
15 #include <initug.h>
  • added 1 commit

    • 6a52ec4d - [ug] Don't use dune-uggrid's symlinks

    Compare with previous version

  • If you force me to move the stuff below dune/uggrid, I will do so. See dune-uggrid#13 for my proposal. Improvements welcome!

  • added 5 commits

    Compare with previous version

  • Does this look better to you?

  • Can you please rename the branch of staging/dune-uggrid!137 (closed) to match the name of the branch used here? That way, the CI system will test the two branches together.

  • added 18 commits

    Compare with previous version

  • Christoph Grüninger changed the description

    changed the description

  • @oliver.sander Can you have a look why the UG tests are crashing? On my computer I cannot reproduce the crashes. I also checked with AddressSanitizer and Valgrind, but I could not get any clue.

  • From looking at the CI logs: no idea :-(

  • I installed Debian 10.2, in sequential mode it works, in parallel mode Valgrind and GDB tell me, that in ugm.cc, line 421, the MYMG(theGrid) is an invalid read. Not sure how this could happen regarding my changes.

  • I tried this locally, and I do get a crash and the error message

    ERROR in NewCommand: Unknown option 'h 500M'

    That's because this merge request does not contain !345 (merged) yet. Can you please rebase?

  • added 6 commits

    Compare with previous version

  • Thanks for having a look. I want to bisect my commits this evening, I am running out of other ideas.

    Are you really using feaure/dont-use-ug-symlinks? I rebased it a couple of days ago. Just to be sure, I just rebased it.

  • Thanks for rebasing. Now I get a real crash, and it's right at ugm.cc:421. So we are looking at the same thing. Let me have a look.

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading