aboutsummaryrefslogtreecommitdiff
path: root/Carpet/Carpet
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@gmail.com>2012-11-21 12:08:51 -0500
committerErik Schnetter <schnetter@gmail.com>2012-11-22 09:59:16 -0500
commit722ed3ff29b6bf58649c56fac25ac11e8aecb6fd (patch)
tree954c35c74ee7558c2895b11db660941e7c967073 /Carpet/Carpet
parentec25e62821c80cfcdfeb5c6331899df8e655b34c (diff)
Carpet: Simplify code
Diffstat (limited to 'Carpet/Carpet')
-rw-r--r--Carpet/Carpet/src/Storage.cc20
1 files changed, 8 insertions, 12 deletions
diff --git a/Carpet/Carpet/src/Storage.cc b/Carpet/Carpet/src/Storage.cc
index 24ae3394b..4c6ecf49e 100644
--- a/Carpet/Carpet/src/Storage.cc
+++ b/Carpet/Carpet/src/Storage.cc
@@ -399,20 +399,16 @@ namespace Carpet {
check (not CCTK_GroupData (group, & gp));
if (gp.grouptype == CCTK_GF) {
- if (groupdata.AT(group).transport_operator != op_none and
- groupdata.AT(group).transport_operator != op_sync and
- groupdata.AT(group).transport_operator != op_restrict and
- groupdata.AT(group).transport_operator != op_copy)
+ operator_type const op = groupdata.AT(group).transport_operator;
+ if (op != op_none and
+ op != op_sync and
+ op != op_restrict and
+ op != op_copy)
{
- if (groupdata.AT(group).activetimelevels.AT(ml).AT(rl) != 0 and
- (groupdata.AT(group).activetimelevels.AT(ml).AT(rl) <
- prolongation_order_time+1))
- {
+ int const tls = groupdata.AT(group).activetimelevels.AT(ml).AT(rl);
+ if (tls != 0 and tls < prolongation_order_time+1) {
static vector<bool> didwarn;
- int const numgroups = CCTK_NumGroups();
- if ((int)didwarn.size() < numgroups) {
- didwarn.resize (numgroups, false);
- }
+ didwarn.resize (CCTK_NumGroups(), false);
if (not didwarn.AT(group)) {
// Warn only once per group
didwarn.AT(group) = true;