Update and improve Riemann solver code #176
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| name: Test Riemann solvers with AMRClaw tests | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ "implicit_none" ] | ||
| pull_request: | ||
| branches: [ "implicit_none" ] | ||
|
|
||
| workflow_dispatch: | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| env: | ||
| CLAW: ${{ github.workspace }} | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Set up Python 3.10 | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: "3.10" | ||
|
|
||
| - name: Install dependencies | ||
| run: | | ||
| sudo apt-get update | ||
| sudo apt-get install gfortran | ||
|
|
||
| python -m pip install --upgrade pip | ||
| pip install 'numpy<2.0' | ||
| pip install matplotlib #Some imports require matplotlib | ||
| pip install scipy #To not skip tests | ||
| pip install nose | ||
| pip install flake8 meson-python ninja pytest | ||
|
|
||
| - name: Checkout Clawpack | ||
| uses: actions/checkout@v4.1.5 | ||
| with: | ||
| repository: clawpack/clawpack | ||
| submodules: true | ||
|
|
||
| - name: Checkout AMRClaw branch | ||
| uses: actions/checkout@v4.1.5 | ||
| with: | ||
| repository: clawpack/amrclaw # | ||
| path: amrclaw | ||
| ref: master | ||
|
|
||
| - name: Checkout implicit_none from this repo | ||
| uses: actions/checkout@v4.1.5 | ||
| with: | ||
| repository: ${{ github.repository }} | ||
| path: ${{ env.CLAW }}/riemann | ||
| ref: implicit_none | ||
|
|
||
| - name: Install Clawpack | ||
| run: | | ||
| cd ${CLAW} | ||
| pip install --no-build-isolation --editable . | ||
|
|
||
| - name: Test with pytest | ||
| run: | | ||
| cd ${CLAW}/riemann | ||
| bash collect_pytests_amrclaw.sh | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| name: Test Riemann solvers with Classic Clawpack tests | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ "implicit_none" ] | ||
| pull_request: | ||
| branches: [ "implicit_none" ] | ||
|
|
||
| workflow_dispatch: | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| env: | ||
| CLAW: ${{ github.workspace }} | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Set up Python 3.10 | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: "3.10" | ||
|
|
||
| - name: Install dependencies | ||
| run: | | ||
| sudo apt-get update | ||
| sudo apt-get install gfortran | ||
|
|
||
| python -m pip install --upgrade pip | ||
| pip install 'numpy<2.0' | ||
| pip install matplotlib #Some imports require matplotlib | ||
| pip install scipy #To not skip tests | ||
| pip install nose | ||
| pip install flake8 meson-python ninja pytest | ||
|
|
||
| - name: Checkout Clawpack | ||
| uses: actions/checkout@v4.1.5 | ||
| with: | ||
| repository: clawpack/clawpack | ||
| submodules: true | ||
|
|
||
| - name: Checkout Classic branch | ||
| uses: actions/checkout@v4.1.5 | ||
| with: | ||
| repository: clawpack/classic # | ||
| path: classic | ||
| ref: master | ||
|
|
||
| - name: Checkout implicit_none from this repo | ||
| uses: actions/checkout@v4.1.5 | ||
| with: | ||
| repository: ${{ github.repository }} | ||
| path: ${{ env.CLAW }}/riemann | ||
| ref: implicit_none | ||
|
|
||
| - name: Install Clawpack | ||
| run: | | ||
| cd ${CLAW} | ||
| pip install --no-build-isolation --editable . | ||
|
|
||
| - name: Test with pytest | ||
| run: | | ||
| cd ${CLAW}/classic | ||
| pytest tests |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| name: Test Riemann solvers with PyClaw tests | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ "implicit_none" ] | ||
| pull_request: | ||
| branches: [ "implicit_none" ] | ||
|
|
||
| workflow_dispatch: | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| env: | ||
| CLAW: ${{ github.workspace }} | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Set up Python 3.10 | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: "3.10" | ||
|
|
||
| - name: Install dependencies | ||
| run: | | ||
| sudo apt-get update | ||
| sudo apt-get install gfortran | ||
|
|
||
| python -m pip install --upgrade pip | ||
| pip install 'numpy<2.0' | ||
| pip install matplotlib #Some imports require matplotlib | ||
| pip install scipy #To not skip tests | ||
| pip install flake8 meson-python ninja pytest | ||
|
|
||
| - name: Checkout Clawpack | ||
| uses: actions/checkout@v4.1.5 | ||
| with: | ||
| repository: clawpack/clawpack | ||
| submodules: true | ||
|
|
||
| - name: Checkout PyClaw branch | ||
| uses: actions/checkout@v4.1.5 | ||
| with: | ||
| repository: clawpack/pyclaw # | ||
| path: pyclaw | ||
| ref: master | ||
|
|
||
| - name: Checkout implicit_none from this repo | ||
| uses: actions/checkout@v4.1.5 | ||
| with: | ||
| repository: ${{ github.repository }} | ||
| path: ${{ env.CLAW }}/riemann | ||
| ref: implicit_none | ||
|
|
||
| - name: Install Clawpack | ||
| run: | | ||
| cd ${CLAW} | ||
| pip install --no-build-isolation --editable . | ||
|
|
||
| - name: Test with pytest | ||
| run: | | ||
| cd ${CLAW}/pyclaw | ||
| pytest --ignore=development --ignore=examples/shallow_sphere |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| #Collect Pytest tests for AMRClaw | ||
|
There was a problem hiding this comment. I am confused by this script. Does the workflow above for AMRClaw not work? There was a problem hiding this comment. If I try There was a problem hiding this comment. Modifications were required to get the collection to work as you mentioned. This is hopefully going to fix that. Not sure what to do until then. |
||
| cd ${CLAW}/amrclaw/tests | ||
| pathlist=() | ||
| for dir in $(ls -d */); do | ||
| cd $dir | ||
| #Check if there are any test files | ||
| #Capture the error message and check if it is empty | ||
| if [ -z "$(ls *test*.py 2>/dev/null )" ]; then | ||
| cd .. | ||
| continue | ||
| fi | ||
| for file in $(ls *test*.py); do | ||
| pathlist+=($(pwd)/$file) | ||
| done | ||
| cd .. | ||
| done | ||
|
|
||
| #Run the tests | ||
| pytest ${pathlist[@]} | ||
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This won't work in general and is specific to only this branch/PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah yes, that was just a hack to get it to test this branch for the moment.