aspect
aspect copied to clipboard
move composition velocity statistics from cookbook to main branch
Pull Request Checklist. Please read and check each box with an X. Delete any part not applicable. Ask on the forum if you need help with any step.
After a discussion with Anne, I moved the postprocessor "composition velocity statistics" from the cookbook "kinematically_driven_subduction_2d" to the main branch as it's a useful feature for myself and some others. This way the user does not have to keep compiling the .so file etc.
Before your first pull request:
- [ X] I have read the guidelines in our CONTRIBUTING.md document.
For all pull requests:
- [X ] I have followed the instructions for indenting my code.
For new features/models or changes of existing features:
- [X ] I have tested my new feature locally to ensure it is correct.
- [ ] I have created a testcase for the new feature/benchmark in the tests/ directory.
- [X ] I have added a changelog entry in the doc/modules/changes directory that will inform other users of my change.
/rebuild
I'm not sure why this is failing and the changes-test-results-master.diff is empty. Could someone advise me please? Thanks!
If you click on Details of the failing tester, and then on View raw log after clicking the gear symbol, you'll see that these tests are failing: 2022-08-02T18:25:34.5470643Z The following tests FAILED: 2022-08-02T18:25:34.5471206Z 210 - crameri_benchmark_1_gmg (Failed) 2022-08-02T18:25:34.5471605Z 290 - free_surface_VE_cylinder_2D_loading_fixed_elastic_dt_gmg (Failed) 2022-08-02T18:25:34.5471947Z 293 - free_surface_blob_gmg (Failed) 2022-08-02T18:25:34.5472287Z 298 - free_surface_iterated_stokes_gmg (Failed) 2022-08-02T18:25:34.5472592Z 316 - gmg_mesh_deform (Failed) 2022-08-02T18:25:34.5472883Z 317 - gmg_mesh_deform_adaptive (Failed) 2022-08-02T18:25:34.5473211Z 318 - gmg_mesh_deform_adaptive_bug (Failed) 2022-08-02T18:25:34.5473545Z 319 - gmg_mesh_deform_adaptive_bug2 (Failed) 2022-08-02T18:25:34.5474053Z 320 - gmg_mesh_deform_function (Failed) 2022-08-02T18:25:34.5474381Z 321 - gmg_mesh_deform_ghost_entries (Failed) 2022-08-02T18:25:34.5474705Z 322 - gmg_mesh_deform_prescribed (Failed) 2022-08-02T18:25:34.5475001Z 323 - gmg_mesh_deform_topo (Failed) This is not related to your PR, see #4922
Thanks, I've addressed your comments
Can someone else have a look at this as well?
Thanks for your last comments. I addressed them and added a test. I'll patch it after a final review.
Hi Elodie, can you please delete the lines I mention above and patch the test results? Then this is ready to go!
Thanks Anne, it is ready to merge now I think
I see the snapshot is still created, can you also delete the other lines in the prm about the checkpointing?
When I try to patch the test I get the error "Reversed (or previously applied) patch detected! Assume -R? [n] n " and if I press enter it says "Hunk #1 FAILED at 1. Hunk #2 FAILED at 62. 2 out of 2 hunks FAILED"
Hi! Not sure why the astyle diff is empty, but the this diff:
https://jenkins.tjhei.info/job/aspect/job/PR-4932/14/artifact/changes-test-results.diff
gives the changes that should be made. So the lines that were introduced last commit, should be removed. And the lines I indicated in the prm file. The snapshot not being produced, will probably only mean that the line
*** Snapshot created!
is omitted from the screen-output, so you can manually delete that line as well.
Hi @elodie-kendall I'm sorry but this PR now includes changes to rheology and material model files. Can you remove those?
Great, thanks for removing those files! There's one more empty line to remove with the diff: https://jenkins.tjhei.info/job/aspect/job/PR-4932/16/artifact/changes-test-results.diff
@tjhei the now failing test is unrelated (FPE), can this be ignored?
Thanks @gassmoeller and @anne-glerum