Skip to content
Snippets Groups Projects

Feature/remove vertex normals

Merged Nebel, Lisa Julia requested to merge lnebel/dune-gfe:feature/remove-vertex-normals into master

@osander or @ansgar: Currently the pipelines are all failing here because the ci system cannot find 'dune-curvedgeometry', it suggests: Maybe you need to adjust PKG_CONFIG_PATH. Can you tell me how I can do that? I have access to the ci system, but I don't know how to properly change settings for the gitlab-runners... Thanks!

Edited by Nebel, Lisa Julia

Merge request reports

Pipeline #5294 passed

Pipeline passed for c384e2fc on lnebel:feature/remove-vertex-normals

Approval is optional

Set by to be merged automatically when the pipeline succeeds

Ready to merge by members who can write to the target branch.

Merge details

  • 1 commit and 1 merge commit will be added to master.
  • Source branch will be deleted.
  • Auto-merge enabled

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Nebel, Lisa Julia resolved all threads

    resolved all threads

  • added 6 commits

    • 60d66a02...efec17f3 - 2 commits from branch osander:master
    • 983a196e - Add dune-curvedgeometry as optional dependency in dune.module
    • 8933c007 - Use the calculation of the vertexnomals from dune-curvedgeometry in cosserat-continuum
    • fe92ad21 - Only compile film-on-substrate when dune-curvedgeometry is found
    • 710afe61 - Use the calculation of the vertexnomals from dune-curvedgeometry in film-on-substrate

    Compare with previous version

  • added 3 commits

    • 3a3980eb - Use the calculation of the vertexnomals from dune-curvedgeometry in cosserat-continuum
    • a55c1c29 - Only compile film-on-substrate when dune-curvedgeometry is found
    • caafbd86 - Use the calculation of the vertexnomals from dune-curvedgeometry in film-on-substrate

    Compare with previous version

  • Nebel, Lisa Julia added 10 commits

    added 10 commits

    • caafbd86...afd864b0 - 6 commits from branch osander:master
    • 9c306076 - Add dune-curvedgeometry as optional dependency in dune.module
    • d4250984 - Use the calculation of the vertexnomals from dune-curvedgeometry in cosserat-continuum
    • 84e69768 - Only compile film-on-substrate when dune-curvedgeometry is found
    • 20217e78 - Use the calculation of the vertexnomals from dune-curvedgeometry in film-on-substrate

    Compare with previous version

  • added 3 commits

    • b53d55f4 - Use the calculation of the normal Derivative from dune-curvedgeometry in cosserat-continuum
    • 08f8f940 - Only compile film-on-substrate when dune-curvedgeometry is found
    • 68f8cf14 - Use the calculation of the vertexnomals from dune-curvedgeometry in film-on-substrate

    Compare with previous version

  • added 1 commit

    • c384e2fc - Remove vertexnormals.hh file - it is not needed anymore

    Compare with previous version

  • @osander: can you have a look again? I asked Simon to include the normalGradient function into the master branch and he did that :)

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