diff options
| author | allen <allen@5c0f84ea-6048-4d6e-bfa4-55cd5f2e0dd7> | 2002-05-07 18:16:43 +0000 |
|---|---|---|
| committer | allen <allen@5c0f84ea-6048-4d6e-bfa4-55cd5f2e0dd7> | 2002-05-07 18:16:43 +0000 |
| commit | cb9ca52478f6ffccd3e469fc727eacf44f7254f5 (patch) | |
| tree | 0ac8edd4c2dbb20d93bcca7c56146eaaaafc53cc | |
| parent | b8b85345849a032ab181881101ab73741b9ba411 (diff) | |
change routine names to avoid clashes
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDLinearWaves/trunk@72 5c0f84ea-6048-4d6e-bfa4-55cd5f2e0dd7
| -rw-r--r-- | src/planewaves.F77 | 9 | ||||
| -rw-r--r-- | src/teukwaves.F77 | 11 |
2 files changed, 5 insertions, 15 deletions
diff --git a/src/planewaves.F77 b/src/planewaves.F77 index 880ff58..4a40688 100644 --- a/src/planewaves.F77 +++ b/src/planewaves.F77 @@ -13,7 +13,7 @@ @@*/ /*@@ - @routine planewaves + @routine IDLinearWaves_PlaneWaves @date Mon Jan 29 11:57:00 1996 @author Malcolm Tobias + Joan Masso @desc @@ -39,7 +39,8 @@ #include "cctk_Parameters.h" - subroutine planewaves(CCTK_ARGUMENTS) + subroutine IDLinearWaves_PlaneWaves(CCTK_ARGUMENTS) + implicit none DECLARE_CCTK_ARGUMENTS @@ -53,7 +54,6 @@ CCTK_REAL kxp,kyp,kzp,wp CHARACTER*200 infoline -c local arrays (scalars! Man, what a sweat!) CCTK_REAL plus,minus,plusp,minusp,ain,aout INTEGER i,j,k @@ -64,9 +64,6 @@ c local arrays (scalars! Man, what a sweat!) c Wave characteristics -c amplitude is declared by DECLARE_PARAMETER, for all other parameters -c we stick to the naming in the cactus3.2.0 version of cactus - c wavecentering ra = wavecenter diff --git a/src/teukwaves.F77 b/src/teukwaves.F77 index b596294..444ea56 100644 --- a/src/teukwaves.F77 +++ b/src/teukwaves.F77 @@ -13,7 +13,7 @@ @@*/ /*@@ - @routine teukwaves + @routine IDLinearWaves_TeukWaves @date Jan 96 @author Malcolm Tobias + Joan Masso @desc @@ -28,7 +28,7 @@ @enddesc @@*/ - subroutine teukwaves(CCTK_ARGUMENTS) + subroutine IDLinearWaves_TeukWaves(CCTK_ARGUMENTS) implicit none DECLARE_CCTK_ARGUMENTS @@ -63,8 +63,6 @@ c from old spheretocart DECLARE_CCTK_PARAMETERS -cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc - pi = 3.14159265358979 kappa = sqrt(143.0d0/pi)/12288.0d0 @@ -72,11 +70,6 @@ cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc call CCTK_WARN(0,"Teukwaves: wavecenter must be zero for time symmetry") endif -c CACTUS 4.0: all REAL/INTEGER parameter are available as variables and -c need not be derived from the database. Nevertheless I will assign -c the parameter variables to the variables of CAC3.0, to allow for -c easy portation (wavepulse stays wavepulse btw). (GERD) - amp = amplitude m = mvalue wave = wavelength |