Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
giraffe
giraffe
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 3
    • Issues 3
    • List
    • Boards
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • nek5000
  • giraffegiraffe
  • Merge Requests
  • !9

Merged
Opened Apr 25, 2018 by Kevin Dugan@dugankj1 of 2 tasks completed1/2 tasks
  • Report abuse
Report abuse

Updated app

@rahaman

There are many changes in this branch, so I expect this merge to be a work in progress for now. Here is an overview of the changes I've made:

Major

  • I've removed the heat conduction source files from the examples; I was receiving errors about classes being declared multiple times. Plus, linking to the MOOSE modules through the module loader will be easier to maintain in my opinion.
  • I have generated a top-level Makefile which does not change based on the example problem being executed.
  • The giraffe.mk file is generated at the top level from the configure process. The default example compiled is giraffe/examples/integration_example but can be changed by pointing the GIRAFFE_EXAMPLE variable to the desired location.
  • The giraffe.mk file produced is independent of the METHOD variable. This allows a user to specify which version of Giraffe should be compiled at compile time.
  • I've modified the CI to configure and build from the Giraffe root.

Minor

  • I've generated more recent GiraffeApp, and GiraffeTestApp classes which use a more recent version of the testing harness and object registration, along with an updated main.C to account for passing through the GiraffeTestApp class.

I realize that configuring and building on the top-level might be moving in the opposite direction which you were planning (based on #3), but I think we may be able to make both behaviors work. For example, instead of having multiple executables is it possible to create a shared library in each example directory and link to that library at run-time? I think that keeping as close to the standard MOOSE-app build system as possible will help in maintaining Giraffe.

Remaining tasks:

  • Update README to reflect changes in configure/build process
  • Add Debug regression test to CI
Edited May 10, 2018 by Ron Rahaman

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b "updatedApp" "origin/updatedApp"

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/develop"
git merge --no-ff "updatedApp"

Step 4. Push the result of the merge to GitLab

git push origin "develop"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 16
  • Commits 19
  • Pipelines 7
  • Changes 145
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nek5000/giraffe!9

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.