aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@cct.lsu.edu>2010-02-17 16:23:31 -0800
committerBarry Wardell <barry.wardell@gmail.com>2011-12-14 16:45:30 +0000
commit2a9f7b4c346ceb224374aa8009c9bbc6ed073f1f (patch)
tree2b96853e90a8abb6c9a193f5b4bffc2d02ad4c93
parent9d058d06b18ec9ada3043b0972b6f0356cf419b8 (diff)
Carpet: Make whitespace look nicer
-rw-r--r--Carpet/Carpet/src/SetupGH.cc4
-rw-r--r--Carpet/Carpet/src/modes.cc24
-rw-r--r--Carpet/Carpet/src/variables.cc2
3 files changed, 14 insertions, 16 deletions
diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc
index bf96beaeb..af5f13422 100644
--- a/Carpet/Carpet/src/SetupGH.cc
+++ b/Carpet/Carpet/src/SetupGH.cc
@@ -1068,11 +1068,11 @@ namespace Carpet {
// Current state
mglevelfact = 1;
- cctkGH->cctk_time = 0.0;
+ cctkGH->cctk_time = 0.0;
cctkGH->cctk_delta_time = 1.0;
for (int d=0; d<dim; ++d) {
cctkGH->cctk_origin_space[d] = 0.0;
- cctkGH->cctk_delta_space[d] = 1.0;
+ cctkGH->cctk_delta_space [d] = 1.0;
}
// Set up things as if in local mode
diff --git a/Carpet/Carpet/src/modes.cc b/Carpet/Carpet/src/modes.cc
index 12f574a71..68db7beaa 100644
--- a/Carpet/Carpet/src/modes.cc
+++ b/Carpet/Carpet/src/modes.cc
@@ -98,7 +98,7 @@ namespace Carpet {
// Set space delta
for (int d=0; d<dim; ++d) {
cctkGH->cctk_origin_space[d] = origin_space.AT(0).AT(mglevel)[d];
- cctkGH->cctk_delta_space[d] = delta_space.AT(0)[d] * mglevelfact;
+ cctkGH->cctk_delta_space [d] = delta_space.AT(0)[d] * mglevelfact;
}
}
@@ -232,7 +232,7 @@ namespace Carpet {
origin_space.AT(0).AT(mglevel)[d] = cctkGH->cctk_origin_space[d];
delta_space.AT(mglevel)[d] = cctkGH->cctk_delta_space[d] / mglevelfact;
cctkGH->cctk_origin_space[d] = -424242.0;
- cctkGH->cctk_delta_space[d] = -424242.0;
+ cctkGH->cctk_delta_space [d] = -424242.0;
}
}
@@ -249,10 +249,10 @@ namespace Carpet {
// ivect_ref(info.nghostzones) = deadbeef;
ivect_ref(info.nghostzones)
= arrdata.AT(group).AT(m).dd->ghost_widths.AT(0)[0];
- ivect_ref(info.gsh) = deadbeef;
+ ivect_ref(info.gsh) = deadbeef;
ivect_ref(info.lbnd) = -deadbeef;
ivect_ref(info.ubnd) = deadbeef;
- ivect_ref(info.lsh) = deadbeef;
+ ivect_ref(info.lsh) = deadbeef;
for (int d=0; d<dim; ++d) {
const_cast<int*>(info.bbox)[2*d ] = deadbeef;
const_cast<int*>(info.bbox)[2*d+1] = deadbeef;
@@ -415,7 +415,7 @@ namespace Carpet {
// Set space delta
for (int d=0; d<dim; ++d) {
cctkGH->cctk_origin_space[d] = origin_space.AT(map).AT(mglevel)[d];
- cctkGH->cctk_delta_space[d] = delta_space.AT(map)[d] * mglevelfact;
+ cctkGH->cctk_delta_space [d] = delta_space.AT(map)[d] * mglevelfact;
}
}
@@ -473,20 +473,20 @@ namespace Carpet {
// Unset space delta
for (int d=0; d<dim; ++d) {
cctkGH->cctk_origin_space[d] = -424242.0;
- cctkGH->cctk_delta_space[d] = -424242.0;
+ cctkGH->cctk_delta_space [d] = -424242.0;
}
}
// Unset grid shape
- ivect_ref(cctkGH->cctk_levoff) = deadbeef;
+ ivect_ref(cctkGH->cctk_levoff ) = deadbeef;
ivect_ref(cctkGH->cctk_levoffdenom) = 0;
- ivect_ref(cctkGH->cctk_gsh) = deadbeef;
+ ivect_ref(cctkGH->cctk_gsh ) = deadbeef;
ivect_ref(cctkGH->cctk_nghostzones) = deadbeef;
for (int group=0; group<CCTK_NumGroups(); ++group) {
if (CCTK_GroupTypeI(group) == CCTK_GF) {
cGroupDynamicData & info = groupdata.AT(group).info;
- ivect_ref(info.gsh) = ivect_ref(cctkGH->cctk_gsh);
+ ivect_ref(info.gsh ) = ivect_ref(cctkGH->cctk_gsh );
ivect_ref(info.nghostzones) = ivect_ref(cctkGH->cctk_nghostzones);
}
}
@@ -541,7 +541,6 @@ namespace Carpet {
(ext.lower() - baseext.lower()) / ext.stride();
ivect_ref(cctkGH->cctk_ubnd) =
(ext.upper() - baseext.lower()) / ext.stride();
-
ivect_ref(cctkGH->cctk_lsh) = gdata::allocated_memory_shape (ext);
for (int d=0; d<dim; ++d) {
@@ -658,9 +657,8 @@ namespace Carpet {
ivect_ref(cctkGH->cctk_lbnd) = -deadbeef;
ivect_ref(cctkGH->cctk_ubnd) = deadbeef;
ivect_ref(cctkGH->cctk_from) = -deadbeef;
- ivect_ref(cctkGH->cctk_to) = deadbeef;
-
- ivect_ref(cctkGH->cctk_lsh) = deadbeef;
+ ivect_ref(cctkGH->cctk_to ) = deadbeef;
+ ivect_ref(cctkGH->cctk_lsh ) = deadbeef;
for (int d=0; d<dim; ++d) {
cctkGH->cctk_bbox[2*d ] = deadbeef;
diff --git a/Carpet/Carpet/src/variables.cc b/Carpet/Carpet/src/variables.cc
index 0bf834ff4..0198a6018 100644
--- a/Carpet/Carpet/src/variables.cc
+++ b/Carpet/Carpet/src/variables.cc
@@ -111,7 +111,7 @@ namespace Carpet {
vector<dh*> vdd; // [map]
vector<th*> vtt; // [map]
int regridding_epoch;
-
+
// Data for the groups
vector<groupdesc> groupdata; // [group]