aboutsummaryrefslogtreecommitdiff
path: root/CarpetDev
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@cct.lsu.edu>2006-06-06 22:52:00 +0000
committerErik Schnetter <schnetter@cct.lsu.edu>2006-06-06 22:52:00 +0000
commit66b412c687bb6cf3676e97f1fa59a0b53ae82c1b (patch)
tree94766b3834b64ed4b285916a661b1e04e8b93e7a /CarpetDev
parentb745b5d4a4ea7348e2be2e0770ae0bb54e6ec83d (diff)
CarpetJacobi: Explicitly convert vect<int> to vect<CCTK_REAL>
darcs-hash:20060606225251-dae7b-e7b771597b2c83a67386c36a5c3ef04a62b1cde7.gz
Diffstat (limited to 'CarpetDev')
-rw-r--r--CarpetDev/CarpetJacobi/src/Jacobi.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/CarpetDev/CarpetJacobi/src/Jacobi.cc b/CarpetDev/CarpetJacobi/src/Jacobi.cc
index 7a01b0f49..c276cd4f7 100644
--- a/CarpetDev/CarpetJacobi/src/Jacobi.cc
+++ b/CarpetDev/CarpetJacobi/src/Jacobi.cc
@@ -204,8 +204,8 @@ namespace CarpetJacobi {
for (int m=0; m<maps; ++m) {
vtt[m]->set_time (reflevel, mglevel, 0);
vtt[m]->set_delta
- (reflevel, mglevel, 1.0 / ipow (maxval (spacereflevelfact),
- reflevelpower));
+ (reflevel, mglevel,
+ 1.0 / ipow (maxval (spacereflevelfact), reflevelpower));
}
} END_REFLEVEL_LOOP;
@@ -230,14 +230,14 @@ namespace CarpetJacobi {
const int icoarsestep
= ipow (mglevelfact * maxval (maxspacereflevelfact), reflevelpower);
const int istep
- = ipow (mglevelfact * maxval (maxspacereflevelfact
- / spacereffacts.at(solve_level)),
+ = ipow (mglevelfact
+ * maxval (maxspacereflevelfact / spacereffacts.at(solve_level)),
reflevelpower);
int iter = istep;
for (;; iter+=istep) {
- global_time = 1.0 * iter / ipow (maxval (maxspacereflevelfact),
- reflevelpower);
+ global_time
+ = 1.0 * iter / ipow (maxval (maxspacereflevelfact), reflevelpower);
* const_cast<CCTK_REAL *> (& cctkGH->cctk_time) = global_time;
if (DEBUG) cout << "CJ global iter " << iter << " time " << global_time << flush << endl;