diff options
| -rw-r--r-- | param.ccl | 54 | ||||
| -rw-r--r-- | src/AHFinder.F | 8 | ||||
| -rw-r--r-- | src/AHFinder_gau.F | 6 | ||||
| -rw-r--r-- | src/AHFinder_int.F | 6 |
4 files changed, 37 insertions, 37 deletions
@@ -7,15 +7,15 @@ private: -LOGICAL ahf_active "Activate AHFinder?" +BOOLEAN ahf_active "Activate AHFinder?" { } "no" -LOGICAL ahf_find3 "Searching for 3 surfaces?" +BOOLEAN ahf_find3 "Searching for 3 surfaces?" { } "no" -LOGICAL ahf_trapped_surface "Minimize (expansion + delta) to find trapped surface?" +BOOLEAN ahf_trapped_surface "Minimize (expansion + delta) to find trapped surface?" { } "no" @@ -41,15 +41,15 @@ REAL trapped_surface_delta "find (expansion = delta) surface" #Parameters for surface expansion. -LOGICAL ahf_phi "Expand also in phi? I.e seach for non-axisymmetric surface" +BOOLEAN ahf_phi "Expand also in phi? I.e seach for non-axisymmetric surface" { } "no" -LOGICAL ahf_offset "Center offset from origin?" +BOOLEAN ahf_offset "Center offset from origin?" { } "no" -LOGICAL ahf_wander "Allow the center to wander?" +BOOLEAN ahf_wander "Allow the center to wander?" { } "no" @@ -77,15 +77,15 @@ INT ahf_nphi "Number of subdivisions in phi" #three coordinate planes, while octant = "high" enforces also the #extra symmetry of rotation of pi/2 around the z axis. -LOGICAL ahf_refx "Reflection symmetry x->-x?" +BOOLEAN ahf_refx "Reflection symmetry x->-x?" { } "no" -LOGICAL ahf_refy "Reflection symmetry y->-y?" +BOOLEAN ahf_refy "Reflection symmetry y->-y?" { } "no" -LOGICAL ahf_refz "Reflection symmetry z->-z?" +BOOLEAN ahf_refz "Reflection symmetry z->-z?" { } "no" @@ -98,7 +98,7 @@ KEYWORD ahf_octant "Octant symmetry?" #Parameters for minimization algorithm. -LOGICAL ahf_minarea "Minimize area instead of expansion?" +BOOLEAN ahf_minarea "Minimize area instead of expansion?" { } "no" @@ -114,23 +114,23 @@ REAL ahf_tol "Tolerance for minimization routines" #Parameters for initial guess. -LOGICAL ahf_sloppyguess "Use sphere as initial guess?" +BOOLEAN ahf_sloppyguess "Use sphere as initial guess?" { } "no" -LOGICAL ahf_guess_absmin "Use absolute min to start Minimization?" +BOOLEAN ahf_guess_absmin "Use absolute min to start Minimization?" { } "no" -LOGICAL ahf_guessold "Use old horizon as initial guess?" +BOOLEAN ahf_guessold "Use old horizon as initial guess?" { } "no" -LOGICAL ahf_inner "Look for inner horizon?" +BOOLEAN ahf_inner "Look for inner horizon?" { } "no" -LOGICAL ahf_manual_guess "Use specified coefficients for guess?" +BOOLEAN ahf_manual_guess "Use specified coefficients for guess?" { } "no" @@ -276,7 +276,7 @@ REAL ahf_zc_2 "z-coordinate of center of expansion for third surface with find3" #Parameters for flow algorithm. -LOGICAL ahf_flow "Use flow instead of minimization?" +BOOLEAN ahf_flow "Use flow instead of minimization?" { } "no" @@ -329,35 +329,35 @@ REAL ahf_minchange "min rel diff between 1 big and 2 small steps" #IMPORTANT: 3D output for grid functions is still not implemented! -LOGICAL ahf_logfile "Write log file?" +BOOLEAN ahf_logfile "Write log file?" { } "no" -LOGICAL ahf_verbose "Print messages to screen?" +BOOLEAN ahf_verbose "Print messages to screen?" { } "yes" -LOGICAL ahf_veryverbose "Print messages at each iteration step to screen?" +BOOLEAN ahf_veryverbose "Print messages at each iteration step to screen?" { } "no" -LOGICAL ahf_guessverbose "Print info on initial guell points?" +BOOLEAN ahf_guessverbose "Print info on initial guell points?" { } "no" -LOGICAL ahf_2Doutput "2D output of grid functions?" +BOOLEAN ahf_2Doutput "2D output of grid functions?" { } "yes" -LOGICAL ahf_3Doutput "3D output of grid functions? (Not yet implemented!)" +BOOLEAN ahf_3Doutput "3D output of grid functions? (Not yet implemented!)" { } "no" -LOGICAL ahf_areamap "Find area map?" +BOOLEAN ahf_areamap "Find area map?" { } "no" -LOGICAL ahf_gaussout "Output gaussian curvature of horizon?" +BOOLEAN ahf_gaussout "Output gaussian curvature of horizon?" { } "yes" @@ -366,11 +366,11 @@ LOGICAL ahf_gaussout "Output gaussian curvature of horizon?" #Parameters for mask. #IMPORTANT: By default the mask is always off! -LOGICAL ahf_mask "Use mask for definite horizons?" +BOOLEAN ahf_mask "Use mask for definite horizons?" { } "no" -LOGICAL ahf_weakmask "Use mask for possible horizons?" +BOOLEAN ahf_weakmask "Use mask for possible horizons?" { } "no" @@ -379,7 +379,7 @@ REAL ahf_maskshrink "Shrink factor for mask" : :: } -2.0 -LOGICAL ah_persists "Does the AH Finder array and mask stay around" +BOOLEAN ah_persists "Does the AH Finder array and mask stay around" { } "no" diff --git a/src/AHFinder.F b/src/AHFinder.F index 83a7be5..4384066 100644 --- a/src/AHFinder.F +++ b/src/AHFinder.F @@ -1388,9 +1388,9 @@ c Expansion coefficients. if (ahf_2Doutput.ne.0) then if (find3) then if (mfind.eq.2) then - call CCTK_OutputVarAsByMethod(cctkGH,ierror, + call CCTK_OutputVarAsByMethod(ierror,cctkGH, . "ahfinder::ahfgrid3","IOFlexIO_2D","ahfgrid") - call CCTK_OutputVarAsByMethod(cctkGH,ierror, + call CCTK_OutputVarAsByMethod(ierror,cctkGH, . "ahfinder::ahf_exp3","IOFlexIO_2D","ahf_exp") ! call AHFinder_2dio(ahfgrid3,ahf_ncall) @@ -1403,9 +1403,9 @@ c Expansion coefficients. ! call AHFinder_2dio(ahf_exp3,0) end if else - call CCTK_OutputVarAsByMethod(cctkGH,ierror, + call CCTK_OutputVarAsByMethod(ierror,cctkGH, . "ahfinder::ahfgrid","IOFlexIO_2D","ahfgrid") - call CCTK_OutputVarAsByMethod(cctkGH,ierror, + call CCTK_OutputVarAsByMethod(ierror,cctkGH, . "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 c025a21..72c4359 100644 --- a/src/AHFinder_gau.F +++ b/src/AHFinder_gau.F @@ -261,7 +261,7 @@ c Note that including cactus.h will also include AHFinder.h call CCTK_CoordIndex(y_index,"y") call CCTK_CoordIndex(z_index,"z") - call CCTK_Reduce(cctkGH,ierror,-1,handle,1, + call CCTK_Reduce(ierror,cctkGH,-1,handle,1, . CCTK_VARIABLE_REAL,minval,3, . x_index,y_index,z_index) @@ -274,7 +274,7 @@ c Note that including cactus.h will also include AHFinder.h call CCTK_CoordIndex(y_index,"y") call CCTK_CoordIndex(z_index,"z") - call CCTK_Reduce(cctkGH,ierror,-1,handle,1, + call CCTK_Reduce(ierror,cctkGH,-1,handle,1, . CCTK_VARIABLE_REAL,maxval,3, . x_index,y_index,z_index) @@ -632,7 +632,7 @@ c Note that including cactus.h will also include AHFinder.h call CCTK_VarIndex (ahfgauss_index, "ahfinder::ahfgauss") - call CCTK_InterpGF (cctkGH, ierror, handle, npoints, 3, 7, 7, + call CCTK_InterpGF (ierror, cctkGH, handle, npoints, 3, 7, 7, $ xa, ya, za, $ CCTK_VARIABLE_REAL, CCTK_VARIABLE_REAL, $ CCTK_VARIABLE_REAL, diff --git a/src/AHFinder_int.F b/src/AHFinder_int.F index ef6c4aa..7367d13 100644 --- a/src/AHFinder_int.F +++ b/src/AHFinder_int.F @@ -180,7 +180,7 @@ c Note that including cactus.h will also include AHFinder.h call CCTK_CoordIndex(z_index,"z") - call CCTK_Reduce(cctkGH,ierror,-1,handle,1, + call CCTK_Reduce(ierror,cctkGH,-1,handle,1, . CCTK_VARIABLE_REAL,minval,3, . x_index,y_index,z_index) @@ -199,7 +199,7 @@ c Note that including cactus.h will also include AHFinder.h call CCTK_CoordIndex(y_index,"y") call CCTK_CoordIndex(z_index,"z") - call CCTK_Reduce(cctkGH,ierror,-1,handle,1, + call CCTK_Reduce(ierror,cctkGH,-1,handle,1, . CCTK_VARIABLE_REAL,maxval,3, . x_index,y_index,z_index) @@ -606,7 +606,7 @@ c Note that including cactus.h will also include AHFinder.h call CCTK_VarIndex (exp_index, "ahfinder::ahf_exp") call CCTK_VarIndex (gradn_index, "ahfinder::ahfgradn") - call CCTK_InterpGF (cctkGH, ierror, handle, npoints, 3, 8, 8, + call CCTK_InterpGF (ierror, cctkGH, handle, npoints, 3, 8, 8, $ xa, ya, za, $ CCTK_VARIABLE_REAL, CCTK_VARIABLE_REAL, $ CCTK_VARIABLE_REAL, |