Skip to content

Commit

Permalink
PrintNumNonlinearIters -> NumNonlinearIterations (refs-#2094)
Browse files Browse the repository at this point in the history
r20513
  • Loading branch information
aeslaughter authored and permcody committed Feb 14, 2014
1 parent 8d4c3b9 commit 8a2bfb7
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
Expand Up @@ -12,21 +12,21 @@
/* See COPYRIGHT for full restrictions */
/****************************************************************/

#ifndef PRINTNUMNONLINEARITERS_H
#define PRINTNUMNONLINEARITERS_H
#ifndef NUMNONLINEARITERATIONS_H
#define NUMNONLINEARITERATIONS_H

#include "GeneralPostprocessor.h"

//Forward Declarations
class PrintNumNonlinearIters;
class NumNonlinearIterations;

template<>
InputParameters validParams<PrintNumNonlinearIters>();
InputParameters validParams<NumNonlinearIterations>();

class PrintNumNonlinearIters : public GeneralPostprocessor
class NumNonlinearIterations : public GeneralPostprocessor
{
public:
PrintNumNonlinearIters(const std::string & name, InputParameters parameters);
NumNonlinearIterations(const std::string & name, InputParameters parameters);

virtual void initialize() {}
virtual void execute() {}
Expand All @@ -37,4 +37,4 @@ class PrintNumNonlinearIters : public GeneralPostprocessor
virtual Real getValue();
};

#endif //PRINTNUMNONLINEARITERS_H
#endif // NUMNONLINEARITERATIONS_H
4 changes: 2 additions & 2 deletions framework/src/base/Moose.C
Expand Up @@ -137,7 +137,7 @@
#include "PerformanceData.h"
#include "NumElems.h"
#include "NumNodes.h"
#include "PrintNumNonlinearIters.h"
#include "NumNonlinearIterations.h"
#include "NumLinearIterations.h"
#include "PrintResidual.h"
#include "PrintScalarVariable.h"
Expand Down Expand Up @@ -427,7 +427,7 @@ registerObjects(Factory & factory)
registerPostprocessor(PerformanceData);
registerPostprocessor(NumElems);
registerPostprocessor(NumNodes);
registerPostprocessor(PrintNumNonlinearIters);
registerPostprocessor(NumNonlinearIterations);
registerPostprocessor(NumLinearIterations);
registerPostprocessor(PrintResidual);
registerPostprocessor(PrintScalarVariable);
Expand Down
Expand Up @@ -12,24 +12,24 @@
/* See COPYRIGHT for full restrictions */
/****************************************************************/

#include "PrintNumNonlinearIters.h"
#include "NumNonlinearIterations.h"

#include "FEProblem.h"
#include "SubProblem.h"

template<>
InputParameters validParams<PrintNumNonlinearIters>()
InputParameters validParams<NumNonlinearIterations>()
{
InputParameters params = validParams<GeneralPostprocessor>();
return params;
}

PrintNumNonlinearIters::PrintNumNonlinearIters(const std::string & name, InputParameters parameters) :
NumNonlinearIterations::NumNonlinearIterations(const std::string & name, InputParameters parameters) :
GeneralPostprocessor(name, parameters)
{}

Real
PrintNumNonlinearIters::getValue()
NumNonlinearIterations::getValue()
{
return _subproblem.nNonlinearIterations();
}
2 changes: 1 addition & 1 deletion test/tests/postprocessors/misc_pps/misc_pps_test.i
Expand Up @@ -78,7 +78,7 @@
time_type = active
[../]
[./num_nonlinear_its]
type = PrintNumNonlinearIters
type = NumNonlinearIterations
[../]
[./num_linear_its]
type = NumLinearIterations
Expand Down

0 comments on commit 8a2bfb7

Please sign in to comment.