diff options
| author | allen <allen@5c0f84ea-6048-4d6e-bfa4-55cd5f2e0dd7> | 1999-06-25 17:09:04 +0000 |
|---|---|---|
| committer | allen <allen@5c0f84ea-6048-4d6e-bfa4-55cd5f2e0dd7> | 1999-06-25 17:09:04 +0000 |
| commit | 40c56ceb52068dbe831fa9723fc32e6957ec1154 (patch) | |
| tree | 4f6592d767f1e6f41873b76b9cf81ae697f85319 /src | |
| parent | 02288ab35f484eebd60602e6956a49b63c302213 (diff) | |
Implementing new naming convention for variables on the cGH. See cGH.h for
details.
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDLinearWaves/trunk@16 5c0f84ea-6048-4d6e-bfa4-55cd5f2e0dd7
Diffstat (limited to 'src')
| -rw-r--r-- | src/planewaves.F | 16 | ||||
| -rw-r--r-- | src/teukwaves.F | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/planewaves.F b/src/planewaves.F index ca9ed34..83221e4 100644 --- a/src/planewaves.F +++ b/src/planewaves.F @@ -38,7 +38,7 @@ #include "declare_arguments.h" #include "declare_parameters.h" c Using macro definitions from Einstein -#include "../../packages/CactusEinstein/Einstein/src/Einstein.h" +#include "CactusEinstein/Einstein/src/Einstein.h" subroutine planewaves(CCTK_FARGUMENTS) @@ -112,14 +112,14 @@ c precalc wp = (kxp*kxp+kyp*kyp+kzp*kzp)**0.5 c *************** plane waves ******************** - do k=1,sh(3) - do j=1,sh(2) - do i=1,sh(1) - plus = (kx*x(i,j,k)+ky*y(i,j,k)+kz*z(i,j,k)+w*time) - minus = (kx*x(i,j,k)+ky*y(i,j,k)+kz*z(i,j,k)-w*time) + do k=1,cctk_lsh(3) + do j=1,cctk_lsh(2) + do i=1,cctk_lsh(1) + plus = (kx*x(i,j,k)+ky*y(i,j,k)+kz*z(i,j,k)+w*cctk_time) + minus = (kx*x(i,j,k)+ky*y(i,j,k)+kz*z(i,j,k)-w*cctk_time) - plusp =(kxp*x(i,j,k)+kyp*y(i,j,k)+kzp*z(i,j,k)+wp*(time-ra)) - minusp =(kxp*x(i,j,k)+kyp*y(i,j,k)+kzp*z(i,j,k)-wp*(time-ra)) + plusp =(kxp*x(i,j,k)+kyp*y(i,j,k)+kzp*z(i,j,k)+wp*(cctk_time-ra)) + minusp =(kxp*x(i,j,k)+kyp*y(i,j,k)+kzp*z(i,j,k)-wp*(cctk_time-ra)) ain = iin*amplitude*cos(plus)*exp(-(plusp)**2) aout = iout*amplitude*cos(minus)*exp(-(minusp)**2) diff --git a/src/teukwaves.F b/src/teukwaves.F index add3423..bf38e69 100644 --- a/src/teukwaves.F +++ b/src/teukwaves.F @@ -2,7 +2,7 @@ #include "declare_arguments.h" #include "declare_parameters.h" c Using macro definitions from Einstein -#include "../../packages/CactusEinstein/Einstein/src/Einstein.h" +#include "CactusEinstein/Einstein/src/Einstein.h" /*@@ @@ -150,17 +150,17 @@ c 4/3 because they use I not Teuk. F c **************************************** c initial data for teukolsky waves c **************************************** - do k=1,sh(3) - do j=1,sh(2) - do i=1,sh(1) + do k=1,cctk_lsh(3) + do j=1,cctk_lsh(2) + do i=1,cctk_lsh(1) xp = x(i,j,k) yp = y(i,j,k) zp = z(i,j,k) rp = r(i,j,k) - teuk_tp = (time+rp-ra) - teuk_tn = (time-rp+ra) + teuk_tp = (cctk_time+rp-ra) + teuk_tn = (cctk_time-rp+ra) tp2 = teuk_tp**2 tn2 = teuk_tn**2 @@ -184,7 +184,7 @@ c eppley package --> x exp(-x^2) if (ipacket.eq.1) then c to keep the analytic solution valid for the eppley packet: if (ra.ne.0.and.ingoing.eq.1.and.outgoing.eq.1) then - teuk_tn = (time-rp-ra) + teuk_tn = (cctk_time-rp-ra) tn2 = teuk_tn**2 endif |