diff options
Diffstat (limited to 'CarpetAttic/Cart3dTest/src/Initial.c')
| -rw-r--r-- | CarpetAttic/Cart3dTest/src/Initial.c | 55 |
1 files changed, 25 insertions, 30 deletions
diff --git a/CarpetAttic/Cart3dTest/src/Initial.c b/CarpetAttic/Cart3dTest/src/Initial.c index 123da0ec2..f88c25b28 100644 --- a/CarpetAttic/Cart3dTest/src/Initial.c +++ b/CarpetAttic/Cart3dTest/src/Initial.c @@ -6,7 +6,7 @@ #include "cctk_Arguments.h" #include "cctk_Parameters.h" -#include "Symmetry.h" +#include "AlphaThorns/Cart3d/src/Cart3d.h" @@ -17,6 +17,7 @@ int Cart3dTest_Initial (CCTK_ARGUMENTS) int r; int i,j,k; + int ind; int vi[9]; @@ -79,42 +80,36 @@ int Cart3dTest_Initial (CCTK_ARGUMENTS) for (j=0; j<cctk_lsh[1]; ++j) { for (i=0; i<cctk_lsh[0]; ++i) { - const int ii = cctk_lbnd[0] + i; - const int jj = cctk_lbnd[1] + j; - const int kk = cctk_lbnd[2] + k; - - const int ind = CCTK_GFINDEX3D(cctkGH, i,j,k); - - + ind = CCTK_GFINDEX3D(cctkGH, i,j,k); /* store the position in the components */ - s[ind] = (( 1 * 100 + ii) * 100 + jj) * 100 + kk; + s[ind] = (( 1 * 100 + i) * 100 + j) * 100 + k; - vx[ind] = ((11 * 100 + ii) * 100 + jj) * 100 + kk; - vy[ind] = ((12 * 100 + ii) * 100 + jj) * 100 + kk; - vz[ind] = ((13 * 100 + ii) * 100 + jj) * 100 + kk; + vx[ind] = ((11 * 100 + i) * 100 + j) * 100 + k; + vy[ind] = ((12 * 100 + i) * 100 + j) * 100 + k; + vz[ind] = ((13 * 100 + i) * 100 + j) * 100 + k; - txx[ind] = ((21 * 100 + ii) * 100 + jj) * 100 + kk; - txy[ind] = ((22 * 100 + ii) * 100 + jj) * 100 + kk; - txz[ind] = ((23 * 100 + ii) * 100 + jj) * 100 + kk; - tyy[ind] = ((24 * 100 + ii) * 100 + jj) * 100 + kk; - tyz[ind] = ((25 * 100 + ii) * 100 + jj) * 100 + kk; - tzz[ind] = ((26 * 100 + ii) * 100 + jj) * 100 + kk; + txx[ind] = ((21 * 100 + i) * 100 + j) * 100 + k; + txy[ind] = ((22 * 100 + i) * 100 + j) * 100 + k; + txz[ind] = ((23 * 100 + i) * 100 + j) * 100 + k; + tyy[ind] = ((24 * 100 + i) * 100 + j) * 100 + k; + tyz[ind] = ((25 * 100 + i) * 100 + j) * 100 + k; + tzz[ind] = ((26 * 100 + i) * 100 + j) * 100 + k; - ax[ind] = ((31 * 100 + ii) * 100 + jj) * 100 + kk; - ay[ind] = ((32 * 100 + ii) * 100 + jj) * 100 + kk; - az[ind] = ((33 * 100 + ii) * 100 + jj) * 100 + kk; + ax[ind] = ((31 * 100 + i) * 100 + j) * 100 + k; + ay[ind] = ((32 * 100 + i) * 100 + j) * 100 + k; + az[ind] = ((33 * 100 + i) * 100 + j) * 100 + k; - fxx[ind] = ((41 * 100 + ii) * 100 + jj) * 100 + kk; - fxy[ind] = ((42 * 100 + ii) * 100 + jj) * 100 + kk; - fxz[ind] = ((43 * 100 + ii) * 100 + jj) * 100 + kk; - fyx[ind] = ((44 * 100 + ii) * 100 + jj) * 100 + kk; - fyy[ind] = ((45 * 100 + ii) * 100 + jj) * 100 + kk; - fyz[ind] = ((46 * 100 + ii) * 100 + jj) * 100 + kk; - fzx[ind] = ((47 * 100 + ii) * 100 + jj) * 100 + kk; - fzy[ind] = ((48 * 100 + ii) * 100 + jj) * 100 + kk; - fzz[ind] = ((49 * 100 + ii) * 100 + jj) * 100 + kk; + fxx[ind] = ((41 * 100 + i) * 100 + j) * 100 + k; + fxy[ind] = ((42 * 100 + i) * 100 + j) * 100 + k; + fxz[ind] = ((43 * 100 + i) * 100 + j) * 100 + k; + fyx[ind] = ((44 * 100 + i) * 100 + j) * 100 + k; + fyy[ind] = ((45 * 100 + i) * 100 + j) * 100 + k; + fyz[ind] = ((46 * 100 + i) * 100 + j) * 100 + k; + fzx[ind] = ((47 * 100 + i) * 100 + j) * 100 + k; + fzy[ind] = ((48 * 100 + i) * 100 + j) * 100 + k; + fzz[ind] = ((49 * 100 + i) * 100 + j) * 100 + k; } } |