From 2fad23bda0842594b30c7daca97f38961756e945 Mon Sep 17 00:00:00 2001 From: Kyle Nelli Date: Mon, 9 Dec 2024 16:55:10 -0800 Subject: [PATCH] Rename ReduceCceWorldtube to PreprocessCceWorldtube --- .../workflows/DeployStaticExecutables.yaml | 13 +-- cmake/AddInputFileTests.cmake | 2 +- containers/Dockerfile.buildenv | 2 +- docs/Tutorials/CCE.md | 18 ++--- src/Evolution/Systems/Cce/OptionTags.hpp | 2 +- .../Systems/Cce/WorldtubeBufferUpdater.hpp | 2 +- .../Systems/Cce/WorldtubeDataManager.cpp | 2 +- .../Systems/Cce/WorldtubeDataManager.hpp | 2 +- src/Executables/CMakeLists.txt | 2 +- .../CMakeLists.txt | 4 +- .../PreprocessCceWorldtube.cpp} | 2 +- .../PreprocessCceWorldtube.yaml} | 4 +- .../Systems/Cce/Test_WorldtubeData.cpp | 79 +++++++++---------- tests/Unit/Executables/CMakeLists.txt | 14 ++-- ...be.cpp => Test_PreprocessCceWorldtube.cpp} | 14 ++-- 15 files changed, 80 insertions(+), 82 deletions(-) rename src/Executables/{ReduceCceWorldtube => PreprocessCceWorldtube}/CMakeLists.txt (85%) rename src/Executables/{ReduceCceWorldtube/ReduceCceWorldtube.cpp => PreprocessCceWorldtube/PreprocessCceWorldtube.cpp} (99%) rename tests/InputFiles/{ReduceCceWorldtube/ReduceCceWorldtube.yaml => PreprocessCceWorldtube/PreprocessCceWorldtube.yaml} (71%) rename tests/Unit/Executables/{Test_ReduceCceWorldtube.cpp => Test_PreprocessCceWorldtube.cpp} (98%) diff --git a/.github/workflows/DeployStaticExecutables.yaml b/.github/workflows/DeployStaticExecutables.yaml index 2bcfba6a7a3e..12a88342d55e 100644 --- a/.github/workflows/DeployStaticExecutables.yaml +++ b/.github/workflows/DeployStaticExecutables.yaml @@ -57,25 +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/ReduceCceWorldtube/ + ./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 index 91b1a464a54d..961ee5519fff 100644 --- 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 index 2fbed649f086..ef035548a88e 100644 --- a/containers/Dockerfile.buildenv +++ b/containers/Dockerfile.buildenv @@ -569,6 +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 index 7ef5616ae6b1..644ef13ffa82 100644 --- a/docs/Tutorials/CCE.md +++ b/docs/Tutorials/CCE.md @@ -24,12 +24,12 @@ release). Inside this tarball is - an example set of Bondi-Sachs worldtube data in the `Tests/` directory (see [Input worldtube data formats](#input_worldtube_data_format) section) - example output from CCE in the `Tests/` directory -- a `ReduceCceWorldtube` executable and YAML file for converting between +- a `PreprocessCceWorldtube` executable and YAML file for converting between [worldtube data formats](#input_worldtube_data_format) in the - `ReduceCceWorldtube/` diretory + `PreprocessCceWorldtube/` diretory - a `WriteCceWorldtubeCoordsToFile` executable that writes [grid points on a sphere](#spherical_nodes) to a text file in the - `ReduceCceWorldtube/` directory + `PreprocessCceWorldtube/` directory - a python script `CheckCceOutput.py` (meant to be run from the root of the tarball and after you run the example YAML input file also in the root of the tarball) that will check if the example output is correct @@ -156,7 +156,7 @@ for compatibility with worldtube data from the SXS Collaboration's SpEC code. Unless you are using worldtube data that was generated from SpECTRE (or SpEC), it's possible that your worldtube data is not in the correct format. We allow conversion into our data format from a few other data formats using the -[`ReduceCceWorldtube` executable provided](#acquiring_the_cce_module). These are +[`PreprocessCceWorldtube` executable provided](#acquiring_the_cce_module). These are - Nodal cartesian metric data (which we refer to as "metric nodal") - Modal cartesian metric data (which we refer to as "metric modal") @@ -256,23 +256,23 @@ If you already have data in the [required "bondi modal" format](#required_h5_worldtube_data_format), then nothing needs to be done. -#### Running the ReduceCceWorldtube executable +#### Running the PreprocessCceWorldtube executable -The `ReduceCceWorldtube` executable should be run on any of the +The `PreprocessCceWorldtube` executable should be run on any of the [allowed input formats](#converting_worldtube_data), and will produce a corresponding Bondi-Sachs worldtube file that can be read in by CCE. This executable works similarly to our other executables by accepting a YAML input file: ``` -ReduceCceWorldtube --input-file ReduceCceWorldtube.yaml +PreprocessCceWorldtube --input-file PreprocessCceWorldtube.yaml ``` with a YAML file -\snippet ReduceCceWorldtube.yaml reduce_cce_worldtube_yaml_doxygen_example +\snippet PreprocessCceWorldtube.yaml preprocess_cce_worldtube_yaml_doxygen_example -In addition to converting worldtube data formats, `ReduceCceWorldtube` also +In addition to converting worldtube data formats, `PreprocessCceWorldtube` also accepts multiple input worldtube H5 files that have sequential times (e.g. from different checkpoints) and will combine the times from all H5 files alongside converting the worldtube data format. If there are duplicate or overlapping diff --git a/src/Evolution/Systems/Cce/OptionTags.hpp b/src/Evolution/Systems/Cce/OptionTags.hpp index 960d841c0746..7a1723a5fe95 100644 --- 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 index 1b2c698068d7..41c0cd143e74 100644 --- 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 index 7d71582b6ef9..da2a897dc352 100644 --- 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>>( *boundary_data_variables)); diff --git a/src/Evolution/Systems/Cce/WorldtubeDataManager.hpp b/src/Evolution/Systems/Cce/WorldtubeDataManager.hpp index da9288b3239d..745b4f7bb245 100644 --- 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 index d7cfdbdfd98c..3d66de9584df 100644 --- 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/src/Executables/ReduceCceWorldtube/CMakeLists.txt b/src/Executables/PreprocessCceWorldtube/CMakeLists.txt similarity index 85% rename from src/Executables/ReduceCceWorldtube/CMakeLists.txt rename to src/Executables/PreprocessCceWorldtube/CMakeLists.txt index 5fd6a312f648..8d71f4dfb81f 100644 --- a/src/Executables/ReduceCceWorldtube/CMakeLists.txt +++ b/src/Executables/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( diff --git a/src/Executables/ReduceCceWorldtube/ReduceCceWorldtube.cpp b/src/Executables/PreprocessCceWorldtube/PreprocessCceWorldtube.cpp similarity index 99% rename from src/Executables/ReduceCceWorldtube/ReduceCceWorldtube.cpp rename to src/Executables/PreprocessCceWorldtube/PreprocessCceWorldtube.cpp index 80c4017f67f9..cc50206830ba 100644 --- a/src/Executables/ReduceCceWorldtube/ReduceCceWorldtube.cpp +++ b/src/Executables/PreprocessCceWorldtube/PreprocessCceWorldtube.cpp @@ -656,7 +656,7 @@ int main(int argc, char** argv) { ERROR_NO_TRACE( "Only a single input H5 file was supplied and the input data " "format is BondiModal. This means that no combination needs to be " - "done and running ReduceCceWorldtube is unnecessary."); + "done and running PreprocessCceWorldtube is unnecessary."); } if (tuples::get(inputs) and diff --git a/tests/InputFiles/ReduceCceWorldtube/ReduceCceWorldtube.yaml b/tests/InputFiles/PreprocessCceWorldtube/PreprocessCceWorldtube.yaml similarity index 71% rename from tests/InputFiles/ReduceCceWorldtube/ReduceCceWorldtube.yaml rename to tests/InputFiles/PreprocessCceWorldtube/PreprocessCceWorldtube.yaml index 63571caa9cb4..6ada009c7da5 100644 --- a/tests/InputFiles/ReduceCceWorldtube/ReduceCceWorldtube.yaml +++ b/tests/InputFiles/PreprocessCceWorldtube/PreprocessCceWorldtube.yaml @@ -1,7 +1,7 @@ # Distributed under the MIT License. # See LICENSE.txt for details. -# [reduce_cce_worldtube_yaml_doxygen_example] +# [preprocess_cce_worldtube_yaml_doxygen_example] InputH5File: InputFilename.h5 OutputH5File: ReducedWorldtubeR0292.h5 InputDataFormat: MetricModal @@ -9,4 +9,4 @@ ExtractionRadius: 292 FixSpecNormalization: False BufferDepth: Auto LMaxFactor: 3 -# [reduce_cce_worldtube_yaml_doxygen_example] +# [preprocess_cce_worldtube_yaml_doxygen_example] diff --git a/tests/Unit/Evolution/Systems/Cce/Test_WorldtubeData.cpp b/tests/Unit/Evolution/Systems/Cce/Test_WorldtubeData.cpp index f4a4f665e11e..ec1e8c84ae54 100644 --- a/tests/Unit/Evolution/Systems/Cce/Test_WorldtubeData.cpp +++ b/tests/Unit/Evolution/Systems/Cce/Test_WorldtubeData.cpp @@ -234,7 +234,7 @@ class DummyBufferUpdater // NOLINT }; template -class ReducedDummyBufferUpdater +class BondiBufferUpdater : public WorldtubeBufferUpdater, Tags::worldtube_boundary_tags_for_writing< @@ -247,13 +247,13 @@ class ReducedDummyBufferUpdater Spectral::Swsh::Tags::SwshTransform>, Tags::worldtube_boundary_tags_for_writing>; - ReducedDummyBufferUpdater() = default; - ReducedDummyBufferUpdater(DataVector time_buffer, - const gr::Solutions::KerrSchild& solution, - const std::optional extraction_radius, - const double coordinate_amplitude, - const double coordinate_frequency, - const size_t l_max, const bool /*unused*/ = false) + BondiBufferUpdater() = default; + BondiBufferUpdater(DataVector time_buffer, + const gr::Solutions::KerrSchild& solution, + const std::optional extraction_radius, + const double coordinate_amplitude, + const double coordinate_frequency, const size_t l_max, + const bool /*unused*/ = false) : time_buffer_{std::move(time_buffer)}, solution_{solution}, extraction_radius_{extraction_radius}, @@ -263,9 +263,9 @@ class ReducedDummyBufferUpdater // NOLINTNEXTLINE WRAPPED_PUPable_decl_base_template(WorldtubeBufferUpdater, - ReducedDummyBufferUpdater); + BondiBufferUpdater); - explicit ReducedDummyBufferUpdater(CkMigrateMessage* /*unused*/) {} + explicit BondiBufferUpdater(CkMigrateMessage* /*unused*/) {} double update_buffers_for_time( const gsl::not_null*> buffers, @@ -358,7 +358,7 @@ class ReducedDummyBufferUpdater } std::unique_ptr> get_clone() const override { - return std::make_unique(*this); + return std::make_unique(*this); } bool time_is_outside_range(const double time) const override { @@ -413,16 +413,16 @@ class ReducedDummyBufferUpdater template PUP::able::PUP_ID Cce::DummyBufferUpdater::my_PUP_ID = 0; // NOLINT template -PUP::able::PUP_ID Cce::ReducedDummyBufferUpdater::my_PUP_ID = 0; // NOLINT +PUP::able::PUP_ID Cce::BondiBufferUpdater::my_PUP_ID = 0; // NOLINT template class Cce::DummyBufferUpdater; template class Cce::DummyBufferUpdater; -template class Cce::ReducedDummyBufferUpdater; +template class Cce::BondiBufferUpdater; namespace { template -void test_data_manager_with_dummy_buffer_updater( +void test_data_manager_with_bondi_buffer_updater( const gsl::not_null gen, const bool apply_normalization_bug = false, const bool is_spec_input = true, const std::optional extraction_radius = std::nullopt) { @@ -545,7 +545,7 @@ void test_data_manager_with_dummy_buffer_updater( } template -void test_spec_worldtube_buffer_updater_impl( +void test_metric_worldtube_buffer_updater_impl( const gsl::not_null gen, const bool extraction_radius_in_filename, const bool time_varies_fastest) { constexpr bool is_modal = std::is_same_v; @@ -659,10 +659,10 @@ void test_spec_worldtube_buffer_updater_impl( approx(target_time - 1.5 + 0.1 * i)); } - const DummyBufferUpdater dummy_buffer_updater = serialize_and_deserialize( + const DummyBufferUpdater bondi_buffer_updater = serialize_and_deserialize( DummyBufferUpdater{time_buffer, solution, extraction_radius, amplitude, frequency, computation_l_max}); - dummy_buffer_updater.update_buffers_for_time( + bondi_buffer_updater.update_buffers_for_time( make_not_null(&expected_coefficients_buffers), make_not_null(&time_span_start), make_not_null(&time_span_end), target_time, computation_l_max, interpolator_length, buffer_size, @@ -685,7 +685,7 @@ void test_spec_worldtube_buffer_updater_impl( } template -void test_reduced_spec_worldtube_buffer_updater_impl( +void test_bondi_worldtube_buffer_updater_impl( const gsl::not_null gen, const bool extraction_radius_in_filename, const bool time_varies_fastest) { constexpr bool is_modal = std::is_same_v; @@ -863,11 +863,10 @@ void test_reduced_spec_worldtube_buffer_updater_impl( approx(target_time - 0.1 + 0.01 * i)); } - const ReducedDummyBufferUpdater dummy_buffer_updater = - serialize_and_deserialize(ReducedDummyBufferUpdater{ - time_buffer, solution, extraction_radius, amplitude, frequency, - computation_l_max}); - dummy_buffer_updater.update_buffers_for_time( + const BondiBufferUpdater bondi_buffer_updater = serialize_and_deserialize( + BondiBufferUpdater{time_buffer, solution, extraction_radius, amplitude, + frequency, computation_l_max}); + bondi_buffer_updater.update_buffers_for_time( make_not_null(&expected_coefficients_buffers), make_not_null(&time_span_start), make_not_null(&time_span_end), target_time, computation_l_max, interpolator_length, buffer_size, @@ -900,26 +899,25 @@ void test_reduced_spec_worldtube_buffer_updater_impl( } template -void test_spec_worldtube_buffer_updater(const gsl::not_null gen) { +void test_metric_worldtube_buffer_updater(const gsl::not_null gen) { INFO("SpEC worldtube (aka metric)"); for (const auto& [extraction_radius_in_filename, time_varies_fastest] : cartesian_product(std::array{true, false}, std::array{true, false})) { - test_spec_worldtube_buffer_updater_impl( + test_metric_worldtube_buffer_updater_impl( gen, extraction_radius_in_filename, time_varies_fastest); - test_spec_worldtube_buffer_updater_impl( + test_metric_worldtube_buffer_updater_impl( gen, extraction_radius_in_filename, time_varies_fastest); } } template -void test_reduced_spec_worldtube_buffer_updater( - const gsl::not_null gen) { +void test_bondi_worldtube_buffer_updater(const gsl::not_null gen) { INFO("Reduced SpEC worldtube (aka Bondi)"); for (const auto& [extraction_radius_in_filename, time_varies_fastest] : cartesian_product(std::array{true, false}, std::array{true, false})) { - test_reduced_spec_worldtube_buffer_updater_impl( + test_bondi_worldtube_buffer_updater_impl( gen, extraction_radius_in_filename, time_varies_fastest); - test_reduced_spec_worldtube_buffer_updater_impl( + test_bondi_worldtube_buffer_updater_impl( gen, extraction_radius_in_filename, time_varies_fastest); } } @@ -943,33 +941,32 @@ SPECTRE_TEST_CASE("Unit.Evolution.Systems.Cce.ReadBoundaryDataH5", MAKE_GENERATOR(gen); { INFO("Testing buffer updaters"); - test_spec_worldtube_buffer_updater(make_not_null(&gen)); - test_reduced_spec_worldtube_buffer_updater(make_not_null(&gen)); + test_metric_worldtube_buffer_updater(make_not_null(&gen)); + test_bondi_worldtube_buffer_updater(make_not_null(&gen)); } { INFO("Testing data managers"); using DummyBufferUpdater = DummyBufferUpdater; - using ReducedDummyBufferUpdater = - ReducedDummyBufferUpdater; - test_data_manager_with_dummy_buffer_updater; + test_data_manager_with_bondi_buffer_updater( make_not_null(&gen)); // with normalization bug applied: - test_data_manager_with_dummy_buffer_updater( make_not_null(&gen), true, true); - test_data_manager_with_dummy_buffer_updater( make_not_null(&gen), false, true); - test_data_manager_with_dummy_buffer_updater( make_not_null(&gen), false, false); // check the case for an explicitly provided extraction radius. - test_data_manager_with_dummy_buffer_updater( make_not_null(&gen), false, false, 200.0); - test_data_manager_with_dummy_buffer_updater( + test_data_manager_with_bondi_buffer_updater( make_not_null(&gen)); } } diff --git a/tests/Unit/Executables/CMakeLists.txt b/tests/Unit/Executables/CMakeLists.txt index 47724b87db99..b7f400289a7f 100644 --- a/tests/Unit/Executables/CMakeLists.txt +++ b/tests/Unit/Executables/CMakeLists.txt @@ -38,7 +38,7 @@ add_standalone_test( ) set( - TEST_REDUCECCEWORLDTUBE_LIBRARIES + TEST_PREPROCESSCCEWORLDTUBE_LIBRARIES Boost::boost Cce CceHelpers @@ -48,7 +48,7 @@ set( SpinWeightedSphericalHarmonics ) -set(EXECUTABLE "Test_ReduceCceWorldtube") +set(EXECUTABLE "Test_PreprocessCceWorldtube") add_standalone_test_executable(${EXECUTABLE}) @@ -61,15 +61,15 @@ target_compile_definitions( target_link_libraries( "${EXECUTABLE}" PRIVATE - "${TEST_REDUCECCEWORLDTUBE_LIBRARIES}") + "${TEST_PREPROCESSCCEWORLDTUBE_LIBRARIES}") add_test( - NAME "Unit.Executables.ReduceCceWorldtube" + NAME "Unit.Executables.PreprocessCceWorldtube" COMMAND ${SHELL_EXECUTABLE} -c - "rm -rf ReduceCceWorldtube && - mkdir -p ReduceCceWorldtube && \ - cd ReduceCceWorldtube && \ + "rm -rf PreprocessCceWorldtube && + mkdir -p PreprocessCceWorldtube && \ + cd PreprocessCceWorldtube && \ ${CMAKE_BINARY_DIR}/bin/${EXECUTABLE}" ) diff --git a/tests/Unit/Executables/Test_ReduceCceWorldtube.cpp b/tests/Unit/Executables/Test_PreprocessCceWorldtube.cpp similarity index 98% rename from tests/Unit/Executables/Test_ReduceCceWorldtube.cpp rename to tests/Unit/Executables/Test_PreprocessCceWorldtube.cpp index ef3db4243f35..dc9db28dfde8 100644 --- a/tests/Unit/Executables/Test_ReduceCceWorldtube.cpp +++ b/tests/Unit/Executables/Test_PreprocessCceWorldtube.cpp @@ -442,9 +442,9 @@ int main() { if (not executable.ends_with("/")) { executable += "/"; } - executable += "bin/ReduceCceWorldtube"; + executable += "bin/PreprocessCceWorldtube"; - const auto call_reduce_cce_worldtube = + const auto call_preprocess_cce_worldtube = [&](const std::string& input_data_format) { const std::string to_execute = executable + " --input-file " + input_data_format + ".yaml > " + @@ -456,11 +456,11 @@ int main() { (void)exit_code; }; - // Call ReduceCceWorldtube in a shell - call_reduce_cce_worldtube("MetricModal"); - call_reduce_cce_worldtube("MetricNodal"); - call_reduce_cce_worldtube("BondiModal"); - call_reduce_cce_worldtube("BondiNodal"); + // Call PreprocessCceWorldtube in a shell + call_preprocess_cce_worldtube("MetricModal"); + call_preprocess_cce_worldtube("MetricNodal"); + call_preprocess_cce_worldtube("BondiModal"); + call_preprocess_cce_worldtube("BondiNodal"); // Create the expected bondi modal data const auto expected_data = create_expected_data(