Skip to content
Snippets Groups Projects

Merge foundation

Merged Admin requested to merge merge-foundation into develop

Foundation code merged

  • all compiles - was not all clean and needed to resolve many conflicts
  • updated InfoIn, WarningIn, ErrorIn messaging
  • removed fluxRequired from tutorials
  • currently testing tutorials

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
  • Mattijs Janssens Added 1 commit:

    Added 1 commit:

    • b82451af - COMP: subsetMesh: Make/options adapted for new location of fvMeshSubset
  • Mattijs Janssens Added 1 commit:

    Added 1 commit:

    • 9c67fe6f - BUG: RunFunctions: missing fi. Renamed variable. Updated Allrun scripts
  • Admin Added 2 commits:

    Added 2 commits:

    • 1e993c23 - BUG: Correcetd merge error in RunFunctions
    • 70bfff04 - Merge branch 'merge-foundation' of develop.openfoam.com:Development/OpenFOAM-dev…

    By Andrew Heather on 2015-12-08T15:04:50 (imported from GitLab project)

  • Admin Added 1 commit:

    Added 1 commit:

    • 52de4243 - ENH: Tutorials - removed boundary files from repository

    By Andrew Heather on 2015-12-08T15:06:21 (imported from GitLab project)

  • Admin Added 1 commit:

    Added 1 commit:

    • e5e5a78f - STYLE: Consistency update in OpenCFD copyright text

    By Andrew Heather on 2015-12-08T22:30:04 (imported from GitLab project)

  • Admin Added 1 commit:

    Added 1 commit:

    • 588802b7 - ENH: Updated notImplemented(...)->NotImplemented messages

    By Andrew Heather on 2015-12-08T22:56:25 (imported from GitLab project)

  • Admin Added 24 commits:

    Added 24 commits:

    • 588802b7...e3b8e9f4 - 23 commits from branch develop
    • 6b95ffc2 - GIT: Resolved conflict

    By Andrew Heather on 2015-12-09T09:32:52 (imported from GitLab project)

  • Admin Added 1 commit:

    Added 1 commit:

    • 4a12679a - ENH: Updated output messages

    By Andrew Heather on 2015-12-09T09:40:30 (imported from GitLab project)

  • Admin Added 1 commit:

    Added 1 commit:

    • 38d39839 - GIT: remove remnants of conflict

    By Andrew Heather on 2015-12-09T10:20:20 (imported from GitLab project)

  • Admin Added 1 commit:

    Added 1 commit:

    • d29c15b4 - STYLE: Minor code tweaks

    By Andrew Heather on 2015-12-09T10:29:19 (imported from GitLab project)

  • Mattijs Janssens Status changed to merged

    Status changed to merged

  • Mattijs Janssens mentioned in commit 74500122151ed3b474355e0a131c500f3b221485

    mentioned in commit 74500122151ed3b474355e0a131c500f3b221485

Please register or sign in to reply