aspect icon indicating copy to clipboard operation
aspect copied to clipboard

move composition velocity statistics from cookbook to main branch

Open elodie-kendall opened this issue 2 years ago • 5 comments

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.

elodie-kendall avatar Aug 02 '22 15:08 elodie-kendall

/rebuild

anne-glerum avatar Aug 03 '22 11:08 anne-glerum

I'm not sure why this is failing and the changes-test-results-master.diff is empty. Could someone advise me please? Thanks!

elodie-kendall avatar Aug 09 '22 10:08 elodie-kendall

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

anne-glerum avatar Aug 09 '22 14:08 anne-glerum

Thanks, I've addressed your comments

elodie-kendall avatar Aug 12 '22 08:08 elodie-kendall

Can someone else have a look at this as well?

anne-glerum avatar Aug 16 '22 15:08 anne-glerum

Thanks for your last comments. I addressed them and added a test. I'll patch it after a final review.

elodie-kendall avatar Aug 18 '22 16:08 elodie-kendall

Hi Elodie, can you please delete the lines I mention above and patch the test results? Then this is ready to go!

anne-glerum avatar Sep 07 '22 13:09 anne-glerum

Thanks Anne, it is ready to merge now I think

elodie-kendall avatar Sep 09 '22 13:09 elodie-kendall

I see the snapshot is still created, can you also delete the other lines in the prm about the checkpointing?

anne-glerum avatar Sep 09 '22 15:09 anne-glerum

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"

elodie-kendall avatar Sep 10 '22 15:09 elodie-kendall

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.

anne-glerum avatar Sep 20 '22 07:09 anne-glerum

Hi @elodie-kendall I'm sorry but this PR now includes changes to rheology and material model files. Can you remove those?

anne-glerum avatar Sep 20 '22 10:09 anne-glerum

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

anne-glerum avatar Sep 20 '22 13:09 anne-glerum

@tjhei the now failing test is unrelated (FPE), can this be ignored?

anne-glerum avatar Sep 20 '22 18:09 anne-glerum

Thanks @gassmoeller and @anne-glerum

elodie-kendall avatar Sep 28 '22 12:09 elodie-kendall