diff options
Diffstat (limited to 'CarpetExtra/HydroToy/src/HydroToy.F77')
| -rw-r--r-- | CarpetExtra/HydroToy/src/HydroToy.F77 | 67 |
1 files changed, 31 insertions, 36 deletions
diff --git a/CarpetExtra/HydroToy/src/HydroToy.F77 b/CarpetExtra/HydroToy/src/HydroToy.F77 index 559f66497..890c9a0a3 100644 --- a/CarpetExtra/HydroToy/src/HydroToy.F77 +++ b/CarpetExtra/HydroToy/src/HydroToy.F77 @@ -1,10 +1,9 @@ c -*-Fortran-*- -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/src/HydroToy.F77,v 1.7 2003/11/05 16:18:39 schnetter Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/src/HydroToy.F77,v 1.1 2001/03/18 22:37:09 eschnett Exp $ #include "cctk.h" -#include "cctk_Arguments.h" -#include "cctk_Functions.h" #include "cctk_Parameters.h" +#include "cctk_Arguments.h" @@ -23,10 +22,10 @@ c Copy do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) - u_i(i,j,k) = u_p(i,j,k) - vx_i(i,j,k) = vx_p(i,j,k) - vy_i(i,j,k) = vy_p(i,j,k) - vz_i(i,j,k) = vz_p(i,j,k) + u_i(i,j,k) = u(i,j,k) + vx_i(i,j,k) = vx(i,j,k) + vy_i(i,j,k) = vy(i,j,k) + vz_i(i,j,k) = vz(i,j,k) end do end do @@ -60,10 +59,10 @@ c Copy do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) - u_i(i,j,k) = u(i,j,k) - vx_i(i,j,k) = vx(i,j,k) - vy_i(i,j,k) = vy(i,j,k) - vz_i(i,j,k) = vz(i,j,k) + u_i(i,j,k) = u_n(i,j,k) + vx_i(i,j,k) = vx_n(i,j,k) + vy_i(i,j,k) = vy_n(i,j,k) + vz_i(i,j,k) = vz_n(i,j,k) end do end do @@ -77,10 +76,10 @@ c Average do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) - u(i,j,k) = half * (u_p(i,j,k) + u(i,j,k)) - vx(i,j,k) = half * (vx_p(i,j,k) + vx(i,j,k)) - vy(i,j,k) = half * (vy_p(i,j,k) + vy(i,j,k)) - vz(i,j,k) = half * (vz_p(i,j,k) + vz(i,j,k)) + u_n(i,j,k) = half * (u(i,j,k) + u_n(i,j,k)) + vx_n(i,j,k) = half * (vx(i,j,k) + vx_n(i,j,k)) + vy_n(i,j,k) = half * (vy(i,j,k) + vy_n(i,j,k)) + vz_n(i,j,k) = half * (vz(i,j,k) + vz_n(i,j,k)) end do end do @@ -110,20 +109,20 @@ c Apply boundaries dt = CCTK_DELTA_TIME c Evolve - do k=1+cctk_nghostzones(3),cctk_lsh(3)-cctk_nghostzones(3) - do j=1+cctk_nghostzones(2),cctk_lsh(2)-cctk_nghostzones(2) - do i=1+cctk_nghostzones(1),cctk_lsh(1)-cctk_nghostzones(1) + do k=1,cctk_lsh(3) + do j=1,cctk_lsh(2) + do i=1,cctk_lsh(1) - u(i,j,k) = u_i(i,j,k) + u_n(i,j,k) = u_i(i,j,k) $ + dt * (vx_i(i+1,j,k) - vx_i(i-1,j,k)) / (2*dx) $ + dt * (vy_i(i,j+1,k) - vy_i(i,j-1,k)) / (2*dy) $ + dt * (vz_i(i,j,k+1) - vz_i(i,j,k-1)) / (2*dz) - vx(i,j,k) = vx_i(i,j,k) + vx_n(i,j,k) = vx_i(i,j,k) $ + dt * (u_i(i+1,j,k) - u_i(i-1,j,k)) / (2*dx) - vy(i,j,k) = vy_i(i,j,k) + vy_n(i,j,k) = vy_i(i,j,k) $ + dt * (u_i(i,j+1,k) - u_i(i,j-1,k)) / (2*dy) - vz(i,j,k) = vz_i(i,j,k) + vz_n(i,j,k) = vz_i(i,j,k) $ + dt * (u_i(i,j,k+1) - u_i(i,j,k-1)) / (2*dz) end do @@ -145,23 +144,21 @@ c Evolve CCTK_REAL zero, one parameter (zero=0, one=1) - CCTK_REAL finf - parameter (finf=1) - integer npow - parameter (npow=1) + CCTK_REAL finf, npow + parameter (finf=1, npow=1) integer sw(3) integer ierr - sw(1) = cctk_nghostzones(1) - sw(2) = cctk_nghostzones(2) - sw(3) = cctk_nghostzones(3) + sw(1) = 1 + sw(2) = 1 + sw(3) = 1 c Apply boundary condition if (CCTK_EQUALS(bound, "flat")) then call BndFlatGN (ierr, cctkGH, sw, "hydrotoy::hydroevolve") else if (CCTK_EQUALS(bound, "zero")) then - call BndScalarGN (ierr, cctkGH, sw, zero, + call BndScalarGN (ierr, cctkGH, zero, sw, $ "hydrotoy::hydroevolve") else if (CCTK_EQUALS(bound, "radiation")) then call BndRadiativeGN (ierr, cctkGH, sw, zero, one, @@ -169,14 +166,12 @@ c Apply boundary condition else if (CCTK_EQUALS(bound, "robin")) then call BndRobinGN (ierr, cctkGH, sw, finf, npow, $ "hydrotoy::hydroevolve") - else if (CCTK_EQUALS(bound, "none")) then - ierr = 0 else - call CCTK_WARN (0, "internal error") - end if - if (ierr .lt. 0) then - call CCTK_WARN (0, "Error while applying boundary condition") + call CCTK_WARN (0, "Internal error") end if +c$$$ if (ierr .lt. 0) then +c$$$ call CCTK_WARN (0, "Error while applying boundary condition") +c$$$ end if call Cart3dSymGN (ierr, cctkGH, "hydrotoy::hydroevolve") if (ierr .lt. 0) then |