aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorallen <allen@c78560ca-4b45-4335-b268-5f3340f3cb52>1999-07-30 22:45:49 +0000
committerallen <allen@c78560ca-4b45-4335-b268-5f3340f3cb52>1999-07-30 22:45:49 +0000
commit1d30d53001d6a16c20989449a9eaa5ec326dc3c2 (patch)
tree6bc363a3c27475d5ba336bc7f43227ced4b8d5fd
parent059a4dca4bfed4cbe0bfd5f5eedd73a508829020 (diff)
A lot of parameter name changes, especially for IO
git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/CartGrid3D/trunk@47 c78560ca-4b45-4335-b268-5f3340f3cb52
-rw-r--r--param.ccl10
-rw-r--r--src/CartGrid3D.F7716
-rw-r--r--src/ParamCheck.F7718
-rw-r--r--src/Symmetry.c10
4 files changed, 27 insertions, 27 deletions
diff --git a/param.ccl b/param.ccl
index a7bdbe2..76f7a13 100644
--- a/param.ccl
+++ b/param.ccl
@@ -69,11 +69,11 @@ KEYWORD type "Grid type"
"byspacing" :: "Specify grid spacings"
} "box"
-KEYWORD symmetry "Symmetry type"
+KEYWORD domain "Domain type"
{
- "octant" :: "Use octant symmetry about the origin"
- "quadrant" :: "Use quadrant symmetry in x-y plane"
- "bitant" :: "Use plane symmetry about the x-y plane"
- "full" :: "Use no symmetry"
+ "octant" :: "Use an octant about the origin"
+ "quadrant" :: "Use a quadrant in x-y plane"
+ "bitant" :: "Use a bitant about the x-y plane"
+ "full" :: "Use the full domain"
} "full"
diff --git a/src/CartGrid3D.F77 b/src/CartGrid3D.F77
index 44653aa..5b18395 100644
--- a/src/CartGrid3D.F77
+++ b/src/CartGrid3D.F77
@@ -53,7 +53,7 @@ c --------------------------------------------------------------
zmax1 = zmax
end if
- if (CCTK_EQUALS(symmetry,'octant')) then
+ if (CCTK_EQUALS(domain,'octant')) then
c Grid spacing on coarsest grid
@@ -83,15 +83,15 @@ c Minimum coordinate values on this grid
z_origin = (-dble(cctk_nghostzones(3)))*this_dz
end if
- else if (CCTK_EQUALS(symmetry,'quadrant')) then
+ else if (CCTK_EQUALS(domain,'quadrant')) then
print *,"FIXME"
- else if (CCTK_Equals(symmetry,'bitant') .eq. 1) then
+ else if (CCTK_Equals(domain,'bitant') .eq. 1) then
print *,"FIXME"
- else if (CCTK_Equals(symmetry,'full') .eq. 1) then
+ else if (CCTK_Equals(domain,'full') .eq. 1) then
c Set minimum values of coordinates
x_origin = xmin
@@ -143,7 +143,7 @@ c dx, dy, dz on the grid we are on
this_dy = coarse_dy*iconv/cctk_levfac(2)
this_dz = coarse_dz*iconv/cctk_levfac(3)
- if (CCTK_Equals(symmetry,'bitant') .eq. 1) then
+ if (CCTK_Equals(domain,'bitant') .eq. 1) then
if (no_origin.eq.1) then
x_origin = (0.5 - cctk_gsh(1)/2)*this_dx
@@ -155,7 +155,7 @@ c dx, dy, dz on the grid we are on
z_origin = (-dble(cctk_nghostzones(3)))*this_dz
end if
- else if (CCTK_Equals(symmetry,'quadrant') .eq. 1) then
+ else if (CCTK_Equals(domain,'quadrant') .eq. 1) then
if (no_origin.eq.1) then
x_origin = (-dble(cctk_nghostzones(1))+0.5d0)*this_dx
@@ -167,7 +167,7 @@ c dx, dy, dz on the grid we are on
z_origin = (- cctk_gsh(3)/2)*this_dz
end if
- else if (CCTK_Equals(symmetry,'octant') .eq. 1) then
+ else if (CCTK_Equals(domain,'octant') .eq. 1) then
if (no_origin.eq.1) then
x_origin = (-dble(cctk_nghostzones(1))+0.5d0)*this_dx
@@ -179,7 +179,7 @@ c dx, dy, dz on the grid we are on
z_origin = (-dble(cctk_nghostzones(3)))*this_dz
end if
- else if (CCTK_Equals(symmetry,'full').eq.1) then
+ else if (CCTK_Equals(domain,'full').eq.1) then
if (no_origin.eq.1) then
x_origin = (0.5 - cctk_gsh(1)/2)*this_dx
diff --git a/src/ParamCheck.F77 b/src/ParamCheck.F77
index 8de450e..73073e5 100644
--- a/src/ParamCheck.F77
+++ b/src/ParamCheck.F77
@@ -26,25 +26,25 @@
if (CCTK_Equals(type,'byrange') .eq. 1) then
- if (CCTK_Equals(symmetry,'octant') .eq. 1) then
+ if (CCTK_Equals(domain,'octant') .eq. 1) then
iflag = iflag +1
- else if (CCTK_Equals(symmetry,'quadrant') .eq. 1) then
+ else if (CCTK_Equals(domain,'quadrant') .eq. 1) then
iflag = iflag +1
- else if (CCTK_Equals(symmetry,'bitant') .eq. 1) then
+ else if (CCTK_Equals(domain,'bitant') .eq. 1) then
iflag = iflag +1
- else if (CCTK_Equals(symmetry,'full') .eq. 1) then
+ else if (CCTK_Equals(domain,'full') .eq. 1) then
iflag = iflag +1
end if
else if (CCTK_Equals(type,'byspacing') .eq. 1) then
- if (CCTK_Equals(symmetry,'bitant') .eq. 1) then
+ if (CCTK_Equals(domain,'bitant') .eq. 1) then
iflag = iflag + 1
- else if (CCTK_Equals(symmetry,'quadrant') .eq. 1) then
+ else if (CCTK_Equals(domain,'quadrant') .eq. 1) then
iflag = iflag + 1
- else if (CCTK_Equals(symmetry,'octant') .eq. 1) then
+ else if (CCTK_Equals(domain,'octant') .eq. 1) then
iflag = iflag + 1
- else if (CCTK_Equals(symmetry,'full').eq.1) then
+ else if (CCTK_Equals(domain,'full').eq.1) then
iflag = iflag + 1
end if
@@ -52,7 +52,7 @@
iflag = iflag + 1
- if (CCTK_Equals(symmetry,"full").eq.0)
+ if (CCTK_Equals(domain,"full").eq.0)
& call CCTK_PARAMWARN("No symmetries can be used with box grid")
end if
diff --git a/src/Symmetry.c b/src/Symmetry.c
index c547e62..0a7a9df 100644
--- a/src/Symmetry.c
+++ b/src/Symmetry.c
@@ -69,7 +69,7 @@ void SetCartSymmetry(cGH *GH, int *sym, const char *imp_gf) {
When we apply a symmetry and find ESYM_UNSET, something went wrong!
*/
- if (CCTK_Equals(symmetry,"full")) {
+ if (CCTK_Equals(domain,"full")) {
#ifdef DEBUG_BOUND
printf(" Registered full grid symmetries for -%s- in SetCartSymmetry\n",imp_gf);
@@ -79,7 +79,7 @@ void SetCartSymmetry(cGH *GH, int *sym, const char *imp_gf) {
sGHex->GFSym[index][2] = GFSYM_NOSYM;
sGHex->GFSym[index][4] = GFSYM_NOSYM;
- } else if (CCTK_Equals(symmetry,"octant")) {
+ } else if (CCTK_Equals(domain,"octant")) {
#ifdef DEBUG_BOUND
printf(" Registered octant symmetries for -%s- in SetCartSymmetry\n",imp_gf);
@@ -89,7 +89,7 @@ void SetCartSymmetry(cGH *GH, int *sym, const char *imp_gf) {
sGHex->GFSym[index][2] = sym[1];
sGHex->GFSym[index][4] = sym[2];
- } else if (CCTK_Equals(symmetry,"quadrant")) {
+ } else if (CCTK_Equals(domain,"quadrant")) {
#ifdef DEBUG_BOUND
printf("Registered quadrant symmetries for -%s- in SetCartSymmetry\n",imp_gf);
@@ -99,7 +99,7 @@ void SetCartSymmetry(cGH *GH, int *sym, const char *imp_gf) {
sGHex->GFSym[index][2] = sym[1];
sGHex->GFSym[index][4] = GFSYM_NOSYM;
- } else if (CCTK_Equals(symmetry,"bitant")) {
+ } else if (CCTK_Equals(domain,"bitant")) {
#ifdef DEBUG_BOUND
printf("Registered bitant symmetries for -%s- in SetCartSymmetry\n",imp_gf);
@@ -154,7 +154,7 @@ void ApplySymmetry(cGH *GH, char *name) {
int doSym[6];
/* Get out if we are sure no symmetries should be applied */
- if (CCTK_Equals(symmetry,"full")) return;
+ if (CCTK_Equals(domain,"full")) return;
/* Get the pointer to the Symmetry GH extension */
sGHex = (SymmetryGHex*)GH->extensions[CCTK_GHExtensionHandle("Symmetry")];