aboutsummaryrefslogtreecommitdiff
path: root/CarpetExtra
diff options
context:
space:
mode:
authorschnetter <>2003-06-27 14:26:00 +0000
committerschnetter <>2003-06-27 14:26:00 +0000
commit5163a05931360b709017625561819733e7cdc78f (patch)
tree76c1cb3f242bae96785e6e9af211bd7373fe4783 /CarpetExtra
parentf1ecc3e35bde435569c084d6d33fc026d9a393bd (diff)
Remove superfluous parameter checking.
Remove superfluous parameter checking. Provide correct asymptotic limits. darcs-hash:20030627142611-07bb3-106ad5807b1a2ab2feea367886e03cbe9ca2377d.gz
Diffstat (limited to 'CarpetExtra')
-rw-r--r--CarpetExtra/FOWaveToyF77/src/FOWaveToy.F7723
-rw-r--r--CarpetExtra/IDFOScalarWave/param.ccl8
-rw-r--r--CarpetExtra/IDFOScalarWave/schedule.ccl7
-rw-r--r--CarpetExtra/IDFOScalarWave/src/CheckParameters.F7750
-rw-r--r--CarpetExtra/IDFOScalarWave/src/make.code.defn4
5 files changed, 22 insertions, 70 deletions
diff --git a/CarpetExtra/FOWaveToyF77/src/FOWaveToy.F77 b/CarpetExtra/FOWaveToyF77/src/FOWaveToy.F77
index b8cb5fe86..1450ff325 100644
--- a/CarpetExtra/FOWaveToyF77/src/FOWaveToy.F77
+++ b/CarpetExtra/FOWaveToyF77/src/FOWaveToy.F77
@@ -128,6 +128,8 @@ c Local declarations
CCTK_REAL zero, one
parameter (zero=0, one=1)
+ integer table, table_derivs
+
character fbound*100
CCTK_INT fboundlen
@@ -183,16 +185,27 @@ c -----------------------------------
call CCTK_FortranString (fboundlen, bound, fbound)
if (fboundlen.lt.0) call CCTK_WARN (0, "internal error")
- ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1,
+
+ call Util_TableCreateFromString (table, "LIMIT=1.0 SPEED=1.0")
+ if (table.lt.0) call CCTK_WARN (0, "internal error")
+ call Util_TableCreateFromString (table_derivs, "LIMIT=0.0 SPEED=1.0")
+ if (table_derivs.lt.0) call CCTK_WARN (0, "internal error")
+
+ ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, table,
$ "fowavetoy::phi", fbound)
- ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1,
+ ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, table_derivs,
$ "fowavetoy::pi", fbound)
- ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1,
+ ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, table_derivs,
$ "fowavetoy::phix", fbound)
- ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1,
+ ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, table_derivs,
$ "fowavetoy::phiy", fbound)
- ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1,
+ ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, table_derivs,
$ "fowavetoy::phiz", fbound)
if (ierr.ne.0) call CCTK_WARN (0, "internal error")
+ call Util_TableDestroy (ierr, table)
+ if (ierr.ne.0) call CCTK_WARN (0, "internal error")
+ call Util_TableDestroy (ierr, table_derivs)
+ if (ierr.ne.0) call CCTK_WARN (0, "internal error")
+
end
diff --git a/CarpetExtra/IDFOScalarWave/param.ccl b/CarpetExtra/IDFOScalarWave/param.ccl
index 146c8decc..a36367286 100644
--- a/CarpetExtra/IDFOScalarWave/param.ccl
+++ b/CarpetExtra/IDFOScalarWave/param.ccl
@@ -1,11 +1,5 @@
# Parameter definitions for thorn IDScalarWave
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/param.ccl,v 1.3 2003/06/27 15:54:58 schnetter Exp $
-
-shares: grid
-
-USES KEYWORD type
-
-private:
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/param.ccl,v 1.4 2003/06/27 16:26:11 schnetter Exp $
KEYWORD initial_data "Type of initial data"
{
diff --git a/CarpetExtra/IDFOScalarWave/schedule.ccl b/CarpetExtra/IDFOScalarWave/schedule.ccl
index 79cbee17f..1b89fc2d4 100644
--- a/CarpetExtra/IDFOScalarWave/schedule.ccl
+++ b/CarpetExtra/IDFOScalarWave/schedule.ccl
@@ -1,10 +1,5 @@
# Schedule definitions for thorn IDScalarWave
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/schedule.ccl,v 1.5 2003/06/27 15:54:58 schnetter Exp $
-
-schedule IDFOScalarWave_CheckParameters at PARAMCHECK
-{
- LANG: Fortran
-} "Check parameters"
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/schedule.ccl,v 1.6 2003/06/27 16:26:11 schnetter Exp $
schedule IDFOScalarWave_InitialData as FOWaveToy_InitialData at INITIAL
{
diff --git a/CarpetExtra/IDFOScalarWave/src/CheckParameters.F77 b/CarpetExtra/IDFOScalarWave/src/CheckParameters.F77
deleted file mode 100644
index 54efe1dde..000000000
--- a/CarpetExtra/IDFOScalarWave/src/CheckParameters.F77
+++ /dev/null
@@ -1,50 +0,0 @@
-c -*-Fortran-*-
-c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/src/Attic/CheckParameters.F77,v 1.1 2002/02/18 11:26:34 shawley Exp $
-
- /*@@
- @file CheckParameters.F77
- @date
- @author Gabrielle Allen
- @desc
- Check parameters for the wave equation initial data
- @enddesc
- @@*/
-
-#include "cctk.h"
-#include "cctk_Parameters.h"
-#include "cctk_Arguments.h"
-
-
- /*@@
- @routine IDFOScalarWave_CheckParameters
- @date
- @author Gabrielle Allen
- @desc
- Check parameters for the wave equation initial data
- @enddesc
- @calls
- @calledby
- @history
-
- @endhistory
-
-@@*/
-
- subroutine IDFOScalarWave_CheckParameters(CCTK_ARGUMENTS)
-
- implicit none
-
- DECLARE_CCTK_ARGUMENTS
- DECLARE_CCTK_FUNCTIONS
- DECLARE_CCTK_PARAMETERS
-
- if (CCTK_EQUALS(initial_data,"box")) then
-
- if (kx.eq.0 .or. ky.eq.0 .or. kz.eq.0) then
- call CCTK_PARAMWARN("Cannot have zero kx,ky,kz for box initial data")
- end if
-
- end if
-
- return
- end
diff --git a/CarpetExtra/IDFOScalarWave/src/make.code.defn b/CarpetExtra/IDFOScalarWave/src/make.code.defn
index e85ec6d5d..3d9912022 100644
--- a/CarpetExtra/IDFOScalarWave/src/make.code.defn
+++ b/CarpetExtra/IDFOScalarWave/src/make.code.defn
@@ -1,8 +1,8 @@
# Main make.code.defn file for thorn IDScalarWave -*-Makefile-*-
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/src/make.code.defn,v 1.1 2002/02/18 11:26:34 shawley Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/src/make.code.defn,v 1.2 2003/06/27 16:26:11 schnetter Exp $
# Source files in this directory
-SRCS = InitialData.F77 CheckParameters.F77
+SRCS = InitialData.F77
# Subdirectories containing source files
SUBDIRS =