aboutsummaryrefslogtreecommitdiff
path: root/Carpet/CarpetInterp2/src/fasterp.hh
diff options
context:
space:
mode:
Diffstat (limited to 'Carpet/CarpetInterp2/src/fasterp.hh')
-rw-r--r--Carpet/CarpetInterp2/src/fasterp.hh16
1 files changed, 9 insertions, 7 deletions
diff --git a/Carpet/CarpetInterp2/src/fasterp.hh b/Carpet/CarpetInterp2/src/fasterp.hh
index 393fd5144..1a58e8222 100644
--- a/Carpet/CarpetInterp2/src/fasterp.hh
+++ b/Carpet/CarpetInterp2/src/fasterp.hh
@@ -38,7 +38,7 @@ namespace CarpetInterp2 {
static int components;
static void determine_mrc_info ();
- static int get_max_ind ()
+ static int get_max_ind () CCTK_ATTRIBUTE_PURE
{
return maps * reflevels * components;
}
@@ -63,12 +63,12 @@ namespace CarpetInterp2 {
mrc_t (int ind);
// Convert a mrc into an integer index
- int get_ind () const
+ int get_ind () const CCTK_ATTRIBUTE_PURE
{
return c + components * (rl + reflevels * m);
}
- bool operator== (mrc_t const & a) const
+ bool operator== (mrc_t const & a) const CCTK_ATTRIBUTE_PURE
{
return m == a.m and rl == a.rl and c == a.c;
}
@@ -116,7 +116,7 @@ namespace CarpetInterp2 {
coords[d].resize(n);
}
}
- size_t size () const { return coords[0].size(); }
+ size_t size () const CCTK_ATTRIBUTE_PURE { return coords[0].size(); }
};
// A local location, given by map and local coordinates
@@ -130,7 +130,7 @@ namespace CarpetInterp2 {
coords[d].resize(n);
}
}
- size_t size () const { return maps.size(); }
+ size_t size () const CCTK_ATTRIBUTE_PURE { return maps.size(); }
};
// An integer location, given by map, refinement level, and
@@ -146,7 +146,7 @@ namespace CarpetInterp2 {
int ind3d; // closest grid point
rvect offset; // in terms of grid points
- static MPI_Datatype mpi_datatype ();
+ static MPI_Datatype mpi_datatype () CCTK_ATTRIBUTE_CONST;
void output (ostream& os) const;
};
@@ -277,6 +277,8 @@ namespace CarpetInterp2 {
send_descr_t send_descr;
int order;
+ int regridding_epoch;
+
void
setup (cGH const * restrict cctkGH,
fasterp_llocs_t const & locations);
@@ -300,7 +302,7 @@ namespace CarpetInterp2 {
size_t
get_npoints ()
- const
+ const CCTK_ATTRIBUTE_PURE
{
return recv_descr.npoints;
}