diff options
author | eschnett <> | 2001-03-21 21:57:00 +0000 |
---|---|---|
committer | eschnett <> | 2001-03-21 21:57:00 +0000 |
commit | 77b35c61254d043765551c86f6f36b5d892f50a5 (patch) | |
tree | 978e38ead48f27d55fd14f509585891ab3882374 | |
parent | 620b6cc822af2388c1199f80697e3b99fe960b81 (diff) |
Added custom time interpolator as well.
Added custom time interpolator as well.
Debugged other custom interpolator.
Runs like a greased flash now.
darcs-hash:20010321215740-f6438-bc99251c9a56354105ef885326d2360f275a85f2.gz
-rw-r--r-- | CarpetExtra/HydroToy/param.ccl | 3 | ||||
-rw-r--r-- | CarpetExtra/HydroToy/src/HydroToy.F77 | 8 | ||||
-rw-r--r-- | CarpetExtra/SpaceTimeToy/param.ccl | 3 | ||||
-rw-r--r-- | CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 | 8 | ||||
-rw-r--r-- | CarpetExtra/WaveToyF77/param.ccl | 4 | ||||
-rw-r--r-- | CarpetExtra/WaveToyF77/src/WaveToy.F77 | 6 |
6 files changed, 20 insertions, 12 deletions
diff --git a/CarpetExtra/HydroToy/param.ccl b/CarpetExtra/HydroToy/param.ccl index 52ebb4665..2760c29dd 100644 --- a/CarpetExtra/HydroToy/param.ccl +++ b/CarpetExtra/HydroToy/param.ccl @@ -1,10 +1,11 @@ # Parameter definitions for thorn HydroToy -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/param.ccl,v 1.1 2001/03/18 22:37:09 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/param.ccl,v 1.2 2001/03/21 22:57:40 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/src/HydroToy.F77 b/CarpetExtra/HydroToy/src/HydroToy.F77 index 7083133f8..dac1f9d65 100644 --- a/CarpetExtra/HydroToy/src/HydroToy.F77 +++ b/CarpetExtra/HydroToy/src/HydroToy.F77 @@ -1,5 +1,5 @@ c -*-Fortran-*- -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/src/HydroToy.F77,v 1.2 2001/03/19 21:30:34 eschnett Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/src/HydroToy.F77,v 1.3 2001/03/21 22:57:40 eschnett Exp $ #include "cctk.h" #include "cctk_Parameters.h" @@ -158,7 +158,7 @@ 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, zero, sw, + call BndScalarGN (ierr, cctkGH, sw, zero, $ "hydrotoy::hydroevolve") else if (CCTK_EQUALS(bound, "radiation")) then call BndRadiativeGN (ierr, cctkGH, sw, zero, one, @@ -166,8 +166,10 @@ 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") + call CCTK_WARN (0, "internal error") end if if (ierr .lt. 0) then call CCTK_WARN (0, "Error while applying boundary condition") diff --git a/CarpetExtra/SpaceTimeToy/param.ccl b/CarpetExtra/SpaceTimeToy/param.ccl index 8a7f8b783..d48df8cff 100644 --- a/CarpetExtra/SpaceTimeToy/param.ccl +++ b/CarpetExtra/SpaceTimeToy/param.ccl @@ -1,10 +1,11 @@ # Parameter definitions for thorn SpaceTimeToy -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/param.ccl,v 1.1 2001/03/17 16:05:56 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/param.ccl,v 1.2 2001/03/21 22:57:40 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/SpaceTimeToy/src/SpaceTimeToy.F77 b/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 index e62b60bc2..387059dc2 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.4 2001/03/20 16:29:55 eschnett Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77,v 1.5 2001/03/21 22:57:40 eschnett Exp $ #include "cctk.h" #include "cctk_Parameters.h" @@ -163,7 +163,7 @@ c Apply boundary condition if (CCTK_EQUALS(bound, "flat")) then call BndFlatGN (ierr, cctkGH, sw, "spacetimetoy::spacetimeevolve") else if (CCTK_EQUALS(bound, "zero")) then - call BndScalarGN (ierr, cctkGH, zero, sw, + call BndScalarGN (ierr, cctkGH, sw, zero, $ "spacetimetoy::spacetimeevolve") else if (CCTK_EQUALS(bound, "radiation")) then call BndRadiativeGN (ierr, cctkGH, sw, zero, one, @@ -171,8 +171,10 @@ c Apply boundary condition else if (CCTK_EQUALS(bound, "robin")) then call BndRobinGN (ierr, cctkGH, sw, finf, npow, $ "spacetimetoy::spacetimeevolve") + else if (CCTK_EQUALS(bound, "none")) then + ierr = 0 else - call CCTK_WARN (0, "Internal error") + call CCTK_WARN (0, "internal error") end if if (ierr .lt. 0) then call CCTK_WARN (0, "Error while applying boundary condition") diff --git a/CarpetExtra/WaveToyF77/param.ccl b/CarpetExtra/WaveToyF77/param.ccl index a8ff624c4..20886dc92 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.2 2001/03/17 16:05:56 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/param.ccl,v 1.3 2001/03/21 22:57:40 eschnett Exp $ private: @@ -10,4 +10,4 @@ KEYWORD bound "Type of boundary condition to use" "radiation" :: "Radiation boundary condition" "robin" :: "Robin boundary condition" "zero" :: "Zero boundary condition" -} "none" +} "zero" diff --git a/CarpetExtra/WaveToyF77/src/WaveToy.F77 b/CarpetExtra/WaveToyF77/src/WaveToy.F77 index f5ae091a1..adcdea62a 100644 --- a/CarpetExtra/WaveToyF77/src/WaveToy.F77 +++ b/CarpetExtra/WaveToyF77/src/WaveToy.F77 @@ -141,14 +141,16 @@ c ----------------------------------- if (CCTK_EQUALS(bound, "flat")) then call BndFlatVN (ierr, cctkGH, sw, "wavetoy::phi") else if (CCTK_EQUALS(bound, "zero")) then - call BndScalarVN (ierr, cctkGH, zero, sw, "wavetoy::phi") + call BndScalarVN (ierr, cctkGH, sw, zero, "wavetoy::phi") else if (CCTK_EQUALS(bound, "radiation")) then call BndRadiativeVN (ierr, cctkGH, sw, zero, one, $ "wavetoy::phi", "wavetoy::phi") else if (CCTK_EQUALS(bound, "robin")) then call BndRobinVN (ierr, cctkGH, sw, finf, npow, "wavetoy::phi") + else if (CCTK_EQUALS(bound, "none")) then + ierr = 0 else - call CCTK_WARN (0, "No boundary condition selected") + call CCTK_WARN (0, "internal error") end if if (ierr .lt. 0) then call CCTK_WARN (0, "Boundary conditions not applied - giving up!") |