Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
PyFVCOM
PyFVCOM
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 4
    • Issues 4
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 2
    • Merge Requests 2
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • FVCOM
  • PyFVCOMPyFVCOM
  • Merge Requests
  • !3

Open
Opened Apr 06, 2020 by Ben Barton@benbar
  • Report abuse
Report abuse

Fix nest

  • Overview 0
  • Commits 0
  • Changes 0

I've re-structured grid.OpenBoundary and preproc.Nest so that Nest is a subclass of grid.OpenBoundary. This was a TODO comment in both OpenBoundary and Nest. The associated functions have been updated and tested. The new strucure is more intuitive, removes duplicate functions and should make it easier to debug in the future.

Check out, review, and merge locally

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

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

Step 2. Review the changes locally

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

git fetch origin
git checkout "origin/dev"
git merge --no-ff "fix_nest"

Step 4. Push the result of the merge to GitLab

git push origin "dev"

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

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

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: fvcom/pyfvcom!3