From fc0e7af205874d55377d18ffdb68555df2843d32 Mon Sep 17 00:00:00 2001 From: eschnett <> Date: Mon, 19 Mar 2001 20:30:00 +0000 Subject: small darcs-hash:20010319203034-f6438-ab6a4b4cd4ff91f151ade70f9b3e2a813ee0503b.gz --- CarpetExtra/IDHydroToy/src/InitialData.F77 | 24 +++++++++++++++++------- CarpetExtra/IDHydroToy/src/make.code.defn | 4 ++-- 2 files changed, 19 insertions(+), 9 deletions(-) (limited to 'CarpetExtra/IDHydroToy') diff --git a/CarpetExtra/IDHydroToy/src/InitialData.F77 b/CarpetExtra/IDHydroToy/src/InitialData.F77 index 7c03722ad..5bbb98032 100644 --- a/CarpetExtra/IDHydroToy/src/InitialData.F77 +++ b/CarpetExtra/IDHydroToy/src/InitialData.F77 @@ -1,5 +1,5 @@ c -*-Fortran-*- -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/InitialData.F77,v 1.1 2001/03/18 22:37:10 eschnett Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/InitialData.F77,v 1.2 2001/03/19 21:30:37 eschnett Exp $ #include "cctk.h" #include "cctk_Parameters.h" @@ -17,6 +17,11 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/Initial CCTK_REAL omega integer i,j,k + CCTK_REAL vr + + external erf + real*8 erf + pi = 4*atan(1.d0) omega = sqrt(kx**2+ky**2+kz**2) @@ -44,12 +49,17 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/Initial do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) - u(i,j,k) = amplitude - $ * exp(- (spher3d_r(i,j,k) - radius + cctk_time)**2 - $ / sigma**2) - vx(i,j,k) = u(i,j,k) * cart3d_x(i,j,k)/spher3d_r(i,j,k) - vy(i,j,k) = u(i,j,k) * cart3d_y(i,j,k)/spher3d_r(i,j,k) - vz(i,j,k) = u(i,j,k) * cart3d_z(i,j,k)/spher3d_r(i,j,k) + u(i,j,k) = amplitude / spher3d_r(i,j,k) + $ * exp(- (spher3d_r(i,j,k) - radius + cctk_time)**2 / sigma**2) + +c vr = -1/2*A*(sqrt(Pi)*sigma*erf((t-r+R)/sigma)+2*exp(-(t-r+R)^2/(sigma^2))*r)/(r^2) + vr = -0.5d0 * amplitude + $ * (sqrt(pi) * sigma * erf((cctk_time - spher3d_r(i,j,k) + radius) / sigma) + $ + 2*exp(-(cctk_time - spher3d_r(i,j,k) + radius)**2 / sigma**2) * spher3d_r(i,j,k)) + $ / spher3d_r(i,j,k)**2 + vx(i,j,k) = vr * cart3d_x(i,j,k)/spher3d_r(i,j,k) + vy(i,j,k) = vr * cart3d_y(i,j,k)/spher3d_r(i,j,k) + vz(i,j,k) = vr * cart3d_z(i,j,k)/spher3d_r(i,j,k) end do end do diff --git a/CarpetExtra/IDHydroToy/src/make.code.defn b/CarpetExtra/IDHydroToy/src/make.code.defn index d766da22c..3b82fb82f 100644 --- a/CarpetExtra/IDHydroToy/src/make.code.defn +++ b/CarpetExtra/IDHydroToy/src/make.code.defn @@ -1,8 +1,8 @@ # Main make.code.defn file for thorn IDHydroToy -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/make.code.defn,v 1.1 2001/03/18 22:37:10 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/make.code.defn,v 1.2 2001/03/19 21:30:37 eschnett Exp $ # Source files in this directory -SRCS = InitialData.F77 Startup.F77 +SRCS = InitialData.F77 Startup.F77 erf.f gammln.f gammp.f gcf.f gser.f # Subdirectories containing source files SUBDIRS = -- cgit v1.2.3