From c2d3c6acd277523fd470f23820b6aac89367d99a Mon Sep 17 00:00:00 2001 From: tradke Date: Mon, 6 May 2002 12:43:53 +0000 Subject: Use IO::out_dir instead of the old IO::outdir parameter. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinder/trunk@300 89daf98e-ef62-4674-b946-b8ff9de2216c --- param.ccl | 16 ++++++---------- src/AHFinder.F | 18 +++++++++--------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/param.ccl b/param.ccl index 31e63a8..acc03a4 100644 --- a/param.ccl +++ b/param.ccl @@ -488,9 +488,7 @@ INT interpolation_order "Order for interpolation" STEERABLE = ALWAYS shares: IO -STRING outdir "" -{ -} +USES STRING out_dir ################# @@ -499,9 +497,9 @@ STRING outdir "" shares: grid -USES KEYWORD domain "" -USES KEYWORD quadrant_direction "" -USES KEYWORD bitant_plane "" +USES KEYWORD domain +USES KEYWORD quadrant_direction +USES KEYWORD bitant_plane #################### @@ -510,7 +508,7 @@ USES KEYWORD bitant_plane "" shares: admbase -USES KEYWORD metric_type "" +USES KEYWORD metric_type ###################### ### FROM SpaceMask ### @@ -518,6 +516,4 @@ USES KEYWORD metric_type "" shares: spacemask -USES BOOLEAN use_mask "" - - +USES BOOLEAN use_mask diff --git a/src/AHFinder.F b/src/AHFinder.F index c85dca7..6ff7401 100644 --- a/src/AHFinder.F +++ b/src/AHFinder.F @@ -170,7 +170,7 @@ ! ******************************************* ! *** FIND {xmn,xmx,ymn,ymx,zmn,zmx} *** ! ******************************************* - + call CCTK_CoordRange(ierr,cctkGH,xmn,xmx,-1,"x","cart3d") call CCTK_CoordRange(ierr,cctkGH,ymn,ymx,-1,"y","cart3d") call CCTK_CoordRange(ierr,cctkGH,zmn,zmx,-1,"z","cart3d") @@ -317,7 +317,7 @@ ! *** FIND OUT THE TYPE OF OUTPUT *** ! *************************************** - call CCTK_FortranString(nfile,outdir,filestr) + call CCTK_FortranString(nfile,out_dir,filestr) if (ahf_logfile.ne.0) then logfile = .true. logf = filestr(1:nfile)//"/ahf_logfile" @@ -344,7 +344,7 @@ guessverbose = .true. else guessverbose = .false. - end if + end if if (logfile.and.(myproc.eq.0)) then if (logfile) then @@ -372,7 +372,7 @@ xc = ahf_xc_0 yc = ahf_yc_0 zc = ahf_zc_0 - else if (mfind.eq.2) then + else if (mfind.eq.2) then xc = ahf_xc_1 yc = ahf_yc_1 zc = ahf_zc_1 @@ -467,7 +467,7 @@ else refz = .false. end if - + end if if (ahf_phi.eq.0) then @@ -703,7 +703,7 @@ if (find3) then if (mfind.eq.1) then r0 = ahf_r0_0 - else if (mfind.eq.2) then + else if (mfind.eq.2) then r0 = ahf_r0_1 else r0 = ahf_r0_2 @@ -927,7 +927,7 @@ ! ! 3) The integral of the square of the expansion at the surface ! must be smaller by a factor of "small2" than the same -! integral slightly outside and slightly inside. +! integral slightly outside and slightly inside. horizon = .true. @@ -1340,7 +1340,7 @@ write(1,*) 'No horizon found.' write(1,*) end if - + ! Close logfile write(*,*) @@ -1380,7 +1380,7 @@ write(1,*) 'No horizon found.' write(1,*) end if - + ! Close logfile write(*,*) -- cgit v1.2.3