Changeset ee8cedc for src/solvers/pcg.F90

Timestamp:

03/08/07 14:19:59 (6 years ago)

Author:

chris <chris@…>

Branches:

master, external, fix-prolong, refactor, refactor-ext, refactor-subsolvers

Children:

7efae20

Parents:

8866c2a

git-author:

chris <chris@…> (03/08/07 14:19:59)

git-committer:

chris <chris@…> (03/08/07 14:19:59)

Message:

• added doxygen comments

git-svn-id:  svn://dougdevel.org/doug/trunk@211 146eac83-2b0f-0410-9363-9ebcc3d868b9

File:

• src/solvers/pcg.F90 (modified) (3 diffs)

src/solvers/pcg.F90

@@ -641 +641 @@
   end subroutine msolve
 
+  !--------------------------
+  !> Preconditioned conjugent gradient method with eigenvalues
+  !--------------------------
   subroutine pcg_weigs (A,b,x,Msh,it,cond_num,A_interf_,tol_,maxit_, &
        x0_,solinf,resvects_,CoarseMtx_,Restrict,refactor_)
@@ -647 +650 @@
     implicit none
     
-    type(SpMtx),intent(in out) :: A ! System matrix (sparse)
-    float(kind=rk),dimension(:),pointer :: b ! RHS
-    float(kind=rk),dimension(:),pointer :: x ! Solution
-    ! Mesh - aux data for Ax operation
-    type(Mesh),intent(in) :: Msh
+    type(SpMtx),intent(in out)          :: A !< System matrix (sparse)
+    float(kind=rk),dimension(:),pointer :: b !< RHS
+    float(kind=rk),dimension(:),pointer :: x !< Solution
+    type(Mesh),intent(in)               :: Msh !< Mesh - aux data for Ax operation
 
     integer,intent(out) :: it
     real(kind=rk),intent(out) :: cond_num
+    
     ! Optional arguments
-    type(SpMtx),intent(in out),optional :: A_interf_ !matr@interf. 
-    ! Tolerance of the method
-    real(kind=rk),          intent(in), optional :: tol_
-    ! Max number of iterations
-    integer,                intent(in), optional :: maxit_
-    ! Initial guess
-    float(kind=rk), dimension(:), intent(in), optional :: x0_
-    ! Solution statistics
-    type(ConvInf),            intent(in out), optional :: solinf
-    ! Fill in the 'resvect' or not
-    logical,                      intent(in), optional :: resvects_
-    type(SpMtx),optional :: CoarseMtx_ ! Coarse matrix
-    type(SpMtx),optional :: Restrict ! Restriction mtx
-
-    logical,intent(in),optional :: refactor_
+    type(SpMtx),intent(in out),optional                :: A_interf_ !< matr@interf. 
+    real(kind=rk), intent(in), optional                :: tol_ !< Tolerance of the method
+    integer,       intent(in), optional                :: maxit_ !< Max number of iterations
+    float(kind=rk), dimension(:), intent(in), optional :: x0_ !< Initial guess
+    type(ConvInf),            intent(in out), optional :: solinf !< Solution statistics
+    logical,                      intent(in), optional :: resvects_ !< Fill in the 'resvect' or not
+    type(SpMtx),optional                               :: CoarseMtx_ !< Coarse matrix
+    type(SpMtx),optional                               :: Restrict !< Restriction mtx
+    logical,intent(in),optional                        :: refactor_
+    
+    ! Local variables
     logical :: refactor
 
@@ -760 +759 @@
  
 if (bugtrack)call Print_Glob_Vect(r,Msh,'global r===',chk_endind=Msh%ninner)
+   write(6,*) '############# CALLING PRECOND #############' !XXX
       call preconditioner(sol=z,          &
                             A=A,          &