Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added nonuniform examples and fixed aux array bug in classic and shar… #633

Merged
merged 7 commits into from
Oct 24, 2019

Conversation

cr2940
Copy link
Contributor

@cr2940 cr2940 commented Oct 22, 2019

This is a new PR with a new example in advection_1d and modifications to solver file in classic and sharpclaw to make the example work. To plot the results, please refer to Fix 1D plotting mapc2p #250
PR in Visclaw (only the frametools.py, not all the pyc files).

@coveralls
Copy link

coveralls commented Oct 22, 2019

Coverage Status

Coverage remained the same at ?% when pulling 343bc60 on cr2940:nonuniform into b375bcf on clawpack:master.

@cr2940
Copy link
Contributor Author

cr2940 commented Oct 23, 2019

I think Ranocha is also seeing similar problem in his PR with error in psystem_2d.psystem_2d verification step. But it occurs here only for Python 2

@ketch
Copy link
Member

ketch commented Oct 23, 2019

I think it's just a hiccup that happens sometimes on Travis. Usually, restarting the build fixes it.

@ketch
Copy link
Member

ketch commented Oct 23, 2019

Very nice; this looks good!

The WENO reconstruction in SharpClaw actually isn't written in a way that works correctly on nonuniform grids. So it's probably best to remove the option to use SharpClaw. After that, I think this can be merged.

@mandli
Copy link
Member

mandli commented Oct 23, 2019

If you go to your branch with these changes and merge in (or rebase) on the difference between this branch and the master branch here you will see if there are conflicts. You can then push up the new changes here if they pass on your machine.

@cr2940
Copy link
Contributor Author

cr2940 commented Oct 23, 2019

Got the merge of latest pyclaw into my branch to work. Now I will run some tests locally and push it, but I am afraid things like pyc or output files will also get pushed

@mandli
Copy link
Member

mandli commented Oct 23, 2019

Just make sure that you do not add files that do not need to be added, always do it purposefully with git add my_file rather than adding everything that is available. If you get those files you can always remove them by removing them from the staging area.

@ketch
Copy link
Member

ketch commented Oct 23, 2019

Even better: learn to use git add -p my_file

@cr2940
Copy link
Contributor Author

cr2940 commented Oct 23, 2019

Thank you both, I definitely made a quantum jump in understanding both pylaw and git through this

@ketch ketch merged commit 82c8863 into clawpack:master Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants