← Back to branch summary

~corrado-maurini/dolfin/tao

« back to all changes in this revision

Viewing changes to dolfin/nls/NewtonSolver.h

  • Committer: corrado maurini
  • Date: 2012-12-18 12:16:08 UTC
  • mfrom: (6685.78.207 trunk)
  • Revision ID: corrado.maurini@upmc.fr-20121218121608-nk82ly9jgsld9u84
updating with trunk, fix uint in TAO solver and hacking the check for tao FindTAO.cmake

Show diffs side-by-side

added added

removed removed

Lines of Context:
dolfin/nls/NewtonSolver.h
74
74
    ///         The vector.
75
75
    ///
76
76
    /// *Returns*
77
 
    ///     std::pair<uint, bool>
 
77
    ///     std::pair<std::size_t, bool>
78
78
    ///         Pair of number of Newton iterations, and whether
79
79
    ///         iteration converged)
80
 
    std::pair<uint, bool> solve(NonlinearProblem& nonlinear_function,
 
80
    std::pair<std::size_t, bool> solve(NonlinearProblem& nonlinear_function,
81
81
                                GenericVector& x);
82
82
 
83
83
    /// Return Newton iteration number
84
84
    ///
85
85
    /// *Returns*
86
 
    ///     uint
 
86
    ///     std::size_t
87
87
    ///         The iteration number.
88
 
    uint iteration() const;
 
88
    std::size_t iteration() const;
89
89
 
90
90
    /// Return current residual
91
91
    ///
122
122
                           const NonlinearProblem& nonlinear_problem);
123
123
 
124
124
    /// Current number of Newton iterations
125
 
    uint newton_iteration;
 
125
    std::size_t newton_iteration;
126
126
 
127
127
    /// Most recent residual and intitial residual
128
128
    double _residual, residual0;