aboutsummaryrefslogtreecommitdiff
path: root/Examples/Burgers/src
diff options
context:
space:
mode:
Diffstat (limited to 'Examples/Burgers/src')
-rw-r--r--Examples/Burgers/src/burgers_flux_1.cc21
-rw-r--r--Examples/Burgers/src/burgers_initial_shock.cc20
-rw-r--r--Examples/Burgers/src/burgers_initial_sine.cc22
-rw-r--r--Examples/Burgers/src/burgers_reconstruct_1.cc25
-rw-r--r--Examples/Burgers/src/burgers_rhs_1.cc20
-rw-r--r--Examples/Burgers/src/burgers_zero_rhs.cc19
-rw-r--r--Examples/Burgers/src/make.code.defn2
7 files changed, 65 insertions, 64 deletions
diff --git a/Examples/Burgers/src/burgers_flux_1.cc b/Examples/Burgers/src/burgers_flux_1.cc
index 947110f..a0a2300 100644
--- a/Examples/Burgers/src/burgers_flux_1.cc
+++ b/Examples/Burgers/src/burgers_flux_1.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
extern "C" void burgers_flux_1_SelectBCs(CCTK_ARGUMENTS)
{
@@ -40,8 +40,6 @@ static void burgers_flux_1_Body(cGH const * restrict const cctkGH, int const dir
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -84,9 +82,9 @@ static void burgers_flux_1_Body(cGH const * restrict const cctkGH, int const dir
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (burgers_flux_1,
+ CCTK_LOOP3(burgers_flux_1,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -108,7 +106,7 @@ static void burgers_flux_1_Body(cGH const * restrict const cctkGH, int const dir
/* Copy local copies back to grid functions */
uF[index] = uFL;
}
- CCTK_ENDLOOP3 (burgers_flux_1);
+ CCTK_ENDLOOP3(burgers_flux_1);
}
extern "C" void burgers_flux_1(CCTK_ARGUMENTS)
@@ -127,12 +125,15 @@ extern "C" void burgers_flux_1(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"Burgers::uF_group","Burgers::uLeft_group","Burgers::uR_group"};
+ const char *const groups[] = {
+ "Burgers::uF_group",
+ "Burgers::uLeft_group",
+ "Burgers::uR_group"};
GenericFD_AssertGroupStorage(cctkGH, "burgers_flux_1", 3, groups);
GenericFD_EnsureStencilFits(cctkGH, "burgers_flux_1", 1, 1, 1);
- GenericFD_LoopOverInterior(cctkGH, &burgers_flux_1_Body);
+ GenericFD_LoopOverInterior(cctkGH, burgers_flux_1_Body);
if (verbose > 1)
{
diff --git a/Examples/Burgers/src/burgers_initial_shock.cc b/Examples/Burgers/src/burgers_initial_shock.cc
index 6aaa0fc..22dc55a 100644
--- a/Examples/Burgers/src/burgers_initial_shock.cc
+++ b/Examples/Burgers/src/burgers_initial_shock.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
static void burgers_initial_shock_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
{
@@ -28,8 +28,6 @@ static void burgers_initial_shock_Body(cGH const * restrict const cctkGH, int co
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void burgers_initial_shock_Body(cGH const * restrict const cctkGH, int co
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (burgers_initial_shock,
+ CCTK_LOOP3(burgers_initial_shock,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -94,7 +92,7 @@ static void burgers_initial_shock_Body(cGH const * restrict const cctkGH, int co
/* Copy local copies back to grid functions */
u[index] = uL;
}
- CCTK_ENDLOOP3 (burgers_initial_shock);
+ CCTK_ENDLOOP3(burgers_initial_shock);
}
extern "C" void burgers_initial_shock(CCTK_ARGUMENTS)
@@ -113,11 +111,13 @@ extern "C" void burgers_initial_shock(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"grid::coordinates","Burgers::u_group"};
+ const char *const groups[] = {
+ "grid::coordinates",
+ "Burgers::u_group"};
GenericFD_AssertGroupStorage(cctkGH, "burgers_initial_shock", 2, groups);
- GenericFD_LoopOverEverything(cctkGH, &burgers_initial_shock_Body);
+ GenericFD_LoopOverEverything(cctkGH, burgers_initial_shock_Body);
if (verbose > 1)
{
diff --git a/Examples/Burgers/src/burgers_initial_sine.cc b/Examples/Burgers/src/burgers_initial_sine.cc
index d6aa092..0e5daaa 100644
--- a/Examples/Burgers/src/burgers_initial_sine.cc
+++ b/Examples/Burgers/src/burgers_initial_sine.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
static void burgers_initial_sine_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
{
@@ -28,8 +28,6 @@ static void burgers_initial_sine_Body(cGH const * restrict const cctkGH, int con
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void burgers_initial_sine_Body(cGH const * restrict const cctkGH, int con
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (burgers_initial_sine,
+ CCTK_LOOP3(burgers_initial_sine,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -88,12 +86,12 @@ static void burgers_initial_sine_Body(cGH const * restrict const cctkGH, int con
/* Precompute derivatives */
/* Calculate temporaries and grid functions */
- CCTK_REAL uL = 1 + Sin(2*xL*Pi)*ToReal(amp);
+ CCTK_REAL uL = 1 + sin(2*xL*Pi)*ToReal(amp);
/* Copy local copies back to grid functions */
u[index] = uL;
}
- CCTK_ENDLOOP3 (burgers_initial_sine);
+ CCTK_ENDLOOP3(burgers_initial_sine);
}
extern "C" void burgers_initial_sine(CCTK_ARGUMENTS)
@@ -112,11 +110,13 @@ extern "C" void burgers_initial_sine(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"grid::coordinates","Burgers::u_group"};
+ const char *const groups[] = {
+ "grid::coordinates",
+ "Burgers::u_group"};
GenericFD_AssertGroupStorage(cctkGH, "burgers_initial_sine", 2, groups);
- GenericFD_LoopOverEverything(cctkGH, &burgers_initial_sine_Body);
+ GenericFD_LoopOverEverything(cctkGH, burgers_initial_sine_Body);
if (verbose > 1)
{
diff --git a/Examples/Burgers/src/burgers_reconstruct_1.cc b/Examples/Burgers/src/burgers_reconstruct_1.cc
index 4a79c1e..2a14321 100644
--- a/Examples/Burgers/src/burgers_reconstruct_1.cc
+++ b/Examples/Burgers/src/burgers_reconstruct_1.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
extern "C" void burgers_reconstruct_1_SelectBCs(CCTK_ARGUMENTS)
{
@@ -43,8 +43,6 @@ static void burgers_reconstruct_1_Body(cGH const * restrict const cctkGH, int co
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -87,9 +85,9 @@ static void burgers_reconstruct_1_Body(cGH const * restrict const cctkGH, int co
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (burgers_reconstruct_1,
+ CCTK_LOOP3(burgers_reconstruct_1,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -109,8 +107,8 @@ static void burgers_reconstruct_1_Body(cGH const * restrict const cctkGH, int co
CCTK_REAL slopeR = DiffPlus1u;
- CCTK_REAL slope = IfThen(slopeL*slopeR < 0,0,IfThen(Abs(slopeL) <
- Abs(slopeR),slopeL,slopeR));
+ CCTK_REAL slope = IfThen(slopeL*slopeR < 0,0,IfThen(fabs(slopeL) <
+ fabs(slopeR),slopeL,slopeR));
CCTK_REAL uLeftL = uL - 0.5*slope;
@@ -120,7 +118,7 @@ static void burgers_reconstruct_1_Body(cGH const * restrict const cctkGH, int co
uLeft[index] = uLeftL;
uR[index] = uRL;
}
- CCTK_ENDLOOP3 (burgers_reconstruct_1);
+ CCTK_ENDLOOP3(burgers_reconstruct_1);
}
extern "C" void burgers_reconstruct_1(CCTK_ARGUMENTS)
@@ -139,12 +137,15 @@ extern "C" void burgers_reconstruct_1(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"Burgers::u_group","Burgers::uLeft_group","Burgers::uR_group"};
+ const char *const groups[] = {
+ "Burgers::u_group",
+ "Burgers::uLeft_group",
+ "Burgers::uR_group"};
GenericFD_AssertGroupStorage(cctkGH, "burgers_reconstruct_1", 3, groups);
GenericFD_EnsureStencilFits(cctkGH, "burgers_reconstruct_1", 1, 1, 1);
- GenericFD_LoopOverInterior(cctkGH, &burgers_reconstruct_1_Body);
+ GenericFD_LoopOverInterior(cctkGH, burgers_reconstruct_1_Body);
if (verbose > 1)
{
diff --git a/Examples/Burgers/src/burgers_rhs_1.cc b/Examples/Burgers/src/burgers_rhs_1.cc
index 557e7a0..644aca7 100644
--- a/Examples/Burgers/src/burgers_rhs_1.cc
+++ b/Examples/Burgers/src/burgers_rhs_1.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
extern "C" void burgers_rhs_1_SelectBCs(CCTK_ARGUMENTS)
{
@@ -40,8 +40,6 @@ static void burgers_rhs_1_Body(cGH const * restrict const cctkGH, int const dir,
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -84,9 +82,9 @@ static void burgers_rhs_1_Body(cGH const * restrict const cctkGH, int const dir,
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (burgers_rhs_1,
+ CCTK_LOOP3(burgers_rhs_1,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -107,7 +105,7 @@ static void burgers_rhs_1_Body(cGH const * restrict const cctkGH, int const dir,
/* Copy local copies back to grid functions */
urhs[index] = urhsL;
}
- CCTK_ENDLOOP3 (burgers_rhs_1);
+ CCTK_ENDLOOP3(burgers_rhs_1);
}
extern "C" void burgers_rhs_1(CCTK_ARGUMENTS)
@@ -126,12 +124,14 @@ extern "C" void burgers_rhs_1(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"Burgers::uF_group","Burgers::u_grouprhs"};
+ const char *const groups[] = {
+ "Burgers::uF_group",
+ "Burgers::u_grouprhs"};
GenericFD_AssertGroupStorage(cctkGH, "burgers_rhs_1", 2, groups);
GenericFD_EnsureStencilFits(cctkGH, "burgers_rhs_1", 1, 1, 1);
- GenericFD_LoopOverInterior(cctkGH, &burgers_rhs_1_Body);
+ GenericFD_LoopOverInterior(cctkGH, burgers_rhs_1_Body);
if (verbose > 1)
{
diff --git a/Examples/Burgers/src/burgers_zero_rhs.cc b/Examples/Burgers/src/burgers_zero_rhs.cc
index 10f020f..689339b 100644
--- a/Examples/Burgers/src/burgers_zero_rhs.cc
+++ b/Examples/Burgers/src/burgers_zero_rhs.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
static void burgers_zero_rhs_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
{
@@ -28,8 +28,6 @@ static void burgers_zero_rhs_Body(cGH const * restrict const cctkGH, int const d
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void burgers_zero_rhs_Body(cGH const * restrict const cctkGH, int const d
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (burgers_zero_rhs,
+ CCTK_LOOP3(burgers_zero_rhs,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -92,7 +90,7 @@ static void burgers_zero_rhs_Body(cGH const * restrict const cctkGH, int const d
/* Copy local copies back to grid functions */
urhs[index] = urhsL;
}
- CCTK_ENDLOOP3 (burgers_zero_rhs);
+ CCTK_ENDLOOP3(burgers_zero_rhs);
}
extern "C" void burgers_zero_rhs(CCTK_ARGUMENTS)
@@ -111,11 +109,12 @@ extern "C" void burgers_zero_rhs(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"Burgers::u_grouprhs"};
+ const char *const groups[] = {
+ "Burgers::u_grouprhs"};
GenericFD_AssertGroupStorage(cctkGH, "burgers_zero_rhs", 1, groups);
- GenericFD_LoopOverEverything(cctkGH, &burgers_zero_rhs_Body);
+ GenericFD_LoopOverEverything(cctkGH, burgers_zero_rhs_Body);
if (verbose > 1)
{
diff --git a/Examples/Burgers/src/make.code.defn b/Examples/Burgers/src/make.code.defn
index cfdb103..513e66c 100644
--- a/Examples/Burgers/src/make.code.defn
+++ b/Examples/Burgers/src/make.code.defn
@@ -1,3 +1,3 @@
# File produced by Kranc
-SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc burgers_initial_sine.cc burgers_initial_shock.cc burgers_zero_rhs.cc burgers_reconstruct_1.cc burgers_flux_1.cc burgers_rhs_1.cc Boundaries.cc
+SRCS = Startup.cc RegisterSymmetries.cc RegisterMoL.cc burgers_initial_sine.cc burgers_initial_shock.cc burgers_zero_rhs.cc burgers_reconstruct_1.cc burgers_flux_1.cc burgers_rhs_1.cc Boundaries.cc
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-19 23:24:06 +0000