From d3ae8e4b27664bbc9210fa49f58ceffe4336f7c1 Mon Sep 17 00:00:00 2001 From: eschnett <> Date: Sun, 18 Mar 2001 21:37:00 +0000 Subject: Added HydroToy, the counterpart of SpaceTimeToy. darcs-hash:20010318213704-f6438-25fa67cf10277b9aed6ee4c2addb1899ad6e21c7.gz --- CarpetExtra/SpaceTimeToy/interface.ccl | 9 ++++----- .../SpaceTimeToy/par/spacetimetoy_periodic_coarse.par | 10 +++++----- .../par/spacetimetoy_periodic_coarse_rl2.par | 10 +++++----- .../par/spacetimetoy_periodic_coarse_rl3.par | 10 +++++----- CarpetExtra/SpaceTimeToy/schedule.ccl | 14 +++++++------- CarpetExtra/SpaceTimeToy/src/InitSymBound.F77 | 7 +------ CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 | 18 +++++++++--------- 7 files changed, 36 insertions(+), 42 deletions(-) (limited to 'CarpetExtra/SpaceTimeToy') 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 -- cgit v1.2.3