From 579ce927a7243c569a734ce796845783487aaefd Mon Sep 17 00:00:00 2001 From: allen Date: Wed, 31 Mar 1999 16:04:30 +0000 Subject: Some bug fixes ... but still getting a compilation error (on irix) in LinearWaves.F, it seems like two parameters are being given the same alias name. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDLinearWaves/trunk@8 5c0f84ea-6048-4d6e-bfa4-55cd5f2e0dd7 --- src/LinearWaves.F | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/LinearWaves.F b/src/LinearWaves.F index c0dc44e..c15a196 100644 --- a/src/LinearWaves.F +++ b/src/LinearWaves.F @@ -7,9 +7,6 @@ c Driver for the analytical (or almost) linear wave models c @enddesc c@@*/ -c Note that including cactus.h will also include linearWaves.h -#include "cactus.h" - c/*@@ c @routine linearWaves c @date @@ -31,28 +28,33 @@ c@@*/ #include "declare_parameters.h" subroutine linearWaves(CCTK_FARGUMENTS) + implicit none DECLARE_CCTK_FARGUMENTS - DECLARE_PARMETERS + DECLARE_PARAMETERS + integer CCTK_Equals c Call the Teukolsky wave init routine - if ((CCTK_Equals(initial_data,'teukwaves').eq.1) then + if (CCTK_Equals(initial_data,'teukwaves').eq.1) then + call teukwaves(CCTK_FARGUMENTS) c at this point CACTUS 3.2.0 has the following calls c #ifdef BMUTIL call metricderiv c #ifdef BONAMASSO: vxyz=0; call vectorini; - elseif (CCTK_Equals(initial_data,'planewaves')) then + elseif (CCTK_Equals(initial_data,'planewaves') == 1) then + call planewaves(CCTK_FARGUMENTS) c at this point CACTUS 3.2.0 has the following calls c #ifdef BMUTIL call vectorini; else - CCTK_Warn(0,"Thorn linearWaves: model initialization failed"); + + call CCTK_Warn(0,"Thorn linearWaves: model initialization failed"); endif return -- cgit v1.2.3