From fe95a28c05f6ebc0f534a54e8fb91a3e7294b5e3 Mon Sep 17 00:00:00 2001 From: Thomas Radke Date: Tue, 28 Nov 2006 12:20:00 +0000 Subject: IDScalarWaveFO: converted initialdata.F77 to initialdata.F90 The source file initialdata.F77 calls a standard Fortran90 routine random_number(). darcs-hash:20061128122009-776a0-ff7fd11962d1c4582ce0995e2fdd0c41038e619e.gz --- CarpetExtra/IDScalarWaveFO/src/initialdata.F77 | 61 -------------------------- CarpetExtra/IDScalarWaveFO/src/initialdata.F90 | 61 ++++++++++++++++++++++++++ CarpetExtra/IDScalarWaveFO/src/make.code.defn | 2 +- 3 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 CarpetExtra/IDScalarWaveFO/src/initialdata.F77 create mode 100644 CarpetExtra/IDScalarWaveFO/src/initialdata.F90 (limited to 'CarpetExtra') diff --git a/CarpetExtra/IDScalarWaveFO/src/initialdata.F77 b/CarpetExtra/IDScalarWaveFO/src/initialdata.F77 deleted file mode 100644 index f26748edb..000000000 --- a/CarpetExtra/IDScalarWaveFO/src/initialdata.F77 +++ /dev/null @@ -1,61 +0,0 @@ -c $Header:$ - -#include "cctk.h" -#include "cctk_Arguments.h" -#include "cctk_Functions.h" -#include "cctk_Parameters.h" - - subroutine IDScalarWaveFO_InitialData (CCTK_ARGUMENTS) - implicit none - DECLARE_CCTK_ARGUMENTS - DECLARE_CCTK_FUNCTIONS - DECLARE_CCTK_PARAMETERS - CCTK_REAL pi - parameter (pi = 3.141592653589793238462643383279502884197169399375105820974944592307816406286208998628034825342117068d0) - CCTK_REAL omega - integer i, j, k - - if (CCTK_EQUALS(initial_data, "plane")) then - omega = sqrt(wave_number(1)**2 + wave_number(2)**2 + wave_number(3)**2) - do k=1,cctk_lsh(3) - do j=1,cctk_lsh(2) - do i=1,cctk_lsh(1) - phi(i,j,k) = amplitude * cos (2*pi * - $ ( wave_number(1)*(x(i,j,k)-phase_offset(1)) - $ + wave_number(2)*(y(i,j,k)-phase_offset(2)) - $ + wave_number(3)*(z(i,j,k)-phase_offset(3)) - $ + omega*(cctk_time-time_offset))) - psix(i,j,k) = amplitude * wave_number(1) / omega * cos (2*pi * - $ ( wave_number(1)*(x(i,j,k)-phase_offset(1)) - $ + wave_number(2)*(y(i,j,k)-phase_offset(2)) - $ + wave_number(3)*(z(i,j,k)-phase_offset(3)) - $ + omega*(cctk_time-time_offset))) - psiy(i,j,k) = amplitude * wave_number(2) / omega * cos (2*pi * - $ ( wave_number(1)*(x(i,j,k)-phase_offset(1)) - $ + wave_number(2)*(y(i,j,k)-phase_offset(2)) - $ + wave_number(3)*(z(i,j,k)-phase_offset(3)) - $ + omega*(cctk_time-time_offset))) - psiz(i,j,k) = amplitude * wave_number(3) / omega * cos (2*pi * - $ ( wave_number(1)*(x(i,j,k)-phase_offset(1)) - $ + wave_number(2)*(y(i,j,k)-phase_offset(2)) - $ + wave_number(3)*(z(i,j,k)-phase_offset(3)) - $ + omega*(cctk_time-time_offset))) - end do - end do - end do - - else if (CCTK_EQUALS(initial_data, "noise")) then - - do k=1,cctk_lsh(3) - do j=1,cctk_lsh(2) - do i=1,cctk_lsh(1) - call random_number (phi(i,j,k)) - call random_number (psix(i,j,k)) - call random_number (psiy(i,j,k)) - call random_number (psiz(i,j,k)) - end do - end do - end do - - end if - end diff --git a/CarpetExtra/IDScalarWaveFO/src/initialdata.F90 b/CarpetExtra/IDScalarWaveFO/src/initialdata.F90 new file mode 100644 index 000000000..3530fdfbc --- /dev/null +++ b/CarpetExtra/IDScalarWaveFO/src/initialdata.F90 @@ -0,0 +1,61 @@ +! $Header:$ + +#include "cctk.h" +#include "cctk_Arguments.h" +#include "cctk_Functions.h" +#include "cctk_Parameters.h" + + subroutine IDScalarWaveFO_InitialData (CCTK_ARGUMENTS) + implicit none + DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_FUNCTIONS + DECLARE_CCTK_PARAMETERS + CCTK_REAL pi + parameter (pi = 3.141592653589793238462643383279502884197169399375105820974944592307816406286208998628034825342117068d0) + CCTK_REAL omega + integer i, j, k + + if (CCTK_EQUALS(initial_data, "plane")) then + omega = sqrt(wave_number(1)**2 + wave_number(2)**2 + wave_number(3)**2) + do k=1,cctk_lsh(3) + do j=1,cctk_lsh(2) + do i=1,cctk_lsh(1) + phi(i,j,k) = amplitude * cos (2*pi * & + ( wave_number(1)*(x(i,j,k)-phase_offset(1)) & + + wave_number(2)*(y(i,j,k)-phase_offset(2)) & + + wave_number(3)*(z(i,j,k)-phase_offset(3)) & + + omega*(cctk_time-time_offset))) + psix(i,j,k) = amplitude * wave_number(1) / omega * cos (2*pi * & + ( wave_number(1)*(x(i,j,k)-phase_offset(1)) & + + wave_number(2)*(y(i,j,k)-phase_offset(2)) & + + wave_number(3)*(z(i,j,k)-phase_offset(3)) & + + omega*(cctk_time-time_offset))) + psiy(i,j,k) = amplitude * wave_number(2) / omega * cos (2*pi * & + ( wave_number(1)*(x(i,j,k)-phase_offset(1)) & + + wave_number(2)*(y(i,j,k)-phase_offset(2)) & + + wave_number(3)*(z(i,j,k)-phase_offset(3)) & + + omega*(cctk_time-time_offset))) + psiz(i,j,k) = amplitude * wave_number(3) / omega * cos (2*pi * & + ( wave_number(1)*(x(i,j,k)-phase_offset(1)) & + + wave_number(2)*(y(i,j,k)-phase_offset(2)) & + + wave_number(3)*(z(i,j,k)-phase_offset(3)) & + + omega*(cctk_time-time_offset))) + end do + end do + end do + + else if (CCTK_EQUALS(initial_data, "noise")) then + + do k=1,cctk_lsh(3) + do j=1,cctk_lsh(2) + do i=1,cctk_lsh(1) + call random_number (phi(i,j,k)) + call random_number (psix(i,j,k)) + call random_number (psiy(i,j,k)) + call random_number (psiz(i,j,k)) + end do + end do + end do + + end if + end diff --git a/CarpetExtra/IDScalarWaveFO/src/make.code.defn b/CarpetExtra/IDScalarWaveFO/src/make.code.defn index 0b76607cc..7d0fcf962 100644 --- a/CarpetExtra/IDScalarWaveFO/src/make.code.defn +++ b/CarpetExtra/IDScalarWaveFO/src/make.code.defn @@ -2,7 +2,7 @@ # $Header:$ # Source files in this directory -SRCS = initialdata.F77 +SRCS = initialdata.F90 # Subdirectories containing source files SUBDIRS = -- cgit v1.2.3