aboutsummaryrefslogtreecommitdiff
path: root/Carpet/Carpet/src
diff options
context:
space:
mode:
Diffstat (limited to 'Carpet/Carpet/src')
-rw-r--r--Carpet/Carpet/src/Cycle.cc36
-rw-r--r--Carpet/Carpet/src/Storage.cc48
-rw-r--r--Carpet/Carpet/src/helpers.cc2
-rw-r--r--Carpet/Carpet/src/modes.cc7
4 files changed, 51 insertions, 42 deletions
diff --git a/Carpet/Carpet/src/Cycle.cc b/Carpet/Carpet/src/Cycle.cc
index 64b7ff25b..449a5a7b3 100644
--- a/Carpet/Carpet/src/Cycle.cc
+++ b/Carpet/Carpet/src/Cycle.cc
@@ -82,11 +82,13 @@ namespace Carpet {
{
int const varindex = firstvarindex + var;
for (int tl=0; tl<numtimelevels; ++tl) {
- cctkGH->data[varindex][tl]
- = (tl < groupdata.AT(group).info.activetimelevels
- ? ((*arrdata.AT(group).AT(0).data.AT(var))
- (tl, 0, 0, 0)->storage())
- : NULL);
+ if (tl < groupdata.AT(group).info.activetimelevels) {
+ ggf *const ff = arrdata.AT(group).AT(0).data.AT(var);
+ void *const ptr = ff->data_pointer(tl, 0, 0, 0)->storage();
+ cctkGH->data[varindex][tl] = ptr;
+ } else {
+ cctkGH->data[varindex][tl] = NULL;
+ }
}
}
}
@@ -148,11 +150,13 @@ namespace Carpet {
{
int const varindex = firstvarindex + var;
for (int tl=0; tl<numtimelevels; ++tl) {
- cctkGH->data[varindex][tl]
- = (tl < groupdata.AT(group).info.activetimelevels
- ? ((*arrdata.AT(group).AT(0).data.AT(var))
- (tl, 0, 0, 0)->storage())
- : NULL);
+ if (tl < groupdata.AT(group).info.activetimelevels) {
+ ggf *const ff = arrdata.AT(group).AT(0).data.AT(var);
+ void *const ptr = ff->data_pointer(tl, 0, 0, 0)->storage();
+ cctkGH->data[varindex][tl] = ptr;
+ } else {
+ cctkGH->data[varindex][tl] = NULL;
+ }
}
}
}
@@ -205,11 +209,13 @@ namespace Carpet {
{
int const varindex = firstvarindex + var;
for (int tl=0; tl<numtimelevels; ++tl) {
- cctkGH->data[varindex][tl]
- = (tl < groupdata.AT(group).info.activetimelevels
- ? ((*arrdata.AT(group).AT(0).data.AT(var))
- (tl, 0, 0, 0)->storage())
- : NULL);
+ if (tl < groupdata.AT(group).info.activetimelevels) {
+ ggf *const ff = arrdata.AT(group).AT(0).data.AT(var);
+ void *const ptr = ff->data_pointer(tl, 0, 0, 0)->storage();
+ cctkGH->data[varindex][tl] = ptr;
+ } else {
+ cctkGH->data[varindex][tl] = NULL;
+ }
}
}
}
diff --git a/Carpet/Carpet/src/Storage.cc b/Carpet/Carpet/src/Storage.cc
index 5503936c8..2ebb4fc81 100644
--- a/Carpet/Carpet/src/Storage.cc
+++ b/Carpet/Carpet/src/Storage.cc
@@ -21,7 +21,7 @@ namespace Carpet {
static int
- GroupStorageCrease (const cGH* cgh, int n_groups, const int* groups,
+ GroupStorageCrease (const cGH* cctkGH, int n_groups, const int* groups,
const int* tls, int* status,
const bool inc);
@@ -33,13 +33,13 @@ namespace Carpet {
int
- GroupStorageCrease (const cGH* cgh, int n_groups, const int* groups,
+ GroupStorageCrease (const cGH* cctkGH, int n_groups, const int* groups,
const int* tls, int* status,
const bool inc)
{
DECLARE_CCTK_PARAMETERS;
- assert (cgh);
+ assert (cctkGH);
assert (n_groups >= 0);
assert (groups);
assert (tls);
@@ -184,11 +184,13 @@ namespace Carpet {
if (gp.grouptype != CCTK_GF) {
assert (rl==0 and m==0);
for (int tl=0; tl<gp.numtimelevels; ++tl) {
- cgh->data[varindex][tl]
- = (tl < groupdata.AT(group).activetimelevels.AT(ml).AT(rl)
- ? ((*arrdata.AT(group).AT(m).data.AT(var))
- (tl, 0, 0, 0)->storage())
- : NULL);
+ if (tl < groupdata.AT(group).activetimelevels.AT(ml).AT(rl)) {
+ ggf *const ff = arrdata.AT(group).AT(0).data.AT(var);
+ void *const ptr = ff->data_pointer(tl, 0, 0, 0)->storage();
+ cctkGH->data[varindex][tl] = ptr;
+ } else {
+ cctkGH->data[varindex][tl] = NULL;
+ }
}
} // if grouptype != GF
@@ -198,7 +200,7 @@ namespace Carpet {
} // if really change the number of active time levels
// Complain if there are not enough active time levels
- GroupStorageCheck (cgh, group, ml, rl);
+ GroupStorageCheck (cctkGH, group, ml, rl);
// Record current number of time levels
// Note: This adds the time levels of all refinement levels
@@ -218,7 +220,7 @@ namespace Carpet {
int
- GroupStorageIncrease (const cGH* cgh, int n_groups, const int* groups,
+ GroupStorageIncrease (const cGH* cctkGH, int n_groups, const int* groups,
const int* tls, int* status)
{
DECLARE_CCTK_PARAMETERS
@@ -227,13 +229,13 @@ namespace Carpet {
Checkpoint ("GroupStorageIncrease");
}
return
- GroupStorageCrease (cgh, n_groups, groups, tls, status, true);
+ GroupStorageCrease (cctkGH, n_groups, groups, tls, status, true);
}
int
- GroupStorageDecrease (const cGH* cgh, int n_groups, const int* groups,
+ GroupStorageDecrease (const cGH* cctkGH, int n_groups, const int* groups,
const int* tls, int* status)
{
DECLARE_CCTK_PARAMETERS
@@ -242,19 +244,19 @@ namespace Carpet {
Checkpoint ("GroupStorageDecrease");
}
return
- GroupStorageCrease (cgh, n_groups, groups, tls, status, false);
+ GroupStorageCrease (cctkGH, n_groups, groups, tls, status, false);
}
int
- EnableGroupStorage (const cGH* cgh, const char* groupname)
+ EnableGroupStorage (const cGH* cctkGH, const char* groupname)
{
const int group = CCTK_GroupIndex(groupname);
assert (group>=0 and group<CCTK_NumGroups());
const int tls = CCTK_MaxTimeLevelsGI(group);
int status;
- GroupStorageIncrease (cgh, 1, &group, &tls, &status);
+ GroupStorageIncrease (cctkGH, 1, &group, &tls, &status);
// Return whether storage was allocated previously
return status;
}
@@ -262,13 +264,13 @@ namespace Carpet {
int
- DisableGroupStorage (const cGH* cgh, const char* groupname)
+ DisableGroupStorage (const cGH* cctkGH, const char* groupname)
{
const int group = CCTK_GroupIndex(groupname);
assert (group>=0 and group<CCTK_NumGroups());
const int tls = 0;
int status;
- GroupStorageDecrease (cgh, 1, &group, &tls, &status);
+ GroupStorageDecrease (cctkGH, 1, &group, &tls, &status);
// Return whether storage was allocated previously
return status;
}
@@ -276,7 +278,7 @@ namespace Carpet {
int
- QueryGroupStorageB (const cGH* cgh, int group, const char* groupname)
+ QueryGroupStorageB (const cGH* cctkGH, int group, const char* groupname)
{
DECLARE_CCTK_PARAMETERS;
if (groupname) {
@@ -301,7 +303,7 @@ namespace Carpet {
const int*
- ArrayGroupSizeB (const cGH* cgh, int dir, int group, const char* groupname)
+ ArrayGroupSizeB (const cGH* cctkGH, int dir, int group, const char* groupname)
{
static const int zero = 0;
static const int error = 0;
@@ -323,7 +325,7 @@ namespace Carpet {
const int gpdim = groupdata.AT(group).info.dim;
assert (dir>=0 and dir<gpdim);
- if (CCTK_QueryGroupStorageI(cgh, group)) {
+ if (CCTK_QueryGroupStorageI(cctkGH, group)) {
return &groupdata.AT(group).info.lsh[dir];
@@ -337,7 +339,7 @@ namespace Carpet {
- int GroupDynamicData (const cGH* cgh, int group, cGroupDynamicData* data)
+ int GroupDynamicData (const cGH* cctkGH, int group, cGroupDynamicData* data)
{
// Return values:
// 0 for success
@@ -345,10 +347,10 @@ namespace Carpet {
// -3 if given GH pointer is invalid
// (-77 if group has zero variables)
// -78 if group does not exist
- if (not cgh) return -3;
+ if (not cctkGH) return -3;
if (not (group>=0 and group<CCTK_NumGroups())) return -78;
if (not data) return -1;
- assert (cgh);
+ assert (cctkGH);
assert (group>=0 and group<CCTK_NumGroups());
assert (data);
*data = groupdata.AT(group).info;
diff --git a/Carpet/Carpet/src/helpers.cc b/Carpet/Carpet/src/helpers.cc
index ccf5f71cc..760558368 100644
--- a/Carpet/Carpet/src/helpers.cc
+++ b/Carpet/Carpet/src/helpers.cc
@@ -124,7 +124,7 @@ namespace Carpet {
int const lc = arrdata.AT(groupindex).AT(m).hh->get_local_component(rl, c);
assert (lc >= 0 and
lc < arrdata.AT(groupindex).AT(m).hh->local_components(rl));
- gdata * const data = (*ff) (tl, rl, lc, mglevel);
+ gdata * const data = ff->data_pointer (tl, rl, lc, mglevel);
return data->storage();
} else {
return NULL;
diff --git a/Carpet/Carpet/src/modes.cc b/Carpet/Carpet/src/modes.cc
index ec26ada6a..b5c9a9fb6 100644
--- a/Carpet/Carpet/src/modes.cc
+++ b/Carpet/Carpet/src/modes.cc
@@ -197,7 +197,7 @@ namespace Carpet {
for (int tl=0; tl<max_tl; ++tl) {
if (ff and tl<active_tl) {
int const lc = 0;
- gdata * const data = (*ff) (tl, rl, lc, ml);
+ gdata * const data = ff->data_pointer (tl, rl, lc, ml);
assert (data);
cctkGH->data[firstvar+var][tl] = data->storage();
} else {
@@ -622,7 +622,7 @@ namespace Carpet {
int available_tl;
int tl_offset;
if (active_tl == 0) {
- // gropu has no storage
+ // group has no storage
available_tl = active_tl;
tl_offset = 0;
} else if (do_allow_past_timelevels) {
@@ -650,7 +650,8 @@ namespace Carpet {
for (int tl=0; tl<max_tl; ++tl) {
if (ff and tl<available_tl) {
gdata * const data =
- (*ff) (tl_offset+tl, reflevel, local_component, mglevel);
+ ff->data_pointer
+ (tl_offset+tl, reflevel, local_component, mglevel);
assert (data);
cctkGH->data[firstvar+var][tl] = data->storage();
} else {
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 11:56:48 +0000