From a911fd254cf28fc07e6223be83fd51508ca1b3f6 Mon Sep 17 00:00:00 2001 From: schnetter <> Date: Wed, 18 Jun 2003 18:08:00 +0000 Subject: WaveToyMoL: Produce more output. WaveToyMoL: Produce more output. WaveToyFO: Add parameter files. *.F77: Fix bugs. darcs-hash:20030618180829-07bb3-0bfc535397f0e58ad8079502f731b0706a25e058.gz --- CarpetExtra/WaveToyFO/par/fo1d_1l_0020.par | 2 +- CarpetExtra/WaveToyFO/par/fo1d_1l_0040.par | 2 +- CarpetExtra/WaveToyFO/par/fo1d_1l_0080.par | 2 +- CarpetExtra/WaveToyFO/par/fo1d_2l_0020.par | 2 +- CarpetExtra/WaveToyFO/par/fo1d_2l_0040.par | 2 +- CarpetExtra/WaveToyFO/par/fo1d_2l_0080.par | 2 +- CarpetExtra/WaveToyFO/par/fo1d_2l_0160.par | 2 +- CarpetExtra/WaveToyFO/par/fo1d_2l_0320.par | 2 +- CarpetExtra/WaveToyFO/schedule.ccl | 10 +++++----- CarpetExtra/WaveToyFO/src/calcrhs.F77 | 6 +++--- 10 files changed, 16 insertions(+), 16 deletions(-) (limited to 'CarpetExtra/WaveToyFO') diff --git a/CarpetExtra/WaveToyFO/par/fo1d_1l_0020.par b/CarpetExtra/WaveToyFO/par/fo1d_1l_0020.par index 958d714e5..36d1795ce 100644 --- a/CarpetExtra/WaveToyFO/par/fo1d_1l_0020.par +++ b/CarpetExtra/WaveToyFO/par/fo1d_1l_0020.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_1l_0020.par,v 1.2 2004/03/23 12:02:17 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_1l_0020.par,v 1.1 2003/06/18 20:08:29 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 3200 diff --git a/CarpetExtra/WaveToyFO/par/fo1d_1l_0040.par b/CarpetExtra/WaveToyFO/par/fo1d_1l_0040.par index 5bc8b8625..2d1c57354 100644 --- a/CarpetExtra/WaveToyFO/par/fo1d_1l_0040.par +++ b/CarpetExtra/WaveToyFO/par/fo1d_1l_0040.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_1l_0040.par,v 1.2 2004/03/23 12:02:17 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_1l_0040.par,v 1.1 2003/06/18 20:08:29 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 6400 diff --git a/CarpetExtra/WaveToyFO/par/fo1d_1l_0080.par b/CarpetExtra/WaveToyFO/par/fo1d_1l_0080.par index 73f013341..4a435b2a2 100644 --- a/CarpetExtra/WaveToyFO/par/fo1d_1l_0080.par +++ b/CarpetExtra/WaveToyFO/par/fo1d_1l_0080.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_1l_0080.par,v 1.2 2004/03/23 12:02:17 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_1l_0080.par,v 1.1 2003/06/18 20:08:29 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 12800 diff --git a/CarpetExtra/WaveToyFO/par/fo1d_2l_0020.par b/CarpetExtra/WaveToyFO/par/fo1d_2l_0020.par index 9b85edcf6..5d4780377 100644 --- a/CarpetExtra/WaveToyFO/par/fo1d_2l_0020.par +++ b/CarpetExtra/WaveToyFO/par/fo1d_2l_0020.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_2l_0020.par,v 1.2 2004/03/23 12:02:17 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_2l_0020.par,v 1.1 2003/06/18 20:08:29 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 3200 diff --git a/CarpetExtra/WaveToyFO/par/fo1d_2l_0040.par b/CarpetExtra/WaveToyFO/par/fo1d_2l_0040.par index 0bed4c7d9..06361051f 100644 --- a/CarpetExtra/WaveToyFO/par/fo1d_2l_0040.par +++ b/CarpetExtra/WaveToyFO/par/fo1d_2l_0040.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_2l_0040.par,v 1.2 2004/03/23 12:02:17 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_2l_0040.par,v 1.1 2003/06/18 20:08:29 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 6400 diff --git a/CarpetExtra/WaveToyFO/par/fo1d_2l_0080.par b/CarpetExtra/WaveToyFO/par/fo1d_2l_0080.par index 19ddd58b3..282797ad2 100644 --- a/CarpetExtra/WaveToyFO/par/fo1d_2l_0080.par +++ b/CarpetExtra/WaveToyFO/par/fo1d_2l_0080.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_2l_0080.par,v 1.2 2004/03/23 12:02:17 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_2l_0080.par,v 1.1 2003/06/18 20:08:29 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 12800 diff --git a/CarpetExtra/WaveToyFO/par/fo1d_2l_0160.par b/CarpetExtra/WaveToyFO/par/fo1d_2l_0160.par index 0cfd11fe3..481ba8a37 100644 --- a/CarpetExtra/WaveToyFO/par/fo1d_2l_0160.par +++ b/CarpetExtra/WaveToyFO/par/fo1d_2l_0160.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_2l_0160.par,v 1.2 2004/03/23 12:02:17 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_2l_0160.par,v 1.1 2003/06/18 20:08:29 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 25600 diff --git a/CarpetExtra/WaveToyFO/par/fo1d_2l_0320.par b/CarpetExtra/WaveToyFO/par/fo1d_2l_0320.par index 84bdcf712..3efa94204 100644 --- a/CarpetExtra/WaveToyFO/par/fo1d_2l_0320.par +++ b/CarpetExtra/WaveToyFO/par/fo1d_2l_0320.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_2l_0320.par,v 1.2 2004/03/23 12:02:17 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/par/fo1d_2l_0320.par,v 1.1 2003/06/18 20:08:29 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 51200 diff --git a/CarpetExtra/WaveToyFO/schedule.ccl b/CarpetExtra/WaveToyFO/schedule.ccl index 4b014b0b3..153ecea83 100644 --- a/CarpetExtra/WaveToyFO/schedule.ccl +++ b/CarpetExtra/WaveToyFO/schedule.ccl @@ -1,5 +1,5 @@ # Schedule definitions for thorn WaveToyFO -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/schedule.ccl,v 1.1 2003/06/18 18:24:30 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/schedule.ccl,v 1.2 2003/06/18 20:08:29 schnetter Exp $ STORAGE: scalarevolve[3] STORAGE: scalarevolvedot @@ -17,7 +17,7 @@ SCHEDULE WaveToyFO_InitSymBound AT basegrid OPTIONS: global } "Schedule symmetries" -SCHEDULE WaveToyFO_RegisterVars IN FO_Register +SCHEDULE WaveToyFO_RegisterVars IN MoL_Register { LANG: Fortran OPTIONS: global @@ -25,18 +25,18 @@ SCHEDULE WaveToyFO_RegisterVars IN FO_Register -SCHEDULE WaveToyFO_CalcRHS IN FO_CalcRHS +SCHEDULE WaveToyFO_CalcRHS IN MoL_CalcRHS { LANG: Fortran } "Calculate RHS for FO" -SCHEDULE WaveToyFO_Boundaries IN FO_PostStep +SCHEDULE WaveToyFO_Boundaries IN MoL_PostStep { LANG: Fortran SYNC: scalarevolve } "Select boundary conditions in FO" -SCHEDULE GROUP ApplyBCs IN FO_PostStep AFTER WaveToyFO_Boundaries +SCHEDULE GROUP ApplyBCs IN MoL_PostStep AFTER WaveToyFO_Boundaries { } "Apply boundary conditions in FO" diff --git a/CarpetExtra/WaveToyFO/src/calcrhs.F77 b/CarpetExtra/WaveToyFO/src/calcrhs.F77 index 46366f5bb..0a2c86733 100644 --- a/CarpetExtra/WaveToyFO/src/calcrhs.F77 +++ b/CarpetExtra/WaveToyFO/src/calcrhs.F77 @@ -1,4 +1,4 @@ -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/src/calcrhs.F77,v 1.1 2003/06/18 18:24:30 schnetter Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/src/calcrhs.F77,v 1.2 2003/06/18 20:08:29 schnetter Exp $ #include "cctk.h" #include "cctk_Arguments.h" @@ -38,8 +38,8 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyFO/src/calcrhs. do i=imin(1),imax(1) phidot(i,j,k) = $ ( (psix(i+1,j,k) - psix(i-1,j,k)) / (2*dx(1)) - $ + (psix(i,j+1,k) - psix(i,j-1,k)) / (2*dx(2)) - $ + (psix(i,j,k+1) - psix(i,j,k-1)) / (2*dx(3))) + $ + (psiy(i,j+1,k) - psiy(i,j-1,k)) / (2*dx(2)) + $ + (psiz(i,j,k+1) - psiz(i,j,k-1)) / (2*dx(3))) psixdot(i,j,k) = (phi(i+1,j,k) - phi(i-1,j,k)) / (2*dx(1)) psiydot(i,j,k) = (phi(i,j+1,k) - phi(i,j-1,k)) / (2*dx(2)) psizdot(i,j,k) = (phi(i,j,k+1) - phi(i,j,k-1)) / (2*dx(3)) -- cgit v1.2.3