aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--interface.ccl2
-rw-r--r--param.ccl15
-rw-r--r--src/AHFinder.F75
-rw-r--r--src/AHFinder_gau.F32
-rw-r--r--src/AHFinder_int.F32
5 files changed, 84 insertions, 72 deletions
diff --git a/interface.ccl b/interface.ccl
index 0bff3b9..40ed04e 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -10,7 +10,7 @@
#c@@*/
implements: ahfinder
-inherits: interp einstein grid adm
+inherits: interp einstein grid adm IO
public:
diff --git a/param.ccl b/param.ccl
index c187673..8f7f760 100644
--- a/param.ccl
+++ b/param.ccl
@@ -394,22 +394,9 @@ shares: IO
####################
# Output directories
####################
-EXTEND STRING IO_outdir "Name of IO output directory"
+EXTENDS STRING outdir "Name of IO output directory"
{
} "."
-EXTEND STRING IO_outdir0D "Name of IO 0D output directory, overrides IO_outdir"
-{
-} "IO_outdir"
-EXTEND STRING IO_outdir1D "Name of IO 1D output directory, overrides IO_outdir"
-{
-} "IO_outdir"
-EXTEND STRING IO_outdir2D "Name of IO 2D output directory, overrides IO_outdir"
-{
-} "IO_outdir"
-EXTEND STRING IO_outdir3D "Name of IO 3D output directory, overrides IO_outdir"
-{
-} "IO_outdir"
-
########################
### Get symmetries ###
diff --git a/src/AHFinder.F b/src/AHFinder.F
index 73992b1..b9b41b7 100644
--- a/src/AHFinder.F
+++ b/src/AHFinder.F
@@ -224,10 +224,17 @@ c Note that including cactus.h will also include AHFinder.h
! *** GET THE NAME OF OUTPUT DIRECTORY ***
! ********************************************
+ write(*,*) 'outdir =',outdir
+! write(*,*) 'filestr =', filestr
+! write(*,*) 'nfile =',nfile
+
if (.false.) then
! nfile = getoutpfx(GH,filestr)
- filestr = IO_outdir
-
+! filestr = outdir
+! nfile = LEN(outdir)
+! write(*,*) 'filestr =', filestr
+! write(*,*) 'nfile =',nfile
+!
if (find3) then
@@ -348,39 +355,48 @@ c Note that including cactus.h will also include AHFinder.h
! *** FIND {xmn,xmx,ymn,ymx,zmn,zmx} ***
! *******************************************
- call CCTK_ReductionHandle(handle,"minimum")
- call CCTK_GetCoordIndex(x_index,"x")
- call CCTK_GetCoordIndex(y_index,"y")
- call CCTK_GetCoordIndex(z_index,"z")
+ call CCTK_CoordRange(cctkGH,xmn,xmx,x)
+ call CCTK_CoordRange(cctkGH,ymn,ymx,y)
+ call CCTK_CoordRange(cctkGH,zmn,zmx,z)
+
+ write (*,*) 'xmin,xmax',xmn,xmx
+ write (*,*) 'ymin,ymax',ymn,ymx
+ write (*,*) 'zmin,zmax',zmn,zmx
+
+
+! call CCTK_ReductionHandle(handle,"minimum")
+! call CCTK_CoordIndex(x_index,"x")
+! call CCTK_CoordIndex(y_index,"y")
+! call CCTK_CoordIndex(z_index,"z")
- call CCTK_Reduce(cctkGH,ierror,-1,handle,3,
- . CCTK_VARIABLE_REAL,
- . minval,3,x_index,y_index,z_index)
+! call CCTK_Reduce(cctkGH,ierror,-1,handle,3,
+! . CCTK_VARIABLE_REAL,
+! . minval,3,x_index,y_index,z_index)
! xmn = gf_min(x)
! ymn = gf_min(y)
! zmn = gf_min(z)
- xmn = minval(1)
- ymn = minval(2)
- zmn = minval(3)
+! xmn = minval(1)
+! ymn = minval(2)
+! zmn = minval(3)
- call CCTK_ReductionHandle(handle,"maximum")
- call CCTK_GetCoordIndex(x_index,"x")
- call CCTK_GetCoordIndex(y_index,"y")
- call CCTK_GetCoordIndex(z_index,"z")
+! call CCTK_ReductionHandle(handle,"maximum")
+! call CCTK_CoordIndex(x_index,"x")
+! call CCTK_CoordIndex(y_index,"y")
+! call CCTK_CoordIndex(z_index,"z")
- call CCTK_Reduce(cctkGH,ierror,-1,handle,3,
- . CCTK_VARIABLE_REAL,
- . maxval,3,x_index,y_index,z_index)
+! call CCTK_Reduce(cctkGH,ierror,-1,handle,3,
+! . CCTK_VARIABLE_REAL,
+! . maxval,3,x_index,y_index,z_index)
! xmx = gf_max(x)
! ymx = gf_max(y)
! zmx = gf_max(z)
- xmx = maxval(1)
- ymx = maxval(2)
- zmx = maxval(3)
+! xmx = maxval(1)
+! ymx = maxval(2)
+! zmx = maxval(3)
! **********************************
@@ -1434,7 +1450,12 @@ c Expansion coefficients.
! if (contains("ahf_2Doutput","yes").ne.0) then
if (ahf_2Doutput.ne.0) then
if (find3) then
-! if (mfind.eq.2) then
+ if (mfind.eq.2) then
+ call CCTK_OutputVarAsByMethod(cctkGH,ierror,
+ . "ahfinder::ahfgrid3","IOFlexIO_2D","ahfgrid")
+ call CCTK_OutputVarAsByMethod(cctkGH,ierror,
+ . "ahfinder::ahf_exp3","IOFlexIO_2D","ahf_exp")
+
! call AHFinder_2dio(ahfgrid3,ahf_ncall)
! call AHFinder_2dio(ahf_exp3,ahf_ncall)
!
@@ -1443,8 +1464,12 @@ c Expansion coefficients.
!
! call AHFinder_2dio(ahfgrid3,0)
! call AHFinder_2dio(ahf_exp3,0)
-! end if
-! else
+ end if
+ else
+ call CCTK_OutputVarAsByMethod(cctkGH,ierror,
+ . "ahfinder::ahfgrid","IOFlexIO_2D","ahfgrid")
+ call CCTK_OutputVarAsByMethod(cctkGH,ierror,
+ . "ahfinder::ahf_exp","IOFlexIO_2D","ahf_exp")
! call AHFinder_2dio(ahfgrid,ahf_ncall)
! call AHFinder_2dio(ahf_exp,ahf_ncall)
!
diff --git a/src/AHFinder_gau.F b/src/AHFinder_gau.F
index ef3e6cb..cc5f4a4 100644
--- a/src/AHFinder_gau.F
+++ b/src/AHFinder_gau.F
@@ -258,37 +258,37 @@ c Note that including cactus.h will also include AHFinder.h
! *********************************
! Find grid boundaries.
-! call CCTK_ReductionHandle(handle,"minimum")
-! call CCTK_GetCoordIndex(x_index,"x")
-! call CCTK_GetCoordIndex(y_index,"y")
-! call CCTK_GetCoordIndex(z_index,"z")
+ call CCTK_ReductionHandle(handle,"minimum")
+ call CCTK_CoordIndex(x_index,"x")
+ call CCTK_CoordIndex(y_index,"y")
+ call CCTK_CoordIndex(z_index,"z")
-! call CCTK_Reduce(cctkGH,ierror,-1,handle,3,
-! . CCTK_VARIABLE_REAL,minval,3,
-! . x_index,y_index,z_index)
+ call CCTK_Reduce(cctkGH,ierror,-1,handle,3,
+ . CCTK_VARIABLE_REAL,minval,3,
+ . x_index,y_index,z_index)
! xmn = gf_min(x)
! ymn = gf_min(y)
! zmn = gf_min(z)
- minval = -9.45D0
+! minval = -9.45D0
xmn = minval(1)
ymn = minval(2)
zmn = minval(3)
-! call CCTK_ReductionHandle(handle,"maximum")
-! call CCTK_GetCoordIndex(x_index,"x")
-! call CCTK_GetCoordIndex(y_index,"y")
-! call CCTK_GetCoordIndex(z_index,"z")
+ call CCTK_ReductionHandle(handle,"maximum")
+ call CCTK_CoordIndex(x_index,"x")
+ call CCTK_CoordIndex(y_index,"y")
+ call CCTK_CoordIndex(z_index,"z")
-! call CCTK_Reduce(cctkGH,ierror,-1,handle,3,
-! . CCTK_VARIABLE_REAL,maxval,3,
-! . x_index,y_index,z_index)
+ call CCTK_Reduce(cctkGH,ierror,-1,handle,3,
+ . CCTK_VARIABLE_REAL,maxval,3,
+ . x_index,y_index,z_index)
! xmx = gf_max(x)
! ymx = gf_max(y)
! zmx = gf_max(z)
- maxval =9.45D0
+! maxval =9.45D0
xmx = maxval(1)
ymx = maxval(2)
diff --git a/src/AHFinder_int.F b/src/AHFinder_int.F
index d13210e..4023d42 100644
--- a/src/AHFinder_int.F
+++ b/src/AHFinder_int.F
@@ -171,37 +171,37 @@ c Note that including cactus.h will also include AHFinder.h
! Find grid boundaries.
-! call CCTK_ReductionHandle(handle,"minimum")
-! call CCTK_GetCoordIndex(x_index,"x")
-! call CCTK_GetCoordIndex(y_index,"y")
-! call CCTK_GetCoordIndex(z_index,"z")
+ call CCTK_ReductionHandle(handle,"minimum")
+ call CCTK_CoordIndex(x_index,"x")
+ call CCTK_CoordIndex(y_index,"y")
+ call CCTK_CoordIndex(z_index,"z")
-! call CCTK_Reduce(cctkGH,ierror,-1,handle,3,
-! . CCTK_VARIABLE_REAL,minval,3,
-! . x_index,y_index,z_index)
+ call CCTK_Reduce(cctkGH,ierror,-1,handle,3,
+ . CCTK_VARIABLE_REAL,minval,3,
+ . x_index,y_index,z_index)
! xmn = gf_min(x)
! ymn = gf_min(y)
! zmn = gf_min(z)
- minval = -9.45D0
+! minval = -9.45D0
xmn = minval(1)
ymn = minval(2)
zmn = minval(3)
-! call CCTK_ReductionHandle(handle,"maximum")
-! call CCTK_GetCoordIndex(x_index,"x")
-! call CCTK_GetCoordIndex(y_index,"y")
-! call CCTK_GetCoordIndex(z_index,"z")
+ call CCTK_ReductionHandle(handle,"maximum")
+ call CCTK_CoordIndex(x_index,"x")
+ call CCTK_CoordIndex(y_index,"y")
+ call CCTK_CoordIndex(z_index,"z")
-! call CCTK_Reduce(cctkGH,ierror,-1,handle,3,
-! . CCTK_VARIABLE_REAL,maxval,3,
-! . x_index,y_index,z_index)
+ call CCTK_Reduce(cctkGH,ierror,-1,handle,3,
+ . CCTK_VARIABLE_REAL,maxval,3,
+ . x_index,y_index,z_index)
! xmx = gf_max(x)
! ymx = gf_max(y)
! zmx = gf_max(z)
- maxval = 9.45D0
+! maxval = 9.45D0
xmx = maxval(1)
ymx = maxval(2)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 11:31:15 +0000