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

Add global statistics postprocessor #1463

Merged
merged 4 commits into from Apr 28, 2017

Conversation

gassmoeller
Copy link
Member

This is a rebase from #1429. I will need to adjust the test outputs because of our switch to the 8.5 tester.

@gassmoeller
Copy link
Member Author

This should be ready for review/merge. For earlier comments that are addressed see #1429.

#if DEAL_II_VERSION_GTE(9,0,0)
SolverControl solver_control (1000, tolerance);
#else
ExtendedSolverControl solver_control (1000, tolerance);
Copy link
Contributor

Choose a reason for hiding this comment

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

You no longer need the distinction here (i.e., just use SolverControl unconditionally) because for old versions of deal.II, writing SolverControl finds the declaration in namespace aspect, whereas for new versions of deal.II, it just takes the one in namespace dealii because there is none in the "closer namespace" aspect.


namespace dealii
{
class ExtendedSolverControl : public SolverControl
Copy link
Contributor

Choose a reason for hiding this comment

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

just say

  namespace aspect {
    class SolverControl : public dealii::SolverControl

and you won't need the typedef below any more :-)

@gassmoeller
Copy link
Member Author

I addressed the comments, and it seems to work. Dont know why it did not work the first time I tried it that way. Anyway, should be ready to merge now.

@bangerth bangerth merged commit 509a539 into geodynamics:master Apr 28, 2017
@gassmoeller gassmoeller deleted the statistics_fix branch April 28, 2017 23:56
@tjhei
Copy link
Member

tjhei commented Apr 29, 2017

This PR broke mainline:

In file included from /home/dealii/source/include/aspect/global.h:48:0,
                 from /home/dealii/source/source/boundary_composition/interface.cc:22:
/home/dealii/source/include/aspect/compat.h: In constructor ‘aspect::SolverControl::SolverControl(unsigned int, double, bool, bool)’:
/home/dealii/source/include/aspect/compat.h:53:55: error: constructor delegates to itself
         SolverControl (n, tol, log_history, log_result)

@tjhei tjhei mentioned this pull request Apr 29, 2017
@bangerth
Copy link
Contributor

On it.

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