diff options
| author | miguel <miguel@89daf98e-ef62-4674-b946-b8ff9de2216c> | 2001-01-04 21:25:55 +0000 |
|---|---|---|
| committer | miguel <miguel@89daf98e-ef62-4674-b946-b8ff9de2216c> | 2001-01-04 21:25:55 +0000 |
| commit | 8096fdddc9feb81b0eb40e8cc41880d5812b2820 (patch) | |
| tree | 4bb154aefe4d80e30982c4447e512a8710ad6721 /src/AHFinder_int.F | |
| parent | 67fb69d4af836f778b9c4fb4c5e57315a602495e (diff) | |
Trying to fix the testsuite in the t3e. The flow algorithm passes, but the
minimization still fails.
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinder/trunk@164 89daf98e-ef62-4674-b946-b8ff9de2216c
Diffstat (limited to 'src/AHFinder_int.F')
| -rw-r--r-- | src/AHFinder_int.F | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/src/AHFinder_int.F b/src/AHFinder_int.F index a2662a1..5bca908 100644 --- a/src/AHFinder_int.F +++ b/src/AHFinder_int.F @@ -29,11 +29,11 @@ integer npt,npp integer l_ntheta,l_nphi,theta0,phi0 integer npoints + integer auxi integer ierror - integer handle - integer auxi - CCTK_INT aux_int + CCTK_INT handle,reduction_handle + CCTK_INT red_tmp CCTK_REAL LEGEN CCTK_REAL xp,yp,zp,rp @@ -57,11 +57,6 @@ CCTK_REAL, allocatable, dimension(:,:) :: txx,tyy,tzz,txy,txz,tyz CCTK_REAL, allocatable, dimension(:,:) :: intmask -! Reduction related things. - - CCTK_INT reduction_handle - CCTK_INT red_tmp - ! Variables to be saved for next call. save dtheta,dphi,dtp,idtheta,idphi,phistart @@ -166,7 +161,7 @@ call CCTK_ReductionArrayHandle(reduction_handle,"sum") if (reduction_handle.lt.0) then - call CCTK_WARN(1,"Cannot get reduction handle for SUM operation.") + call CCTK_WARN(1,"Cannot get reduction handle") end if @@ -829,10 +824,10 @@ ! except at the very end, but by then the flag 'flow' has ! been switched off. - if (.not.flow) then + inside_min_count = 0 + inside_min_neg_count = 0 - inside_min_count = 0 - inside_min_neg_count = 0 + if (.not.flow) then if (myproc.lt.npt*npp) then @@ -893,12 +888,12 @@ intexpdel2=aux call CCTK_ReduceLocalScalar(ierror,cctkGH,-1,reduction_handle, - . inside_min_neg_count,aux_int,CCTK_VARIABLE_INT) - inside_min_neg_count=aux_int + . inside_min_neg_count,red_tmp,CCTK_VARIABLE_INT) + inside_min_neg_count=red_tmp call CCTK_ReduceLocalScalar(ierror,cctkGH,-1,reduction_handle, - . inside_min_count,aux_int,CCTK_VARIABLE_INT) - inside_min_count=aux_int + . inside_min_count,red_tmp,CCTK_VARIABLE_INT) + inside_min_count=red_tmp end if @@ -1081,7 +1076,7 @@ auxi = lmax*lmax - if (nw.ne.zero) then + if (hw.ne.zero) then call CCTK_ReduceLocalArray1D(ierror,cctkGH,-1, . reduction_handle,hflowc,tempm,auxi,CCTK_VARIABLE_REAL) hflowc = tempm |