Merge pull request #6398 from knelli2/reduce_cce_combine_h5

Update ReduceCceWorldtube with new features
sxs-collaboration · Dec 14, 2024 · e7e48dc · e7e48dc
2 parents d02214d + 2fad23b
commit e7e48dc
Show file tree

Hide file tree

Showing 17 changed files with 1,498 additions and 535 deletions.
diff --git a/.github/workflows/DeployStaticExecutables.yaml b/.github/workflows/DeployStaticExecutables.yaml
@@ -57,21 +57,26 @@ jobs:
       - name: Copy CCE executables from the container
         run: >
           mkdir CceExecutables;
-          mkdir ./CceExecutables/ReduceCceWorldtube;
+          mkdir ./CceExecutables/PreprocessCceWorldtube;
           mkdir ./CceExecutables/Tests;
 
           cp ./tests/InputFiles/Cce/CharacteristicExtract.yaml
           ./CceExecutables/CharacteristicExtract.yaml
 
-          cp ./tests/InputFiles/ReduceCceWorldtube/ReduceCceWorldtube.yaml
-          ./CceExecutables/ReduceCceWorldtube/ReduceCceWorldtube.yaml
+          cp
+          ./tests/InputFiles/PreprocessCceWorldtube/PreprocessCceWorldtube.yaml
+          ./CceExecutables/PreprocessCceWorldtube/PreprocessCceWorldtube.yaml
 
           docker cp
           static-execs:/work/spectre/build/bin/CharacteristicExtract
           ./CceExecutables/
 
-          docker cp static-execs:/work/spectre/build/bin/ReduceCceWorldtube
-          ./CceExecutables/ReduceCceWorldtube/
+          docker cp static-execs:/work/spectre/build/bin/PreprocessCceWorldtube
+          ./CceExecutables/PreprocessCceWorldtube/
+
+          docker cp
+          static-execs:/work/spectre/build/bin/WriteCceWorldtubeCoordsToFile
+          ./CceExecutables/PreprocessCceWorldtube/
       - name: Test CCE executable outside of container
         run: |
           mv BondiSachsCceR0200.h5 ./CceExecutables/Tests/

diff --git a/cmake/AddInputFileTests.cmake b/cmake/AddInputFileTests.cmake
@@ -249,6 +249,6 @@ configure_file(
 # These paths should be relative to the input file directory passed to
 # `add_input_file_tests`
 set(INPUT_FILE_WHITELIST
-    "ReduceCceWorldtube/ReduceCceWorldtube.yaml")
+    "PreprocessCceWorldtube/PreprocessCceWorldtube.yaml")
 
 add_input_file_tests("${CMAKE_SOURCE_DIR}/tests/InputFiles/" ${INPUT_FILE_WHITELIST})
diff --git a/containers/Dockerfile.buildenv b/containers/Dockerfile.buildenv
@@ -569,5 +569,6 @@ RUN if [ ${UBUNTU_VERSION} != 18.04 ] && [ "$TARGETARCH" != "amd64" ]; then \
     -D BUILD_DOCS=OFF \
     -D USE_CCACHE=OFF \
     .. \
-    && make ${PARALLEL_MAKE_ARG} CharacteristicExtract ReduceCceWorldtube \
+    && make ${PARALLEL_MAKE_ARG} CharacteristicExtract PreprocessCceWorldtube \
+    WriteCceWorldtubeCoordsToFile \
     && ctest -LE unit -R CharacteristicExtract
diff --git a/docs/Tutorials/CCE.md b/docs/Tutorials/CCE.md
diff --git a/src/Evolution/Systems/Cce/OptionTags.hpp b/src/Evolution/Systems/Cce/OptionTags.hpp
@@ -348,7 +348,7 @@ struct H5WorldtubeBoundaryDataManager : db::SimpleTag {
           "\nDEPRECATION WARNING: Reading worldtube H5 files that are in the "
           "Metric data format (i.e. cartesian components of the metric and "
           "derivs expressed in modal coefficients) is deprecated. Convert your "
-          "data to the Bondi modal format using the 'ReduceCceWorldtube' "
+          "data to the Bondi modal format using the 'PreprocessCceWorldtube' "
           "executable. See https://spectre-code.org/tutorial_cce.html for "
           "details. Support for reading the Metric data format will be "
           "dropped in January 2025.\n");

diff --git a/src/Evolution/Systems/Cce/WorldtubeBufferUpdater.hpp b/src/Evolution/Systems/Cce/WorldtubeBufferUpdater.hpp
@@ -143,7 +143,7 @@ class KleinGordonWorldtubeH5BufferUpdater;
 /*!
  *  \brief Abstract base class for utilities that are able to perform the buffer
  *  updating procedure needed by the `WorldtubeDataManager` or by the
- *  `ReduceCceWorldtube` executable.
+ *  `PreprocessCceWorldtube` executable.
  *
  *  \details The methods that are required to be overridden in the derived
  * classes are:

diff --git a/src/Evolution/Systems/Cce/WorldtubeDataManager.cpp b/src/Evolution/Systems/Cce/WorldtubeDataManager.cpp
@@ -411,7 +411,7 @@ bool BondiWorldtubeDataManager::populate_hypersurface_boundary_data(
       du_r / bondi_r;
 
   // there's only a couple of tags desired by the core computation that aren't
-  // stored in the 'reduced' format, so we perform the remaining computation
+  // stored in the bondi format, so we perform the remaining computation
   // in-line here.
   const auto& du_bondi_j = get(get<Tags::BoundaryValue<Tags::Du<Tags::BondiJ>>>(
       *boundary_data_variables));

diff --git a/src/Evolution/Systems/Cce/WorldtubeDataManager.hpp b/src/Evolution/Systems/Cce/WorldtubeDataManager.hpp
@@ -191,7 +191,7 @@ class MetricWorldtubeDataManager
 };
 
 /*!
- * \brief Manages the 'reduced' cached buffer dataset associated with a CCE
+ * \brief Manages the bondi cached buffer dataset associated with a CCE
  * worldtube and interpolates to requested time points to provide worldtube
  * boundary data to the main evolution routines.
  *

diff --git a/src/Executables/CMakeLists.txt b/src/Executables/CMakeLists.txt
@@ -8,6 +8,6 @@ add_subdirectory(ExportEquationOfStateForRotNS)
 add_subdirectory(Examples)
 add_subdirectory(ExportCoordinates)
 add_subdirectory(ParallelInfo)
-add_subdirectory(ReduceCceWorldtube)
+add_subdirectory(PreprocessCceWorldtube)
 add_subdirectory(TimeStepperSummary)
 add_subdirectory(WriteCceWorldtubeCoordsToFile)
diff --git a/...utables/ReduceCceWorldtube/CMakeLists.txt → ...les/PreprocessCceWorldtube/CMakeLists.txt b/...utables/ReduceCceWorldtube/CMakeLists.txt → ...les/PreprocessCceWorldtube/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Distributed under the MIT License.
 # See LICENSE.txt for details.
 
-set(EXECUTABLE ReduceCceWorldtube)
+set(EXECUTABLE PreprocessCceWorldtube)
 
 add_spectre_executable(
   ${EXECUTABLE}
   EXCLUDE_FROM_ALL
-  ReduceCceWorldtube.cpp
+  PreprocessCceWorldtube.cpp
   )
 
 target_link_libraries(