Plot red blue stripes #74
Merged
Conversation
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
…tripes. Illustrated in Euler_equations.ipynb where density is colored red to left and blue to right of contact discontinuity.
Also add snapshot_widget option to Traffic_flow.ipynb
…amples. Added new function to utils/riemann_tools.py to make simple demo plots and improved setting of x_traj points so stripes are equal width near origin
* master: (23 commits) Updated nbstripout to remove metadata Merged pull request Editorial changes to Tammann notebook. Added characterisitics Added section in negative pressure Minor changes to examples Put repeated code into a function. Update Docker.md Update Docker.md Minor update to TammannNB Fix a couple more typos. Fix a typo. Don't show delta shocks when t=0. Add exercise regarding low Froude number limit. Add references and notes on large Froude number limit in pressureless flow chapter. Forgot to nbstrip on previous commit Added examples to Euler Tammann NB Updated Tammann book revert dirty notebooks commited by accident Add clawpack to Dockerfile and instructions for pulling from riemann@master ...
* master: Add SIAM Book latex class file. Apply SIAM book formatting to pdf. Include preface in pdf. Use \small for code in pdf. Use SVG backend so that graphics are in vector format. Adjust figure and font sizes to work with SVG backend. Plot Riemann solution and phase plane together for nonlinear elasticity. Fix numerous minor issues in notebooks. Add Preface and fix some issues with bookbook. Improved presentation in Shallow_water.ipynb. Use t=0.2 instead of t=0 for static widget output. Run pdflatex one more time for citations. Remove stray comma from merge. Add 5 more chapters to book. Use report template and update script name. Initial effort at compiling book.
|
Okay, I believe that this PR incorporates everything from #71 while avoiding the merge issues that appeared there. @rjleveque please take a look and feel free to merge this if it looks right to you. |
|
This looks right - I'm going to merge it so we can move forward and build on it. Note that it does not include the There are a few things I noticed going through the notebooks to deal with later, I made a new issue #75. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've redone the merge of master into this branch; there were conflicts in Traffic_flow.ipynb (including duplication of a figure) that I resolved manually.