From e325a404946e773b7f8675c2bcd14b29d4c8921b Mon Sep 17 00:00:00 2001 From: tradke Date: Thu, 31 Aug 2006 09:33:19 +0000 Subject: Fixed non-conformant F77 code: remove trailing semicolons, use the '.eq.' comparison operator instead of '=='. While g77 and the Intel compiler apparently ignore the problem, the Portland compiler stops with an error. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDLinearWaves/trunk@96 5c0f84ea-6048-4d6e-bfa4-55cd5f2e0dd7 --- src/planewaves.F77 | 4 ++-- src/teukwaves.F77 | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/planewaves.F77 b/src/planewaves.F77 index e33ece2..317c645 100644 --- a/src/planewaves.F77 +++ b/src/planewaves.F77 @@ -231,10 +231,10 @@ c Check if we should create and store conformal factor stuff */ if(CCTK_EQUALS(conformal_storage,"factor+derivs")) then - conformal_state = 2; + conformal_state = 2 else if(CCTK_EQUALS(conformal_storage,"factor+derivs+2nd derivs")) then - conformal_state = 3; + conformal_state = 3 end if do k=1,cctk_lsh(3) diff --git a/src/teukwaves.F77 b/src/teukwaves.F77 index 444ea56..a7a365f 100644 --- a/src/teukwaves.F77 +++ b/src/teukwaves.F77 @@ -78,17 +78,17 @@ c from old spheretocart c to be consistent with Evans & Abrahams, rescale the amplitude c by kappa, because they use that in the packet and c 4/3 because they use I not Teuk. F - if (CCTK_Equals(packet,'eppley') == 1) then + if (CCTK_Equals(packet,'eppley') .eq. 1) then ipacket = 1 call CCTK_INFO('Teukolsky Packet = eppley') - elseif (CCTK_Equals(packet,'evans') == 1) then + elseif (CCTK_Equals(packet,'evans') .eq. 1) then ipacket = 2 call CCTK_INFO('Teukolsky Packet = evans') c to be consistent with Evans & Abrahams, rescale the amplitude c by kappa, because they use that in the packet and c 4/3 because they use I not Teuk. F amp = amp*(4.0d0/3.0d0)*kappa - elseif (CCTK_Equals(packet,'square') == 1) then + elseif (CCTK_Equals(packet,'square') .eq. 1) then ipacket = 3 call CCTK_INFO('Teukolsky Packet = square') end if @@ -106,21 +106,21 @@ c 4/3 because they use I not Teuk. F & ' wavelength = ',wave call CCTK_INFO(infoline) - if (CCTK_Equals(parity,'even') == 1) then + if (CCTK_Equals(parity,'even') .eq. 1) then iparity = 0 - elseif (CCTK_Equals(parity,'odd') == 1) then + elseif (CCTK_Equals(parity,'odd') .eq. 1) then iparity = 1 endif - if(CCTK_Equals(wavesgoing,'in') == 1) then + if(CCTK_Equals(wavesgoing,'in') .eq. 1) then ingoing = 1 endif - if(CCTK_Equals(wavesgoing,'out') == 1) then + if(CCTK_Equals(wavesgoing,'out') .eq. 1) then outgoing = 1 endif - if(CCTK_Equals(wavesgoing,'both') == 1) then + if(CCTK_Equals(wavesgoing,'both') .eq. 1) then ingoing = 1 outgoing = 1 endif @@ -566,10 +566,10 @@ c Check if we should create and store conformal factor stuff */ if(CCTK_EQUALS(conformal_storage,"factor+derivs")) then - conformal_state = 2; + conformal_state = 2 else if(CCTK_EQUALS(conformal_storage,"factor+derivs+2nd derivs")) then - conformal_state = 3; + conformal_state = 3 end if do k=1,cctk_lsh(3) -- cgit v1.2.3