/[escript]/trunk/escript/py_src/flows.py
ViewVC logotype

Diff of /trunk/escript/py_src/flows.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2351 by gross, Tue Mar 31 08:26:41 2009 UTC revision 2354 by gross, Wed Apr 1 04:01:58 2009 UTC
# Line 56  class DarcyFlow(object): Line 56  class DarcyFlow(object):
56          """          """
57          self.domain=domain          self.domain=domain
58          if weight == None:          if weight == None:
59             self.__l=10.*util.longestEdge(self.domain)**2             s=self.domain.getSize()
60               self.__l=(3.*util.longestEdge(self.domain)*s/util.sup(s))**2
61          else:          else:
62             self.__l=weight             self.__l=weight
63          self.__pde_v=LinearPDESystem(domain)          self.__pde_v=LinearPDESystem(domain)
# Line 267  class DarcyFlow(object): Line 268  class DarcyFlow(object):
268                 if norm_r == None or norm_r>ATOL:                 if norm_r == None or norm_r>ATOL:
269                     if num_corrections>max_num_corrections:                     if num_corrections>max_num_corrections:
270                           raise ValueError,"maximum number of correction steps reached."                           raise ValueError,"maximum number of correction steps reached."
271                     p,r, norm_r=PCG(self.__g-util.interpolate(v,Function(self.domain))-Qp,self.__Aprod,p,self.__Msolve_PCG,self.__inner_PCG,atol=0.1*ATOL, rtol=0.,iter_max=max_iter, verbose=self.verbose)                     p,r, norm_r=PCG(self.__g-util.interpolate(v,Function(self.domain))-Qp,self.__Aprod,p,self.__Msolve_PCG,self.__inner_PCG,atol=0.5*ATOL, rtol=0.,iter_max=max_iter, verbose=self.verbose)
272                     num_corrections+=1                     num_corrections+=1
273                 else:                 else:
274                     converged=True                     converged=True

Legend:
Removed from v.2351  
changed lines
  Added in v.2354

  ViewVC Help
Powered by ViewVC 1.1.26