took out debug statements

git-svn-id: http://svn.cactuscode.org/arrangements/CactusElliptic/EllSOR/trunk@17 fa3da13c-9f13-4301-a575-cf5b8c5e1907

1 files changed, 19 insertions, 40 deletions

diff --git a/src/sor_flat.F b/src/sor_flat.F
index f1ca935..a5c19a9 100644
--- a/src/sor_flat.F
+++ b/src/sor_flat.F
@@ -88,11 +88,6 @@ c     Coeeficients for the solver: 19 point stencil...
 c     stencil size
       INTEGER sw(3)
 
-c#ifdef MPI
-c      include 'mpif.h'
-c      INTEGER ierror
-c#endif 
-
       tol = AbsTol(1)
 
 c     Get the reduction handel for the sum operation
@@ -151,18 +146,18 @@ c      none = contains("sor_accel","none").ne.0
       ab = 1.
       ac =-6.
 
-      ane = 0.            
-      anw = 0.               
-      ase = 0.                
-      asw = 0.               
-      ate = 0.               
-      atw = 0.               
-      abe = 0.               
-      abw = 0.             
-      atn = 0.                
-      ats = 0.               
-      abn = 0.              
-      asb = 0. 
+c      ane = 0.            
+c      anw = 0.               
+c      ase = 0.                
+c      asw = 0.               
+c      ate = 0.               
+c      atw = 0.               
+c      abe = 0.               
+c      abw = 0.             
+c      atn = 0.                
+c      ats = 0.               
+c      abn = 0.              
+c      asb = 0. 
 
       do sor_iteration=1,sor_maxit
 
@@ -195,15 +190,13 @@ c     Start loop with Red Black
          do k=ks,cctk_lsh(3)-1,kstep
             do j=2,cctk_lsh(2)-1
                do i=2,cctk_lsh(1)-1
- 
-                  ac = -10.38
+                  
+                  ac = -6.0
 
                   if (Mlinear_storage.eq.1) then
                      ac = ac - Mlinear(i,j,k)
                   endif
 
-
-               
                   residual = ac*var(i,j,k) 
      &                 + ae*var(i+1,j,k) + aw*var(i-1,j,k)
      &                 + an*var(i,j+1,k) + as*var(i,j-1,k)
@@ -215,6 +208,7 @@ c     &                 + ate*var(i+1,j,k+1) + atw*var(i-1,j,k+1)
 c     &                 + abe*var(i+1,j,k-1) + abw*var(i-1,j,k-1)
 c     &                 + atn*var(i,j+1,k+1) + ats*var(i,j-1,k+1)
 c     &                 + abn*var(i,j+1,k-1) + asb*var(i,j-1,k-1)
+
                   if (Nsource_storage.eq.1) then
                      residual = residual - Nsource(i,j,k)
                   endif
@@ -222,7 +216,6 @@ c     &                 + abn*var(i,j+1,k-1) + asb*var(i,j-1,k-1)
 c     Accumulate to the total Norm of the residual
                   resnorm = resnorm + abs(residual)
 c     Update
-
                   var(i,j,k) = var(i,j,k) - omega*residual/ac
                end do
             end do
@@ -234,11 +227,9 @@ c     Reduce the norm
          if (ierr.ne.0) then
             call CCTK_WARN(1,"Reduction of norm failed!");
          endif
-
          residual = resnorm
          
          call CCTK_SyncGroupWithVarI(cctkGH, var_idx)
-
          
          if (residual .lt. tol) then 
             goto 123
@@ -246,29 +237,17 @@ c     Reduce the norm
 
 c     FIXME: what about boudnary conditions, like robin, etc.
 c     Apply octant Symmetries
-         sw(1)=1
-         sw(2)=1
-         sw(2)=1
+
+c         sw(1)=1
+c         sw(2)=1
+c         sw(2)=1
 c         call FlatBCVarI(ierr,cctkGH,sw,var_idx);
 c         if (ierr.ne.0) then
 c            call CCTK_WARN(1,"Could not apply BC !")
 c         endif
-
          
          call ApplySymmetryVarI(cctkGH, var_idx)
 
-c         if (octant) then
-c            if (cctk_bbox(1) .eq. 1) then 
-c               var(1,:,:) = var(2,:,:)
-c            endif
-c            if (cctk_bbox(3) .eq. 1) then
-c               var(:,1,:) = var(:,2,:)
-c            endif
-c           if (cctk_bbox(5) .eq. 1) then 
-c               var(:,:,1) = var(:,:,2)
-c            endif
-c         endif
-
       enddo
 
       write (*,*) "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"