diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2006-09-04 22:59:00 +0000 |
|---|---|---|
| committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2006-09-04 22:59:00 +0000 |
| commit | 5b8caf5027e55fbad8e4413211735b6ffbc1ae52 (patch) | |
| tree | 58311c0781ce28a253e48f14bdb5cddfc3908aa9 /Carpet | |
| parent | e512706ad6234c44bb4294dfd6c2baeaa2fd2b5c (diff) | |
Carpet: Split calls to recompose into calls to both regid and recompose
darcs-hash:20060904225931-dae7b-011a4c7be7a93d2cd203c2c74aac46893f9eb941.gz
Diffstat (limited to 'Carpet')
| -rw-r--r-- | Carpet/Carpet/src/Recompose.cc | 5 | ||||
| -rw-r--r-- | Carpet/Carpet/src/SetupGH.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc index 0fbc7d07d..43cd7c7a5 100644 --- a/Carpet/Carpet/src/Recompose.cc +++ b/Carpet/Carpet/src/Recompose.cc @@ -228,7 +228,10 @@ namespace Carpet { // not change // Recompose - vhh.at(m)->recompose (bbsss, obss, pss, do_init); + vhh.at(m)->regrid (bbsss, obss, pss); + for (int rl=0; rl<vhh.at(m)->reflevels(); ++rl) { + vhh.at(m)->recompose (rl, do_init); + } CCTK_VInfo (CCTK_THORNSTRING, "Done recomposing the grid hierarchy for map %d.", m); diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc index 04619ddac..679267864 100644 --- a/Carpet/Carpet/src/SetupGH.cc +++ b/Carpet/Carpet/src/SetupGH.cc @@ -516,7 +516,8 @@ namespace Carpet { #endif // Recompose grid hierarchy - vhh.at(m)->recompose (bbssss.at(m), obsss.at(m), psss.at(m), false); + vhh.at(m)->regrid (bbssss.at(m), obsss.at(m), psss.at(m)); + vhh.at(m)->recompose (0, false); } print_grid_structure (vhh); @@ -1412,7 +1413,8 @@ namespace Carpet { char * const groupname = CCTK_GroupName (group); assert (groupname); Checkpoint ("Recomposing grid array group \"%s\"...", groupname); - arrdata.at(group).at(0).hh->recompose (bbsss, obss, pss, false); + arrdata.at(group).at(0).hh->regrid (bbsss, obss, pss); + arrdata.at(group).at(0).hh->recompose (0, false); Checkpoint ("Done recomposing grid array group \"%s\".", groupname); free (groupname); } |