diff --git a/.github/workflows/catalyst.yml b/.github/workflows/catalyst.yml new file mode 100644 index 00000000000..04c1dad761e --- /dev/null +++ b/.github/workflows/catalyst.yml @@ -0,0 +1,34 @@ +name: 🐧 Catalyst + +on: [push, pull_request] + +concurrency: + group: ${{ github.ref }}-${{ github.head_ref }}-insituvis + cancel-in-progress: true + +jobs: + catalyst: + name: Catalyst + runs-on: ubuntu-22.04 + if: github.event.pull_request.draft == false + env: + CXX: g++ + CC: gcc + container: + image: cwetterernelson/catalyst:v2 + steps: + - uses: actions/checkout@v4 + - name: Configure + run: | + export Catalyst_DIR=${catalyst_DIR} + export Conduit_DIR=${Catalyst_DIR} + cmake -S . -B build \ + -DCMAKE_BUILD_TYPE=Debug \ + -DAMReX_ENABLE_TESTS=ON \ + -DAMReX_FORTRAN=OFF \ + -DAMReX_CATALYST=ON \ + -DAMReX_CONDUIT=ON + - name: Build + run: | + cmake --build build -j 2 + diff --git a/Docs/sphinx_documentation/source/BuildingAMReX.rst b/Docs/sphinx_documentation/source/BuildingAMReX.rst index 761bfafb0c7..26a6506e5c6 100644 --- a/Docs/sphinx_documentation/source/BuildingAMReX.rst +++ b/Docs/sphinx_documentation/source/BuildingAMReX.rst @@ -508,6 +508,8 @@ The list of available options is reported in the :ref:`table ` bel +------------------------------+-------------------------------------------------+-------------------------+-----------------------+ | AMReX_CONDUIT | Enable Conduit support | NO | YES, NO | +------------------------------+-------------------------------------------------+-------------------------+-----------------------+ + | AMReX_CATALYST | Enable Catalyst support | NO | YES, NO | + +------------------------------+-------------------------------------------------+-------------------------+-----------------------+ | AMReX_ASCENT | Enable Ascent support | NO | YES, NO | +------------------------------+-------------------------------------------------+-------------------------+-----------------------+ | AMReX_HYPRE | Enable HYPRE interfaces | NO | YES, NO | diff --git a/Src/CMakeLists.txt b/Src/CMakeLists.txt index febdea04b5b..a7c627456ed 100644 --- a/Src/CMakeLists.txt +++ b/Src/CMakeLists.txt @@ -43,7 +43,6 @@ include(AMReXParallelBackends) # Add definitions # include(AMReXSetDefines) - # # Find and link third party libraries if needed # @@ -180,7 +179,7 @@ if (AMReX_SENSEI) add_subdirectory(Extern/SENSEI) endif () -if (AMReX_CONDUIT OR AMReX_ASCENT) +if (AMReX_CONDUIT OR AMReX_ASCENT OR AMReX_CATALYST) add_subdirectory(Extern/Conduit) endif () diff --git a/Src/Extern/Conduit/AMReX_Conduit_Blueprint_ParticlesI.H b/Src/Extern/Conduit/AMReX_Conduit_Blueprint_ParticlesI.H index e4186ba247b..d41c5ed6ec1 100644 --- a/Src/Extern/Conduit/AMReX_Conduit_Blueprint_ParticlesI.H +++ b/Src/Extern/Conduit/AMReX_Conduit_Blueprint_ParticlesI.H @@ -389,4 +389,4 @@ ParticleContainerToBlueprint(const ParticleContainer_impl