aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--interface.ccl2
-rw-r--r--par/boostrot.par18
-rw-r--r--param.ccl8
-rw-r--r--schedule.ccl6
-rw-r--r--src/exactblendbound.F6
-rw-r--r--src/exactcartblendbound.F4
-rw-r--r--src/exactgauge.F8
-rw-r--r--src/exactinitialize.F4
-rw-r--r--src/slice_initialize.F2
-rw-r--r--test/test_Exact_1.par12
10 files changed, 37 insertions, 33 deletions
diff --git a/interface.ccl b/interface.ccl
index 02b2b43..21189e0 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -3,7 +3,7 @@
implements: exact
-inherits: einstein
+inherits: admbase staticconformal grid
# For running with ADM
# friend: ADM ADMConstraints
diff --git a/par/boostrot.par b/par/boostrot.par
index bc588ee..1befd77 100644
--- a/par/boostrot.par
+++ b/par/boostrot.par
@@ -4,7 +4,7 @@
# Required thorns
-ActiveThorns = "time pugh cartgrid3d einstein adm exact ioascii ioutil iobasic"
+ActiveThorns = "boundary pughreduce pughslab time pugh cartgrid3d admbase staticconformal admmacros coordgauge adm exact ioascii ioutil iobasic"
# Grid
@@ -27,7 +27,9 @@ time::dtfac = 0.25
# Initial data
-einstein::initial_data = "exact"
+admbase::metric_type = "physical"
+#staticconformal::conformal_storage = "factor+derivs+2nd derivs"
+admbase::initial_data = "exact"
exact::exactmodel = "boostrot"
@@ -37,22 +39,22 @@ exact::boostrotsafedistance = 1.e-2
# Evolution
-einstein::evolution_system = "adm"
+admbase::evolution_method = "adm"
# Gauge
-einstein::slicing = "static"
-einstein::shift = "exact"
+admbase::lapse_evolution_method = "static"
+admbase::shift_evolution_method = "exact"
# Output
IOBasic::outInfo_every = 1
-IOBasic::outInfo_vars = "einstein::gxx"
+IOBasic::outInfo_vars = "admbase::gxx"
IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars = "einstein::gxx einstein::gyy einstein::gzz"
+IOBasic::outScalar_vars = "admbase::gxx admbase::gyy admbase::gzz"
IOASCII::out1D_every = 1
-IOASCII::out1D_vars = "einstein::gxx einstein::gyy einstein::gzz"
+IOASCII::out1D_vars = "admbase::gxx admbase::gyy admbase::gzz"
diff --git a/param.ccl b/param.ccl
index 94afd3f..9d3e0ec 100644
--- a/param.ccl
+++ b/param.ccl
@@ -5,7 +5,7 @@
shares: grid
-shares: einstein
+shares: admbase
EXTENDS KEYWORD initial_data
@@ -14,12 +14,12 @@ EXTENDS KEYWORD initial_data
"slice" :: "Initial data from exact solution on arbitrary slice"
} ""
-EXTENDS KEYWORD slicing
+EXTENDS KEYWORD lapse_evolution_method
{
"exact" :: "Use lapse from exact solution"
} ""
-EXTENDS KEYWORD shift
+EXTENDS KEYWORD shift_evolution_method
{
"exact" :: "Use shift from exact solution"
} ""
@@ -34,7 +34,7 @@ EXTENDS KEYWORD initial_shift
"exact" :: "Initial shift from exact solution"
} ""
-EXTENDS KEYWORD evolution_system
+EXTENDS KEYWORD evolution_method
{
"slice" :: "Evolve arbitrary slice and extract Cauchy data"
} ""
diff --git a/schedule.ccl b/schedule.ccl
index c8df381..9088beb 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -18,7 +18,7 @@ if (CCTK_Equals(initial_data,"exact"))
# but NOT evolving the slice afterwards.
# Note we only need storage for the slice itself, and only at startup.
-if ( (CCTK_Equals(initial_data,"slice")) && ! (CCTK_Equals(evolution_system,"slice")) )
+if ( (CCTK_Equals(initial_data,"slice")) && ! (CCTK_Equals(evolution_method,"slice")) )
{
schedule slice_initialize at CCTK_INITIAL
{
@@ -44,7 +44,7 @@ if ( (CCTK_Equals(initial_lapse,"exact")) || (CCTK_Equals(initial_shift,"exact")
# During the evolution:
-if ( (CCTK_Equals(slicing,"exact")) || (CCTK_Equals(shift,"exact")) )
+if ( (CCTK_Equals(lapse_evolution_method,"exact")) || (CCTK_Equals(shift_evolution_method,"exact")) )
{
schedule Exact_RegisterSlicing at CCTK_STARTUP
{
@@ -68,7 +68,7 @@ if ( (CCTK_Equals(slicing,"exact")) || (CCTK_Equals(shift,"exact")) )
# happen as a failsafe, and Cactus should complain about not having an
# evolution routine. Setting initial_data = "slice" on its own is ok though.
-if ( (CCTK_Equals(evolution_system,"slice")) && (CCTK_Equals(initial_data,"slice")) )
+if ( (CCTK_Equals(evolution_method,"slice")) && (CCTK_Equals(initial_data,"slice")) )
{
STORAGE: Exact_slice
STORAGE: Exact_slicetemp1
diff --git a/src/exactblendbound.F b/src/exactblendbound.F
index 4657ff2..b655b39 100644
--- a/src/exactblendbound.F
+++ b/src/exactblendbound.F
@@ -51,9 +51,9 @@ C Other parameters.
doGij = (exblend_gs.eq.1)
doLapse = ((exblend_gauge.eq.1).and.
- $ (CCTK_Equals(slicing,"exact").ne.0))
+ $ (CCTK_Equals(lapse_evolution_method,"exact").ne.0))
doShift = ((exblend_gauge.eq.1).and.
- $ (CCTK_Equals(shift,"exact").ne.0))
+ $ (CCTK_Equals(shift_evolution_method,"exact").ne.0))
call CCTK_CoordRange(ierr,cctkGH,xmn,xmx,-1,"x","cart3d")
call CCTK_CoordRange(ierr,cctkGH,ymn,ymx,-1,"y","cart3d")
@@ -176,7 +176,7 @@ c space thing...
intone(alp)
endif
- if (doShift.and.(shift_state.ne.SHIFT_INACTIVE)) then
+ if (doShift.and.(shift_state.ne.0)) then
intone(betax)
intone(betay)
intone(betaz)
diff --git a/src/exactcartblendbound.F b/src/exactcartblendbound.F
index 8f608d3..f59460c 100644
--- a/src/exactcartblendbound.F
+++ b/src/exactcartblendbound.F
@@ -53,9 +53,9 @@ C Other parameters.
doGij = (exblend_gs.eq.1)
doLapse = ((exblend_gauge.eq.1).and.
- $ (CCTK_Equals("slicing","exact").ne.0))
+ $ (CCTK_Equals("lapse_evolution_method","exact").ne.0))
doShift = ((exblend_gauge.eq.1).and.
- $ (CCTK_Equals(shift,"exact").ne.0))
+ $ (CCTK_Equals(shift_evolution_method,"exact").ne.0))
if (exblend_width.lt.0) then
xblend = - exblend_width*dx
diff --git a/src/exactgauge.F b/src/exactgauge.F
index ae25c33..e45d686 100644
--- a/src/exactgauge.F
+++ b/src/exactgauge.F
@@ -47,8 +47,8 @@ C order numerical scheme.
C Set both lapse and shift.
- if (((CCTK_Equals(slicing,"exact").ne.0).and.
- $ (CCTK_Equals(shift,"exact").ne.0))
+ if (((CCTK_Equals(lapse_evolution_method,"exact").ne.0).and.
+ $ (CCTK_Equals(shift_evolution_method,"exact").ne.0))
$ .or.
$ ((CCTK_Equals(initial_lapse,"exact").ne.0).and.
$ (CCTK_Equals(initial_shift,"exact").ne.0))) then
@@ -79,7 +79,7 @@ C Set both lapse and shift.
C Set lapse only.
- else if ((CCTK_Equals(slicing,"exact").ne.0)
+ else if ((CCTK_Equals(lapse_evolution_method,"exact").ne.0)
$ .or. (CCTK_Equals(initial_lapse,"exact").ne.0)) then
do k=1,nz
@@ -109,7 +109,7 @@ C Set lapse only.
C Set shift only.
- else if ((CCTK_Equals(shift,"exact").ne.0)
+ else if ((CCTK_Equals(shift_evolution_method,"exact").ne.0)
$ .or. (CCTK_Equals(initial_shift,"exact").ne.0)) then
do k=1,nz
diff --git a/src/exactinitialize.F b/src/exactinitialize.F
index 298beaf..6ffde99 100644
--- a/src/exactinitialize.F
+++ b/src/exactinitialize.F
@@ -5,7 +5,7 @@ C in the Bona-Masso formalism, at an initial time.
#include "cctk.h"
#include "cctk_Parameters.h"
#include "cctk_Arguments.h"
-#include "CactusEinstein/Einstein/src/Einstein.h"
+c #include "CactusEinstein/Einstein/src/Einstein.h"
subroutine exactinitialize(CCTK_ARGUMENTS)
@@ -66,7 +66,7 @@ C Set data pointwise.
C Tell the code there is no need to treat the conformal factor
C as a separate field. That is, we have set the physical metric here.
- conformal_state = NOCONFORMAL_METRIC
+ conformal_state = 0
psi = 1.d0
return
diff --git a/src/slice_initialize.F b/src/slice_initialize.F
index c9a97d1..9d1c3f4 100644
--- a/src/slice_initialize.F
+++ b/src/slice_initialize.F
@@ -28,7 +28,7 @@ C Calculate Cauchy data and dx^A/dt.
C This tells the code that what we have set is the physical metric,
C not a conformally rescaled one.
- conformal_state = NOCONFORMAL_METRIC
+ conformal_state = 0
psi = 1.0D0
return
diff --git a/test/test_Exact_1.par b/test/test_Exact_1.par
index 82a5726..d3b3ca1 100644
--- a/test/test_Exact_1.par
+++ b/test/test_Exact_1.par
@@ -2,7 +2,7 @@
# Required thorns
-ActiveThorns = "time pugh pughslab boundary cartgrid3d einstein adm exact ioascii ioutil iobasic PughReduce"
+ActiveThorns = "admbase adm admmacros coordgauge staticconformal time pugh pughslab boundary cartgrid3d exact ioascii ioutil iobasic PughReduce"
# Grid
@@ -21,7 +21,9 @@ time::dtfac = 0.25
# Initial data
-einstein::initial_data = "exact"
+admbase::metric_type = "static conformal"
+staticconformal::conformal_storage = "factor+derivs+2nd derivs"
+admbase::initial_data = "exact"
exact::exactmodel = "bowl"
@@ -31,10 +33,10 @@ IO::outdir = "test_Exact_1"
IO::out_fileinfo = "none"
IOBasic::outInfo_every = 1
-IOBasic::outInfo_vars = "einstein::gxx"
+IOBasic::outInfo_vars = "admbase::gxx"
IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars = "einstein::gxx einstein::gyy einstein::gzz"
+IOBasic::outScalar_vars = "admbase::gxx admbase::gyy admbase::gzz"
IOASCII::out1D_every = 1
-IOASCII::out1D_vars = "einstein::gxx einstein::gyy einstein::gzz"
+IOASCII::out1D_vars = "admbase::gxx admbase::gyy admbase::gzz"
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-29 10:00:18 +0000