Created
April 15, 2016 15:52
-
-
Save bishtgautam/87267ccf01e860e7efbd215c5e713c0a to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # Switch to my branch | |
| >git checkout bishtgautam/lnd/lateral-vsfm-infrastructure | |
| # Get recent changes for this branch | |
| >git pull --ff-only | |
| # Switch to your branch and rebase | |
| >git checkout thorntonpe/lnd/implement-architecture-v2 | |
| # Rebase branch | |
| >git rebase bishtgautam/lnd/lateral-vsfm-infrastructure | |
| # Check the graph | |
| >git log --oneline --decorate --graph -n 10 | |
| * 8ce400f (HEAD -> thorntonpe/lnd/implement-architecture-v2, origin/bishtgautam/lnd/lateral-vsfm-infrastructure, bishtgautam/lnd/lateral-vsfm-infrastructure) Fixes the initialization of lateral flux in ALM. | |
| * c1c3641 Restructures VSFM subdirectory in ALM | |
| * c425c1a (origin/thorntonpe/lnd/implement-architecture-v2) Updates VSFM solver tolerance after an unacceptable solution | |
| * ff07479 Adds options to include lateral flows in VSFM | |
| * 46115a8 Updates VSFM solver in ALM to saves internal/boundary mass flux | |
| * da638f5 Turns on lateral subsurface flow in ALM | |
| * 99c6fe6 Adds seepage face BC in ALM VSFM solver | |
| * e991824 Minor ALM modifications to avoid compiler failures | |
| * d2ccd94 Updates to ALM suburface mesh for VSFM | |
| * 973d89e ALM reads additional data specified in MPAS format | |
| # Push the changes back up (Note the '+' is a "forced push") | |
| >git push origin +thorntonpe/lnd/implement-architecture-v2 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment