Commit 781be410 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

Merge branch 'NIFTy_6' into timing_helpers

parents 9587d27e af021fd3
Pipeline #64514 passed with stages
in 9 minutes and 52 seconds
......@@ -595,10 +595,10 @@ class Field(object):
return sqrt(self.var(spaces))
def __repr__(self):
return "<nifty5.Field>"
return "<nifty6.Field>"
def __str__(self):
return "nifty5.Field instance\n- domain = " + \
return "nifty6.Field instance\n- domain = " + \
self._domain.__str__() + \
"\n- val = " + repr(self._val)
......
......@@ -19,7 +19,7 @@
def _logger_init():
import logging
from . import dobj
res = logging.getLogger('NIFTy5')
res = logging.getLogger('NIFTy6')
res.setLevel(logging.DEBUG)
res.propagate = False
if dobj.rank == 0:
......
......@@ -27,7 +27,7 @@ class ConjugateGradient(Minimizer):
Parameters
----------
controller : :py:class:`nifty5.IterationController`
controller : :py:class:`nifty6.IterationController`
Object that decides when to terminate the minimization.
nreset : int
every `nreset` CG steps the residual will be recomputed accurately
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment