Pull requests

#110 Open


Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

git checkout master
git merge --no-ff -m 'Merged in madams/sr-driver4 (pull request #110)' remotes/origin/madams/sr-driver4
  1. Mark Adams avatarMark Adams

Added a simplified version of ts/ex11, for a 5-point Laplacian with convergence test with a synthetic problem. Serial. Uses differencing to produce matrix without a solve, fixed a false positive error in SNES to support this.

Comments (4)

    1. Mark Adams author

      I would like to work on ex33 but this pull request is polluted with garbage. Non of these conflicts are real. THis is in 'next' so I don't know to touch it really. I think you can take 'their conflicts' for all of these.

      1. Jed Brown

        The bitbucket merge dialog is bogus: there are no conflicts in merging to 'master'. Is the branch "done" in the sense that it should be in 'master', or is it a work in progress (in which case it should not merge yet)?

        1. Mark Adams author

          It will probably get completly superseded when Matt and I get a chance to DMDAPlexify it. It doesn't sound like Matt is going to get to it until next month. But don't I want it in master so that I can branch from master to work on it?

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.