diff options
author | schnetter <> | 2004-03-23 18:43:00 +0000 |
---|---|---|
committer | schnetter <> | 2004-03-23 18:43:00 +0000 |
commit | 88389563d9b6ce32cc77858f0c4fc3c9b18056d8 (patch) | |
tree | 5e17cae379ed6ea24a67466bb7d50b9d425e1dc9 | |
parent | 50d12605c531bda37bb2443168682b4591a8248d (diff) |
Fix indentation
darcs-hash:20040323184359-07bb3-b8806ac99ca55d90d3e8619977a1f1048fd855d6.gz
-rw-r--r-- | Carpet/Carpet/src/Evolve.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/Initialise.cc | 5 | ||||
-rw-r--r-- | Carpet/Carpet/src/Recompose.cc | 8 |
3 files changed, 10 insertions, 7 deletions
diff --git a/Carpet/Carpet/src/Evolve.cc b/Carpet/Carpet/src/Evolve.cc index 15a192ad8..24cf051a7 100644 --- a/Carpet/Carpet/src/Evolve.cc +++ b/Carpet/Carpet/src/Evolve.cc @@ -31,7 +31,7 @@ #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Evolve.cc,v 1.41 2004/03/23 19:30:14 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Evolve.cc,v 1.42 2004/03/23 19:41:11 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Evolve_cc); } @@ -293,7 +293,7 @@ namespace Carpet { // Checking CheckChecksums (cgh, alltimes); - + leave_level_mode (cgh); leave_global_mode (cgh); } // if do_every diff --git a/Carpet/Carpet/src/Initialise.cc b/Carpet/Carpet/src/Initialise.cc index 92ddc9600..afeefa764 100644 --- a/Carpet/Carpet/src/Initialise.cc +++ b/Carpet/Carpet/src/Initialise.cc @@ -12,7 +12,7 @@ #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Initialise.cc,v 1.42 2004/03/23 19:30:14 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Initialise.cc,v 1.43 2004/03/23 19:43:59 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Initialise_cc); } @@ -206,6 +206,7 @@ namespace Carpet { } // for rl + for (int rl=reflevels-1; rl>=0; --rl) { BEGIN_MGLEVEL_LOOP(cgh) { enter_level_mode (cgh, rl); @@ -220,6 +221,8 @@ namespace Carpet { } END_MGLEVEL_LOOP; } // for rl + + for (int rl=0; rl<reflevels; ++rl) { BEGIN_MGLEVEL_LOOP(cgh) { enter_level_mode (cgh, rl); diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc index 673a3ff1b..00a58293c 100644 --- a/Carpet/Carpet/src/Recompose.cc +++ b/Carpet/Carpet/src/Recompose.cc @@ -27,7 +27,7 @@ #include "modes.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Recompose.cc,v 1.60 2004/03/23 19:32:59 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Recompose.cc,v 1.61 2004/03/23 19:41:11 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Recompose_cc); } @@ -508,7 +508,9 @@ namespace Carpet { bvect const newdims = dims.replace(mydim, true); // choose a number of slices for this direction - int const nslices = min(nprocs, (int)floor(mysize * pow(nprocs/allsizes, 1.0/alldims) + 0.5)); + int const nslices + = min(nprocs, + (int)floor(mysize * pow(nprocs/allsizes, 1.0/alldims) + 0.5)); assert (nslices <= nprocs); if (DEBUG) cout << "SRAR " << mydim << " nprocs " << nprocs << endl; if (DEBUG) cout << "SRAR " << mydim << " nslices " << nslices << endl; @@ -622,8 +624,6 @@ namespace Carpet { const int nprocs = CCTK_nProcs(cgh); if (DEBUG) cout << "SRA nprocs " << nprocs << endl; -// if (nprocs==1) return; - // split the processors // nslices: number of disjoint bboxes int const nslices = bbs.size(); |