Merge pull request #20 from lwJi/test_newradx

TestNewRadX: Separate TestNewRadX from NewRadX

Docs/thornlist/spacetimex.th

@@ -171,6 +171,7 @@ SpacetimeX/AHFinderX
 SpacetimeX/BrillLindquist
 SpacetimeX/Cowling
 SpacetimeX/NewRadX
+SpacetimeX/TestNewRadX
 SpacetimeX/Punctures
 SpacetimeX/PunctureTracker
 SpacetimeX/SphericalHarmonics

NewRadX/configuration.ccl

@@ -1,3 +1,3 @@
 # Configuration definition for thorn NewRadX
 
-REQUIRES GSL Loop
+REQUIRES Loop

NewRadX/interface.ccl

@@ -2,28 +2,8 @@
 
 IMPLEMENTS: NewRadX
 
-USES INCLUDE HEADER: loop.hxx
-USES INCLUDE HEADER: loop_device.hxx
-
-INCLUDE HEADER: newradx.hxx in newradx.hxx
-
 INHERITS: CarpetX
 
-# Scalar field grid functions for the unit test
-CCTK_REAL state TYPE=gf CENTERING={VVV} TAGS='rhs="rhs"'
-{
-  uu
-  vv
-} "Scalar wave state vector: scalar field and its time derivative"
-
-CCTK_REAL rhs TYPE=gf CENTERING={VVV} TAGS='checkpoint="no"'
-{
-  uu_rhs
-  vv_rhs
-} "RHS of scalar wave state vector"
+USES INCLUDE HEADER: loop_device.hxx
 
-CCTK_REAL error TYPE=gf CENTERING={VVV} TAGS='checkpoint="no"'
-{
-  uu_err
-  vv_err
-} "Error in scalar wave state vector"
+INCLUDE HEADER: newradx.hxx in newradx.hxx

NewRadX/param.ccl

@@ -1,52 +1 @@
 # Parameter definitions for thorn NewRadX
-#
-# To use radiative boundary conditions in another thorn, the parameters here are not relevant.
-# These parameters are only used in the unit test for NewRadX, which applies NewRadX in the evolution of a test scalar field
-BOOLEAN run_test "Run scalar field evolution test"
-{
-} "no"
-
-BOOLEAN test_use_newradx "Use radiative boundary conditions for scalar field"
-{
-} "yes"
-
-BOOLEAN test_add_dissipation "Add Kreiss-Oliger dissipation to scalar field RHS"
-{
-} "yes"
-
-CCTK_REAL eps_dissipation "Coefficient for Kreiss-Oliger dissipation"
-{
-  0.0:1.0 :: ""
-} 0.15
-
-CCTK_REAL n_falloff "Exponent of the falloff term r^(-n_falloff) in the scalar field potential"
-{
-  0.0:* :: ""
-} 2.0
-
-
-# Parameters scalar field test initial data
-CCTK_REAL gaussian_a0 "Scalar field initial Gaussian amplitude"
-{
-  *:* :: ""
-} 1.0
-
-CCTK_REAL gaussian_w0 "Scalar field initial Gaussian profile width"
-{
-  0.0:* :: ""
-} 1.0
-
-CCTK_REAL gaussian_x0 "Scalar field initial Gaussian profile center"
-{
-  *:* :: ""
-} 0.0
-
-CCTK_REAL gaussian_y0 "Scalar field initial Gaussian profile center"
-{
-  *:* :: ""
-} 0.0
-
-CCTK_REAL gaussian_z0 "Scalar field initial Gaussian profile center"
-{
-  *:* :: ""
-} 0.0

NewRadX/schedule.ccl

@@ -1,42 +1 @@
 # Schedule definitions for thorn NewRadX 
-
-if (run_test) {
-  STORAGE: state
-
-  SCHEDULE NewRadX_Init AT initial
-  {
-    LANG: C
-    WRITES: state(interior)
-    SYNC: state
-  } "Initialize scalar wave state"
-
-  SCHEDULE NewRadX_EstimateError AT postinitial
-  {
-    LANG: C
-    READS: state(everywhere)
-    WRITES: CarpetX::regrid_error(interior)
-  } "Estimate error for regridding"
-
-  SCHEDULE NewRadX_EstimateError AT poststep
-  {
-    LANG: C
-    READS: state(everywhere)
-    WRITES: CarpetX::regrid_error(interior)
-  } "Estimate error for regridding"
-
-  SCHEDULE NewRadX_RHS IN ODESolvers_RHS
-  {
-    LANG: C
-    READS: state(everywhere)
-    WRITES: rhs(interior)
-    SYNC: rhs
-  } "Calculate scalar wave RHS"
-
-  SCHEDULE NewRadX_CompareSolution IN ODESolvers_PostStep
-  {
-    LANG: C
-    READS: state(interior)
-    WRITES: error(interior)
-    SYNC: error
-  } "Calculate error between numerical and analytic solutions"
-}

NewRadX/src/make.code.defn

@@ -1,8 +1,7 @@
 # Main make.code.defn file for thorn NewRadX
 
 # Source files in this directory
-SRCS = newradx.cxx           \
-       test_newradx.cxx
+SRCS = newradx.cxx
 
 # Subdirectories containing source files
 SUBDIRS =