diff options
23 files changed, 160 insertions, 337 deletions
diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc index 71798fd04..f76f5e2e5 100644 --- a/Carpet/CarpetIOASCII/src/ioascii.cc +++ b/Carpet/CarpetIOASCII/src/ioascii.cc @@ -22,7 +22,7 @@ #include "ioascii.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.9 2001/03/18 05:20:24 eschnett Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.10 2001/03/18 22:37:04 eschnett Exp $"; @@ -233,7 +233,7 @@ int CarpetIOASCII<outdim> struct stat fileinfo; if (! IOUtil_RestartFromRecovery(cgh) || stat(filename, &fileinfo)!=0) { - ofstream file(filename, ios::trunc); + ofstream file(filename, ios::out | ios::trunc); assert (file.good()); file << "# " << varname; for (int d=0; d<outdim; ++d) { diff --git a/CarpetExtra/HydroToy/interface.ccl b/CarpetExtra/HydroToy/interface.ccl index 09e8bf099..64e09a47a 100644 --- a/CarpetExtra/HydroToy/interface.ccl +++ b/CarpetExtra/HydroToy/interface.ccl @@ -1,14 +1,13 @@ # Interface definition for thorn HydroToy -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/interface.ccl,v 1.3 2001/12/07 18:27:08 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/interface.ccl,v 1.1 2001/03/18 22:37:09 eschnett Exp $ implements: hydrotoy -inherits: boundary grid public: -CCTK_REAL hydroevolve type=GF timelevels=3 +CCTK_REAL hydroevolve type=GF timelevels=2 { u vx vy vz } "The evolve hydro fields" diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par index 7a27a685e..317d16f01 100644 --- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par +++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par @@ -7,40 +7,34 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par,v 1.7 2004/03/23 12:00:04 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par,v 1.1 2001/03/18 22:37:09 eschnett Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" - -Carpet::poison_new_timelevels = yes -Carpet::check_for_poison = yes -Carpet::checksum_timelevels = yes +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy" Cactus::cctk_itlast = 60 Time::dtfac = 0.5 -driver::global_nx = 19 -driver::global_ny = 26 -driver::global_nz = 34 - -driver::ghost_size = 2 +driver::global_nx = 17 +driver::global_ny = 24 +driver::global_nz = 32 grid::type = byrange -grid::xmin = -5.4 -grid::ymin = -7.2 -grid::zmin = -9.6 -grid::xmax = 5.4 -grid::ymax = 7.8 -grid::zmax = 10.2 +grid::xmin = -4.8 +grid::ymin = -6.6 +grid::zmin = -9.0 +grid::xmax = 4.8 +grid::ymax = 7.2 +grid::zmax = 9.6 grid::mode = periodic -IO::out_dir = "hydrotoy_periodic_coarse" +IO::outdir = "hydrotoy_periodic_coarse" IOBasic::outinfo_every = 1 # 10 -IOBasic::outinfo_vars = "hydrotoy::hydroevolve" +#IOBasic::outinfo_vars = "hydrotoy::hydroevolve" -IOBasic::outScalar_every = 1 # 2 -IOBasic::outScalar_vars = "hydrotoy::hydroevolve" +#IOBasic::outScalar_every = 2 +#IOBasic::outScalar_vars = "hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" @@ -48,7 +42,6 @@ IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" IOFlexIO::out3D_every = 12 IOFlexIO::out3D_vars = "hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".vcamr" HydroToy::bound = radiation diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par index fe9ac250a..7a2c30ea4 100644 --- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par +++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par @@ -7,46 +7,36 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par,v 1.8 2004/03/23 12:00:04 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par,v 1.1 2001/03/18 22:37:09 eschnett Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" - -Carpet::poison_new_timelevels = yes -Carpet::check_for_poison = yes -Carpet::checksum_timelevels = yes +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy" Cactus::cctk_itlast = 120 Time::dtfac = 0.5 -driver::global_nx = 19 -driver::global_ny = 26 -driver::global_nz = 34 - -driver::ghost_size = 2 +driver::global_nx = 17 +driver::global_ny = 24 +driver::global_nz = 32 Carpet::max_refinement_levels = 2 -Carpet::prolongation_order_space= 3 -Carpet::prolongation_order_time = 2 - -CarpetRegrid::refinement_levels = 2 grid::type = byrange -grid::xmin = -5.4 -grid::ymin = -7.2 -grid::zmin = -9.6 -grid::xmax = 5.4 -grid::ymax = 7.8 -grid::zmax = 10.2 +grid::xmin = -4.8 +grid::ymin = -6.6 +grid::zmin = -9.0 +grid::xmax = 4.8 +grid::ymax = 7.2 +grid::zmax = 9.6 grid::mode = periodic -IO::out_dir = "hydrotoy_periodic_coarse_rl2" +IO::outdir = "hydrotoy_periodic_coarse_rl2" IOBasic::outinfo_every = 1 # 10 -IOBasic::outinfo_vars = "hydrotoy::hydroevolve" +#IOBasic::outinfo_vars = "hydrotoy::hydroevolve" -IOBasic::outScalar_every = 1 # 2 -IOBasic::outScalar_vars = "hydrotoy::hydroevolve" +#IOBasic::outScalar_every = 2 +#IOBasic::outScalar_vars = "hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" @@ -54,7 +44,6 @@ IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" IOFlexIO::out3D_every = 24 IOFlexIO::out3D_vars = "hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".vcamr" HydroToy::bound = radiation diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par index 4229b977f..f694aa369 100644 --- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par +++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par @@ -7,46 +7,36 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par,v 1.8 2004/03/23 12:00:04 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par,v 1.1 2001/03/18 22:37:09 eschnett Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" - -Carpet::poison_new_timelevels = yes -Carpet::check_for_poison = yes -Carpet::checksum_timelevels = yes +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy" Cactus::cctk_itlast = 240 Time::dtfac = 0.5 -driver::global_nx = 19 -driver::global_ny = 26 -driver::global_nz = 34 - -driver::ghost_size = 2 +driver::global_nx = 17 +driver::global_ny = 24 +driver::global_nz = 32 Carpet::max_refinement_levels = 3 -Carpet::prolongation_order_space= 3 -Carpet::prolongation_order_time = 2 - -CarpetRegrid::refinement_levels = 3 grid::type = byrange -grid::xmin = -5.4 -grid::ymin = -7.2 -grid::zmin = -9.6 -grid::xmax = 5.4 -grid::ymax = 7.8 -grid::zmax = 10.2 +grid::xmin = -4.8 +grid::ymin = -6.6 +grid::zmin = -9.0 +grid::xmax = 4.8 +grid::ymax = 7.2 +grid::zmax = 9.6 grid::mode = periodic -IO::out_dir = "hydrotoy_periodic_coarse_rl3" +IO::outdir = "hydrotoy_periodic_coarse_rl3" IOBasic::outinfo_every = 1 # 10 -IOBasic::outinfo_vars = "hydrotoy::hydroevolve" +#IOBasic::outinfo_vars = "hydrotoy::hydroevolve" -IOBasic::outScalar_every = 1 # 2 -IOBasic::outScalar_vars = "hydrotoy::hydroevolve" +#IOBasic::outScalar_every = 2 +#IOBasic::outScalar_vars = "hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" @@ -54,7 +44,6 @@ IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" IOFlexIO::out3D_every = 48 IOFlexIO::out3D_vars = "hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".vcamr" HydroToy::bound = radiation diff --git a/CarpetExtra/HydroToy/param.ccl b/CarpetExtra/HydroToy/param.ccl index d27dbef12..52ebb4665 100644 --- a/CarpetExtra/HydroToy/param.ccl +++ b/CarpetExtra/HydroToy/param.ccl @@ -1,17 +1,10 @@ # Parameter definitions for thorn HydroToy -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/param.ccl,v 1.3 2001/08/26 13:59:38 schnetter Exp $ - -restricted: - -BOOLEAN hydrotoy_active "Activate or deactivate the HydroToy thorn" -{ -} "yes" +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/param.ccl,v 1.1 2001/03/18 22:37:09 eschnett Exp $ private: KEYWORD bound "Type of boundary condition to use" { - "none" :: "No boundary condition" "flat" :: "Flat boundary condition" "radiation" :: "Radiation boundary condition" "robin" :: "Robin boundary condition" diff --git a/CarpetExtra/HydroToy/schedule.ccl b/CarpetExtra/HydroToy/schedule.ccl index 2a1e5d536..319793a1d 100644 --- a/CarpetExtra/HydroToy/schedule.ccl +++ b/CarpetExtra/HydroToy/schedule.ccl @@ -1,11 +1,7 @@ # Schedule definitions for thorn HydroToy -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/schedule.ccl,v 1.4 2003/11/05 16:18:39 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/schedule.ccl,v 1.1 2001/03/18 22:37:09 eschnett Exp $ -if (hydrotoy_active) { - - - -STORAGE: hydroevolve[3] +STORAGE: hydroevolve @@ -33,13 +29,10 @@ schedule HydroToy_EulerPredictor at EVOL SYNC: hydroevolve } "Euler predictor step" -schedule HydroToy_EulerCorrector at EVOL after HydroToy_EulerPredictor +schedule HydroToy_EulerCorrector at EVOL \ + after HydroToy_EulerPredictor { LANG: Fortran STORAGE: hydrotemps SYNC: hydroevolve } "Euler corrector step" - - - -} 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 diff --git a/CarpetExtra/HydroToy/src/InitSymBound.F77 b/CarpetExtra/HydroToy/src/InitSymBound.F77 index 20fb46456..af1ff6448 100644 --- a/CarpetExtra/HydroToy/src/InitSymBound.F77 +++ b/CarpetExtra/HydroToy/src/InitSymBound.F77 @@ -1,9 +1,8 @@ c -*-Fortran-*- -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/src/InitSymBound.F77,v 1.3 2003/11/05 16:18:39 schnetter Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/src/InitSymBound.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" subroutine HydroToy_InitSymBound (CCTK_ARGUMENTS) diff --git a/CarpetExtra/IDHydroToy/param.ccl b/CarpetExtra/IDHydroToy/param.ccl index a0fd93f5b..5e75acb70 100644 --- a/CarpetExtra/IDHydroToy/param.ccl +++ b/CarpetExtra/IDHydroToy/param.ccl @@ -1,5 +1,9 @@ # Parameter definitions for thorn IDHydroToy -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/param.ccl,v 1.2 2002/03/23 20:20:59 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/param.ccl,v 1.1 2001/03/18 22:37:10 eschnett Exp $ + +shares: grid + +USES KEYWORD type restricted: diff --git a/CarpetExtra/IDHydroToy/schedule.ccl b/CarpetExtra/IDHydroToy/schedule.ccl index c47184aab..66e867f91 100644 --- a/CarpetExtra/IDHydroToy/schedule.ccl +++ b/CarpetExtra/IDHydroToy/schedule.ccl @@ -1,5 +1,5 @@ # Schedule definitions for thorn IDHydroToy -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/schedule.ccl,v 1.3 2003/11/05 16:18:40 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/schedule.ccl,v 1.1 2001/03/18 22:37:10 eschnett Exp $ schedule IDHydroToy_Startup at STARTUP { @@ -9,5 +9,5 @@ schedule IDHydroToy_Startup at STARTUP schedule IDHydroToy_InitialData as HydroToy_InitialData at INITIAL { LANG: Fortran - STORAGE: hydrotoy::hydroevolve[3] + STORAGE: hydrotoy::hydroevolve } "Initial data for 3D wave equation" diff --git a/CarpetExtra/IDHydroToy/src/InitialData.F77 b/CarpetExtra/IDHydroToy/src/InitialData.F77 index 65f6e4e3a..7c03722ad 100644 --- a/CarpetExtra/IDHydroToy/src/InitialData.F77 +++ b/CarpetExtra/IDHydroToy/src/InitialData.F77 @@ -1,10 +1,9 @@ c -*-Fortran-*- -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/InitialData.F77,v 1.6 2003/11/05 16:18:40 schnetter Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/InitialData.F77,v 1.1 2001/03/18 22:37:10 eschnett Exp $ #include "cctk.h" -#include "cctk_Arguments.h" -#include "cctk_Functions.h" #include "cctk_Parameters.h" +#include "cctk_Arguments.h" subroutine IDHydroToy_InitialData (CCTK_ARGUMENTS) @@ -16,49 +15,25 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/Initial CCTK_REAL pi CCTK_REAL omega - CCTK_REAL dt - CCTK_REAL x,y,z, r 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) - dt = CCTK_DELTA_TIME - if (CCTK_EQUALS(initial_data,"plane")) then do k=1,cctk_lsh(3) do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) - x = cart3d_x(i,j,k) - y = cart3d_y(i,j,k) - z = cart3d_z(i,j,k) - u(i,j,k) = amplitude - $ * cos((kx*x + ky*y + kz*z + omega*cctk_time) * pi) + $ * cos((kx*cart3d_x(i,j,k) + ky*cart3d_y(i,j,k) + $ + kz*cart3d_z(i,j,k) + omega*cctk_time) * pi) vx(i,j,k) = u(i,j,k) * kx / omega vy(i,j,k) = u(i,j,k) * ky / omega vz(i,j,k) = u(i,j,k) * kz / omega - u_p(i,j,k) = amplitude - $ * cos((kx*x + ky*y + kz*z + omega*(cctk_time-dt)) * pi) - vx_p(i,j,k) = u_p(i,j,k) * kx / omega - vy_p(i,j,k) = u_p(i,j,k) * ky / omega - vz_p(i,j,k) = u_p(i,j,k) * kz / omega - - u_p_p(i,j,k) = amplitude - $ * cos((kx*x + ky*y + kz*z + omega*(cctk_time-2*dt)) * pi) - vx_p_p(i,j,k) = u_p_p(i,j,k) * kx / omega - vy_p_p(i,j,k) = u_p_p(i,j,k) * ky / omega - vz_p_p(i,j,k) = u_p_p(i,j,k) * kz / omega - end do end do end do @@ -69,45 +44,12 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/Initial do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) - x = cart3d_x(i,j,k) - y = cart3d_y(i,j,k) - z = cart3d_z(i,j,k) - r = spher3d_r(i,j,k) - u(i,j,k) = amplitude - $ * exp(- (r - radius)**2 / sigma**2) - - vr = - 2*amplitude * (r - radius) / sigma**2 - $ * exp(- (r - radius)**2 / sigma**2) - vx(i,j,k) = vr * x/r - vy(i,j,k) = vr * y/r - vz(i,j,k) = vr * z/r - - u_p(i,j,k) = amplitude/2 * (r - dt) / r - $ * exp(- (r - radius - dt)**2 / sigma**2) - $ + amplitude/2 * (r + dt) / r - $ * exp(- (r - radius + dt)**2 / sigma**2) - - vr = - amplitude/2 * (-dt / r**2 + (r - dt) * (r - radius - dt) / (r * sigma**2)) - $ * exp(- (r - radius - dt)**2 / sigma**2) - $ - amplitude/2 * ( dt / r**2 + (r + dt) * (r - radius + dt) / (r * sigma**2)) - $ * exp(- (r - radius - dt)**2 / sigma**2) - vx_p(i,j,k) = vr * x/r - vy_p(i,j,k) = vr * y/r - vz_p(i,j,k) = vr * z/r - - u_p_p(i,j,k) = amplitude/2 * (r - 2*dt) / r - $ * exp(- (r - radius - 2*dt)**2 / sigma**2) - $ + amplitude/2 * (r + 2*dt) / r - $ * exp(- (r - radius + 2*dt)**2 / sigma**2) - - vr = - amplitude/2 * (-2*dt / r**2 + (r - 2*dt) * (r - radius - 2*dt) / (r * sigma**2)) - $ * exp(- (r - radius - 2*dt)**2 / sigma**2) - $ - amplitude/2 * ( 2*dt / r**2 + (r + 2*dt) * (r - radius + 2*dt) / (r * sigma**2)) - $ * exp(- (r - radius - 2*dt)**2 / sigma**2) - vx_p_p(i,j,k) = vr * x/r - vy_p_p(i,j,k) = vr * y/r - vz_p_p(i,j,k) = vr * z/r + $ * 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) end do end do @@ -121,82 +63,31 @@ c Use kx,ky,kz as number of modes in each direction. do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) - x = cart3d_x(i,j,k) - y = cart3d_y(i,j,k) - z = cart3d_z(i,j,k) - u(i,j,k) = amplitude - $ * sin(kx * (x - 0.5d0) * pi) - $ * sin(ky * (y - 0.5d0) * pi) - $ * sin(kz * (z - 0.5d0) * pi) + $ * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) + $ * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) + $ * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) $ * cos(omega * cctk_time * pi) + vx(i,j,k) = amplitude - $ * cos(kx * (x - 0.5d0) * pi) - $ * sin(ky * (y - 0.5d0) * pi) - $ * sin(kz * (z - 0.5d0) * pi) + $ * cos(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) + $ * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) + $ * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) $ * sin(omega * cctk_time * pi) $ * kx / omega vy(i,j,k) = amplitude - $ * sin(kx * (x - 0.5d0) * pi) - $ * cos(ky * (y - 0.5d0) * pi) - $ * sin(kz * (z - 0.5d0) * pi) + $ * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) + $ * cos(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) + $ * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) $ * sin(omega * cctk_time * pi) $ * ky / omega vz(i,j,k) = amplitude - $ * sin(kx * (x - 0.5d0) * pi) - $ * sin(ky * (y - 0.5d0) * pi) - $ * cos(kz * (z - 0.5d0) * pi) + $ * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) + $ * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) + $ * cos(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) $ * sin(omega * cctk_time * pi) $ * kz / omega - u_p(i,j,k) = amplitude - $ * sin(kx * (x - 0.5d0) * pi) - $ * sin(ky * (y - 0.5d0) * pi) - $ * sin(kz * (z - 0.5d0) * pi) - $ * cos(omega * (cctk_time - dt) * pi) - vx_p(i,j,k) = amplitude - $ * cos(kx * (x - 0.5d0) * pi) - $ * sin(ky * (y - 0.5d0) * pi) - $ * sin(kz * (z - 0.5d0) * pi) - $ * sin(omega * (cctk_time - dt) * pi) - $ * kx / omega - vy_p(i,j,k) = amplitude - $ * sin(kx * (x - 0.5d0) * pi) - $ * cos(ky * (y - 0.5d0) * pi) - $ * sin(kz * (z - 0.5d0) * pi) - $ * sin(omega * (cctk_time - dt) * pi) - $ * ky / omega - vz_p(i,j,k) = amplitude - $ * sin(kx * (x - 0.5d0) * pi) - $ * sin(ky * (y - 0.5d0) * pi) - $ * cos(kz * (z - 0.5d0) * pi) - $ * sin(omega * (cctk_time - dt) * pi) - $ * kz / omega - - u_p_p(i,j,k) = amplitude - $ * sin(kx * (x - 0.5d0) * pi) - $ * sin(ky * (y - 0.5d0) * pi) - $ * sin(kz * (z - 0.5d0) * pi) - $ * cos(omega * (cctk_time - 2*dt) * pi) - vx_p_p(i,j,k) = amplitude - $ * cos(kx * (x - 0.5d0) * pi) - $ * sin(ky * (y - 0.5d0) * pi) - $ * sin(kz * (z - 0.5d0) * pi) - $ * sin(omega * (cctk_time - 2*dt) * pi) - $ * kx / omega - vy_p_p(i,j,k) = amplitude - $ * sin(kx * (x - 0.5d0) * pi) - $ * cos(ky * (y - 0.5d0) * pi) - $ * sin(kz * (z - 0.5d0) * pi) - $ * sin(omega * (cctk_time - 2*dt) * pi) - $ * ky / omega - vz_p_p(i,j,k) = amplitude - $ * sin(kx * (x - 0.5d0) * pi) - $ * sin(ky * (y - 0.5d0) * pi) - $ * cos(kz * (z - 0.5d0) * pi) - $ * sin(omega * (cctk_time - 2*dt) * pi) - $ * kz / omega - end do end do end do @@ -212,16 +103,6 @@ c Use kx,ky,kz as number of modes in each direction. vy(i,j,k) = 0 vz(i,j,k) = 0 - u_p(i,j,k) = 0 - vx_p(i,j,k) = 0 - vy_p(i,j,k) = 0 - vz_p(i,j,k) = 0 - - u_p_p(i,j,k) = 0 - vx_p_p(i,j,k) = 0 - vy_p_p(i,j,k) = 0 - vz_p_p(i,j,k) = 0 - end do end do end do diff --git a/CarpetExtra/IDHydroToy/src/make.code.defn b/CarpetExtra/IDHydroToy/src/make.code.defn index a63bda2f5..d766da22c 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.3 2003/09/20 13:47:27 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/make.code.defn,v 1.1 2001/03/18 22:37:10 eschnett Exp $ # Source files in this directory -SRCS = InitialData.F77 Startup.F77 erf.f77 gammln.f77 gammp.f77 gcf.f77 gser.f77 +SRCS = InitialData.F77 Startup.F77 # Subdirectories containing source files SUBDIRS = diff --git a/CarpetExtra/IDSpaceTimeToy/schedule.ccl b/CarpetExtra/IDSpaceTimeToy/schedule.ccl index 763983419..e4b8e2a0d 100644 --- a/CarpetExtra/IDSpaceTimeToy/schedule.ccl +++ b/CarpetExtra/IDSpaceTimeToy/schedule.ccl @@ -1,5 +1,5 @@ # Schedule definitions for thorn IDSpaceTimeToy -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/schedule.ccl,v 1.1 2001/03/17 16:05:50 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/schedule.ccl,v 1.2 2001/03/18 22:37:10 eschnett Exp $ schedule IDSpaceTimeToy_Startup at STARTUP { @@ -9,5 +9,5 @@ schedule IDSpaceTimeToy_Startup at STARTUP schedule IDSpaceTimeToy_InitialData as SpaceTimeToy_InitialData at INITIAL { LANG: Fortran - STORAGE: spacetimetoy::scalarevolve + STORAGE: spacetimetoy::spacetimeevolve } "Initial data for 3D wave equation" diff --git a/CarpetExtra/SpaceTimeToy/interface.ccl b/CarpetExtra/SpaceTimeToy/interface.ccl index 3d2a7c38c..9f89f767b 100644 --- a/CarpetExtra/SpaceTimeToy/interface.ccl +++ b/CarpetExtra/SpaceTimeToy/interface.ccl @@ -1,21 +1,20 @@ # Interface definition for thorn SpaceTimeToy -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/interface.ccl,v 1.1 2001/03/17 16:05:56 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/interface.ccl,v 1.2 2001/03/18 22:37:10 eschnett Exp $ implements: spacetimetoy -inherits: grid public: -CCTK_REAL scalarevolve type=GF timelevels=2 +CCTK_REAL spacetimeevolve type=GF timelevels=2 { phi psi -} "The evolved scalar fields" +} "The evolved spacetime fields" private: -CCTK_REAL scalartemps type=GF +CCTK_REAL spacetimetemps type=GF { phi_i psi_i } "Intermediate values for the integrator" diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par index a1b431613..6b53ae9df 100644 --- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par +++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par,v 1.2 2001/03/17 22:38:08 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par,v 1.3 2001/03/18 22:37:10 eschnett Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy" @@ -31,16 +31,16 @@ grid::mode = periodic IO::outdir = "spacetimetoy_periodic_coarse" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::scalarevolve" +#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" #IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::scalarevolve" +#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 -IOASCII::out1D_vars = "spacetimetoy::scalarevolve grid::coordinates" +IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" IOFlexIO::out3D_every = 12 -IOFlexIO::out3D_vars = "spacetimetoy::scalarevolve" +IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" IOFlexIO::out3D_format = IEEE SpaceTimeToy::icn_iterations = 2 diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par index 5754e648f..15811bce6 100644 --- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par +++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par,v 1.1 2001/03/17 22:38:46 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par,v 1.2 2001/03/18 22:37:10 eschnett Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy" @@ -33,16 +33,16 @@ grid::mode = periodic IO::outdir = "spacetimetoy_periodic_coarse_rl2" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::scalarevolve" +#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" #IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::scalarevolve" +#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 -IOASCII::out1D_vars = "spacetimetoy::scalarevolve grid::coordinates" +IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" IOFlexIO::out3D_every = 24 -IOFlexIO::out3D_vars = "spacetimetoy::scalarevolve" +IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" IOFlexIO::out3D_format = IEEE SpaceTimeToy::icn_iterations = 2 diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par index c88e28219..8f7bb474a 100644 --- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par +++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par,v 1.1 2001/03/17 22:38:46 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par,v 1.2 2001/03/18 22:37:10 eschnett Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy" @@ -33,16 +33,16 @@ grid::mode = periodic IO::outdir = "spacetimetoy_periodic_coarse_rl3" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::scalarevolve" +#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" #IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::scalarevolve" +#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 -IOASCII::out1D_vars = "spacetimetoy::scalarevolve grid::coordinates" +IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" IOFlexIO::out3D_every = 48 -IOFlexIO::out3D_vars = "spacetimetoy::scalarevolve" +IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" IOFlexIO::out3D_format = IEEE SpaceTimeToy::icn_iterations = 1 diff --git a/CarpetExtra/SpaceTimeToy/schedule.ccl b/CarpetExtra/SpaceTimeToy/schedule.ccl index 5e4c70ccd..e4fcc5457 100644 --- a/CarpetExtra/SpaceTimeToy/schedule.ccl +++ b/CarpetExtra/SpaceTimeToy/schedule.ccl @@ -1,7 +1,7 @@ # Schedule definitions for thorn SpaceTimeToy -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/schedule.ccl,v 1.1 2001/03/17 16:05:56 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/schedule.ccl,v 1.2 2001/03/18 22:37:10 eschnett Exp $ -STORAGE: scalarevolve +STORAGE: spacetimeevolve STORAGE: icn_state @@ -21,13 +21,13 @@ schedule SpaceTimeToy_InitSymBound at BASEGRID -# ICN integration +# Iterative Crank-Nicholson integration schedule SpaceTimeToy_EulerStep at EVOL { LANG: Fortran - STORAGE: scalartemps - SYNC: scalarevolve + STORAGE: spacetimetemps + SYNC: spacetimeevolve } "Initial Euler step" schedule SpaceTimeToy_ICNStep at EVOL \ @@ -35,6 +35,6 @@ schedule SpaceTimeToy_ICNStep at EVOL \ while SpaceTimeToy::do_iterate { LANG: Fortran - STORAGE: scalartemps - SYNC: scalarevolve + STORAGE: spacetimetemps + SYNC: spacetimeevolve } "One ICN step" diff --git a/CarpetExtra/SpaceTimeToy/src/InitSymBound.F77 b/CarpetExtra/SpaceTimeToy/src/InitSymBound.F77 index 99e402925..a18727adb 100644 --- a/CarpetExtra/SpaceTimeToy/src/InitSymBound.F77 +++ b/CarpetExtra/SpaceTimeToy/src/InitSymBound.F77 @@ -1,5 +1,5 @@ c -*-Fortran-*- -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/InitSymBound.F77,v 1.1 2001/03/17 16:05:56 eschnett Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/InitSymBound.F77,v 1.2 2001/03/18 22:37:10 eschnett Exp $ #include "cctk.h" #include "cctk_Arguments.h" @@ -14,11 +14,6 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/InitS DECLARE_CCTK_PARAMETERS integer ierr - integer sym(3) - - sym(1) = 1 - sym(2) = 1 - sym(3) = 1 call Cart3dSetTensorTypeVN (ierr, cctkGH, "SpaceTimeToy::phi", "scalar") call Cart3dSetTensorTypeVN (ierr, cctkGH, "SpaceTimeToy::psi", "scalar") diff --git a/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 b/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 index cc7f58ed6..1f3dbbed3 100644 --- a/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 +++ b/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 @@ -1,5 +1,5 @@ c -*-Fortran-*- -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77,v 1.1 2001/03/17 16:05:56 eschnett Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77,v 1.2 2001/03/18 22:37:10 eschnett Exp $ #include "cctk.h" #include "cctk_Parameters.h" @@ -128,24 +128,24 @@ c Evolve c Apply boundary condition if (CCTK_EQUALS(bound, "flat")) then - call BndFlatGN (ierr, cctkGH, sw, "spacetimetoy::scalarevolve") + call BndFlatGN (ierr, cctkGH, sw, "spacetimetoy::spacetimeevolve") else if (CCTK_EQUALS(bound, "zero")) then call BndScalarGN (ierr, cctkGH, zero, sw, - $ "spacetimetoy::scalarevolve") + $ "spacetimetoy::spacetimeevolve") else if (CCTK_EQUALS(bound, "radiation")) then call BndRadiativeGN (ierr, cctkGH, sw, zero, one, - $ "spacetimetoy::scalarevolve", "spacetimetoy::scalarevolve") + $ "spacetimetoy::spacetimeevolve", "spacetimetoy::spacetimeevolve") else if (CCTK_EQUALS(bound, "robin")) then call BndRobinGN (ierr, cctkGH, sw, finf, npow, - $ "spacetimetoy::scalarevolve") + $ "spacetimetoy::spacetimeevolve") else call CCTK_WARN (0, "Internal error") end if - if (ierr .lt. 0) then - call CCTK_WARN (0, "Error while applying boundary condition") - 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, "spacetimetoy::scalarevolve") + call Cart3dSymGN (ierr, cctkGH, "spacetimetoy::spacetimeevolve") if (ierr .lt. 0) then call CCTK_WARN (0, "Error while applying boundary condition") end if diff --git a/CarpetExtra/WaveToyF77/src/InitSymBound.F77 b/CarpetExtra/WaveToyF77/src/InitSymBound.F77 index 701cee60f..3e7ff7233 100644 --- a/CarpetExtra/WaveToyF77/src/InitSymBound.F77 +++ b/CarpetExtra/WaveToyF77/src/InitSymBound.F77 @@ -37,13 +37,7 @@ c -*-Fortran-*- DECLARE_CCTK_PARAMETERS integer ierr - integer sym(3) - sym(1) = 1 - sym(2) = 1 - sym(3) = 1 - - call Cart3dSetTensorTypeVN (ierr, cctkGH, - $ 'wavetoy::phi', 'SCALAR') + call Cart3dSetTensorTypeVN (ierr, cctkGH, 'wavetoy::phi', 'SCALAR') end diff --git a/CarpetExtra/WaveToyF77/src/WaveToy.F77 b/CarpetExtra/WaveToyF77/src/WaveToy.F77 index 310d15304..fd82abd2e 100644 --- a/CarpetExtra/WaveToyF77/src/WaveToy.F77 +++ b/CarpetExtra/WaveToyF77/src/WaveToy.F77 @@ -151,16 +151,16 @@ c ----------------------------------- call CCTK_WARN (0, "No boundary condition selected") end if - if (ierr .lt. 0) then - call CCTK_WARN (0, "Boundary conditions not applied - giving up!") - end if +c$$$ if (ierr .lt. 0) then +c$$$ call CCTK_WARN (0, "Boundary conditions not applied - giving up!") +c$$$ end if c Apply the symmetry boundary conditions on any coordinate axes c ------------------------------------------------------------- call Cart3dSymGN (ierr, cctkGH, "wavetoy::scalarevolve") if (ierr .lt. 0) then - call CCTK_WARN (0, "Boundary conditions not applied - giving up!") + call CCTK_WARN (0, "Symmetry conditions not applied - giving up!") end if end |