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

update inclusion benchmark #788

Merged
merged 2 commits into from May 20, 2016
Merged

Conversation

bjs2
Copy link
Contributor

@bjs2 bjs2 commented Mar 9, 2016

  • change output directories for global and adaptive
  • include velocity and pressure dofs in error output line
  • include option to turn on averaging

- change output directories for global and adaptive
- include velocity and pressure dofs in error output line
- include option to turn on averaging
@jdannberg
Copy link
Contributor

@tjhei Is this work in progress, or is this open for review?

@tjhei
Copy link
Member

tjhei commented Mar 10, 2016

I thing this is good to go. /run-tests

@@ -513,13 +513,16 @@ namespace aspect
VectorTools::L2_norm,
&comp_p);

unsigned int n = this->get_solution().block(0).size() +
this->get_solution().block(1).size();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be good to use introspection.block_indices.pressure (and the same for the velocity) instead of just 0 and 1 here. Also, if the direct solver is used, pressure and velocity are in the same block, and then the numbers 0 and 1 are suddenly not correct any more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agreed

- Modify inclusion.cc to output correct number of DoF's if the direct solver is used
- Modify run.sh to loop through different averaging schemes (none, arithmetic, geometric)
@jdannberg
Copy link
Contributor

Thanks for updating the pull request!
Now you nicely loop over both the different refinement criteria and the global refinements, but it looks like you only run one model with adaptive refinement (with 4+13 refinements!). Is that what you want, or should we also do more adaptive runs?

@bjs2
Copy link
Contributor Author

bjs2 commented May 19, 2016

There should be an adaptive run for each type of averaging, and this was the case when I ran the shell script. I believe the run.sh has a nested for-loop. These are the results from when I ran it:

https://docs.google.com/spreadsheets/d/1GYPWl4UOe-Jc5AkVqDX6PDQmL73YU-0S9rwBi7S-Ce0/edit?usp=sharing

@jdannberg
Copy link
Contributor

Ah, I get it, because you use the option to run the postprocessors on the initial refinement you get the output for every refinement step.
Thanks a lot!

@jdannberg jdannberg merged commit 1f29810 into geodynamics:master May 20, 2016
@bjs2 bjs2 deleted the update_inclusion branch June 24, 2016 16:13
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

3 participants