diff options
22 files changed, 45 insertions, 44 deletions
diff --git a/Carpet/Carpet/options/carpet-lilypond-gcc3 b/Carpet/Carpet/options/carpet-lilypond-gcc3 index 87b2dfa8f..d620e30bd 100644 --- a/Carpet/Carpet/options/carpet-lilypond-gcc3 +++ b/Carpet/Carpet/options/carpet-lilypond-gcc3 @@ -1,7 +1,6 @@ -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/Attic/carpet-lilypond-gcc3,v 1.3 2002/01/01 16:48:28 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/Attic/carpet-lilypond-gcc3,v 1.4 2002/03/06 17:47:57 schnetter Exp $ -#CPP = /home/eschnett/gcc/bin/cpp -traditional -DTMPL_EXPLICIT -DCARPET_REAL -CPP = cpp -traditional -DTMPL_EXPLICIT -DCARPET_REAL +CPP = /home/eschnett/gcc/bin/cpp -traditional -DTMPL_EXPLICIT -DCARPET_REAL CC = /home/eschnett/gcc/bin/gcc CXX = /home/eschnett/gcc/bin/g++ F77 = /home/eschnett/gcc/bin/g77 diff --git a/Carpet/CarpetRegrid/src/regrid.cc b/Carpet/CarpetRegrid/src/regrid.cc index a8417a1f3..1b0b95d87 100644 --- a/Carpet/CarpetRegrid/src/regrid.cc +++ b/Carpet/CarpetRegrid/src/regrid.cc @@ -19,7 +19,7 @@ #include "carpet.hh" #include "regrid.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.7 2002/01/14 14:59:27 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.8 2002/03/06 17:47:58 schnetter Exp $"; @@ -489,6 +489,8 @@ namespace CarpetRegrid { assert (! region.empty()); // Count grid points that need to be refined + // (this doesn't work yet on multiple processors) + assert (CCTK_nProcs(cctkGH)==1); int cnt = 0; for (bbox<int,dim>::iterator it=region.begin(); it!=region.end(); ++it) { if (error[*it] > maxerror) ++cnt; diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic.par index 20d133da1..0a895cf79 100644 --- a/CarpetExtra/HydroToy/par/hydrotoy_periodic.par +++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic.par,v 1.5 2001/12/14 17:59:57 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic.par,v 1.6 2002/03/06 17:47:58 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" @@ -48,7 +48,7 @@ IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" IOFlexIO::out3D_every = 24 IOFlexIO::out3D_vars = "hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" HydroToy::bound = radiation diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par index 2211b0e37..b62ddf029 100644 --- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par +++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par,v 1.4 2001/12/14 17:59:57 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par,v 1.5 2002/03/06 17:47:59 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" @@ -48,7 +48,7 @@ IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" IOFlexIO::out3D_every = 12 IOFlexIO::out3D_vars = "hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +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 b9aae769a..340b19219 100644 --- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par +++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par,v 1.5 2001/12/14 17:59:58 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par,v 1.6 2002/03/06 17:47:59 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" @@ -54,7 +54,7 @@ IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" IOFlexIO::out3D_every = 24 IOFlexIO::out3D_vars = "hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +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 72cde35ee..5fa9d4660 100644 --- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par +++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par,v 1.5 2001/12/14 17:59:58 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par,v 1.6 2002/03/06 17:47:59 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" @@ -54,7 +54,7 @@ IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" IOFlexIO::out3D_every = 48 IOFlexIO::out3D_vars = "hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" HydroToy::bound = radiation diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par index 252547e5e..eb4bb4750 100644 --- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par +++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par,v 1.5 2001/12/14 17:59:58 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par,v 1.6 2002/03/06 17:47:59 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduc CarpetRegrid CarpetSlab IDHydroToy HydroToy" @@ -54,7 +54,7 @@ IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" IOFlexIO::out3D_every = 48 IOFlexIO::out3D_vars = "hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" HydroToy::bound = radiation diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par index 4363da750..3b316313a 100644 --- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par +++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par,v 1.5 2001/12/14 17:59:58 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par,v 1.6 2002/03/06 17:47:59 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" @@ -54,7 +54,7 @@ IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" IOFlexIO::out3D_every = 96 IOFlexIO::out3D_vars = "hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" HydroToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par index 387b4a7f6..48c831daf 100644 --- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par +++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par,v 1.4 2001/12/14 18:00:02 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par,v 1.5 2002/03/06 17:47:59 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" @@ -48,7 +48,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid IOFlexIO::out3D_every = 24 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par index a33ae1913..82d7a1a75 100644 --- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par +++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par,v 1.4 2001/12/14 18:00:03 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par,v 1.5 2002/03/06 17:48:00 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" @@ -48,7 +48,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid IOFlexIO::out3D_every = 12 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par index 590dd1313..ce1a9b0b2 100644 --- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par +++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par,v 1.5 2001/12/14 18:00:03 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par,v 1.6 2002/03/06 17:48:00 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" @@ -54,7 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid IOFlexIO::out3D_every = 24 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par index cf5e0259d..fbe7852ca 100644 --- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par +++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par,v 1.5 2001/12/14 18:00:03 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par,v 1.6 2002/03/06 17:48:00 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" @@ -54,7 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid IOFlexIO::out3D_every = 48 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par index 6e47ad888..1c1f64fb4 100644 --- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par +++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par,v 1.5 2001/12/14 18:00:03 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par,v 1.6 2002/03/06 17:48:00 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" @@ -54,7 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid IOFlexIO::out3D_every = 48 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par index d660ef8d3..ab3bae63d 100644 --- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par +++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par,v 1.5 2001/12/14 18:00:04 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par,v 1.6 2002/03/06 17:48:01 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" @@ -54,7 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid IOFlexIO::out3D_every = 96 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par index b97015267..e9d8fd98e 100644 --- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par +++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par,v 1.5 2001/12/14 18:00:04 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par,v 1.6 2002/03/06 17:48:01 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReducd CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy HydroToy" @@ -48,7 +48,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" IOFlexIO::out3D_every = 24 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par index 226ff5480..67bc1bd1b 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.7 2001/12/14 18:00:04 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par,v 1.8 2002/03/06 17:48:01 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" @@ -48,7 +48,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" IOFlexIO::out3D_every = 12 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par index 981dd8f11..0dd4e1170 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.7 2001/12/14 18:00:04 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par,v 1.8 2002/03/06 17:48:01 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" @@ -54,7 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" IOFlexIO::out3D_every = 24 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par index 32da59011..d3c22f7a7 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.8 2001/12/14 18:00:04 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par,v 1.9 2002/03/06 17:48:01 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" @@ -54,7 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" IOFlexIO::out3D_every = 48 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par index c3c0135c8..f2c2b0333 100644 --- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par +++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par,v 1.7 2001/12/14 18:00:04 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par,v 1.8 2002/03/06 17:48:01 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" @@ -54,7 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" IOFlexIO::out3D_every = 48 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par index 630346ca2..ea023af5b 100644 --- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par +++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par,v 1.6 2001/12/14 18:00:04 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par,v 1.7 2002/03/06 17:48:01 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" @@ -54,7 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" IOFlexIO::out3D_every = 96 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".amr" +IOFlexIO::out3D_extension = ".vcamr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/WaveToyF77/param.ccl b/CarpetExtra/WaveToyF77/param.ccl index 670d6f794..e6486c3ea 100644 --- a/CarpetExtra/WaveToyF77/param.ccl +++ b/CarpetExtra/WaveToyF77/param.ccl @@ -1,5 +1,5 @@ # Parameter definitions for thorn WaveToyF77 -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/param.ccl,v 1.5 2002/02/27 14:35:40 shawley Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/param.ccl,v 1.6 2002/03/06 17:48:02 schnetter Exp $ private: @@ -10,7 +10,7 @@ KEYWORD bound "Type of boundary condition to use" "radiation" :: "Radiation boundary condition" "robin" :: "Robin boundary condition" "zero" :: "Zero boundary condition" - "static" :: "Static boundary condition" +# "static" :: "Static boundary condition" } "zero" KEYWORD excision_bound "Type of excision boundary condition to use" diff --git a/CarpetExtra/WaveToyF77/src/WaveToy.F77 b/CarpetExtra/WaveToyF77/src/WaveToy.F77 index 77a3401f3..4c8933b04 100644 --- a/CarpetExtra/WaveToyF77/src/WaveToy.F77 +++ b/CarpetExtra/WaveToyF77/src/WaveToy.F77 @@ -162,8 +162,8 @@ c ----------------------------------- call BndFlatVN (ierr, cctkGH, sw, "wavetoy::phi") else if (CCTK_EQUALS(bound, "zero")) then call BndScalarVN (ierr, cctkGH, sw, zero, "wavetoy::phi") - else if (CCTK_EQUALS(bound, "static")) then - call BndCopyTLVN (ierr, cctkGH, sw, 1, 0, "wavetoy::phi") +c$$$ else if (CCTK_EQUALS(bound, "static")) then +c$$$ call BndCopyTLVN (ierr, cctkGH, sw, 1, 0, "wavetoy::phi") else if (CCTK_EQUALS(bound, "radiation")) then call BndRadiativeVN (ierr, cctkGH, sw, zero, one, $ "wavetoy::phi", "wavetoy::phi") |