diff options
author | schnetter <> | 2004-08-02 10:18:00 +0000 |
---|---|---|
committer | schnetter <> | 2004-08-02 10:18:00 +0000 |
commit | 43d977a9a7b592d9de812c71655bb60038a73abf (patch) | |
tree | 5f5f224f8d7d91738c3329ba06f97106aee5d672 | |
parent | 663e5a1c93d640e4a4a970d2e046a2275ad5df8a (diff) |
Output GH structure only after all GH extensions has been set up.
darcs-hash:20040802101814-07bb3-f3c7c8f25e6b7d16d0c81c1ab2986097de8d15d2.gz
-rw-r--r-- | Carpet/Carpet/src/Initialise.cc | 16 | ||||
-rw-r--r-- | Carpet/Carpet/src/Recompose.cc | 9 | ||||
-rw-r--r-- | Carpet/Carpet/src/SetupGH.cc | 5 |
3 files changed, 21 insertions, 9 deletions
diff --git a/Carpet/Carpet/src/Initialise.cc b/Carpet/Carpet/src/Initialise.cc index c6eb9576d..fc8cd9626 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.49 2004/08/02 11:43:14 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Initialise.cc,v 1.50 2004/08/02 12:18:14 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Initialise_cc); } @@ -54,6 +54,20 @@ namespace Carpet { + // Output the grid structure + { + // Loop over maps + for (int m=0; m<maps; ++m) { + // Write grid structure to file + OutputGridStructure + (cgh, m, + vhh.at(m)->extents, vhh.at(m)->outer_boundaries, + vhh.at(m)->processors); + } // loop over maps + } + + + BEGIN_MGLEVEL_LOOP(cgh) { do_global_mode = true; do_meta_mode = mglevel==mglevels-1; diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc index c47ac66d4..316b16724 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.68 2004/06/22 13:43:03 hawke Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Recompose.cc,v 1.69 2004/08/02 12:18:14 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Recompose_cc); } @@ -249,17 +249,12 @@ namespace Carpet { // Output only if output is desired if (strcmp(grid_structure_filename, "") == 0) return; - // Get grid hierarchy extentsion from IOUtil + // Get grid hierarchy extention from IOUtil const ioGH * const iogh = (const ioGH *)CCTK_GHExtension (cgh, "IO"); // Output only if IO exists and has been initialised if (! iogh) return; - // FIXME: - // Problems with GH setup order. - // FIXME: (see PR 55) - return; - assert (iogh); // Create the output directory diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc index 783d7d487..70c1480fe 100644 --- a/Carpet/Carpet/src/SetupGH.cc +++ b/Carpet/Carpet/src/SetupGH.cc @@ -24,7 +24,7 @@ #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.82 2004/06/26 12:56:01 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.83 2004/08/02 12:18:14 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_SetupGH_cc); } @@ -560,8 +560,11 @@ namespace Carpet { // Check the regions CheckRegions (bbsss, obss, pss); +#if 0 + // Do this later, because CactusBase/IO might not yet be initialised // Write grid structure to file OutputGridStructure (cgh, m, bbsss, obss, pss); +#endif // Recompose grid hierarchy vhh.at(m)->recompose (bbsss, obss, pss); |