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.H b/Src/Extern/Conduit/AMReX_Conduit_Blueprint.H index 6d23bcf07ed..9ac8eb31fd0 100644 --- a/Src/Extern/Conduit/AMReX_Conduit_Blueprint.H +++ b/Src/Extern/Conduit/AMReX_Conduit_Blueprint.H @@ -96,9 +96,8 @@ namespace amrex // coordset and fields used to represent the passed particle container. // This allows you to use unique names to wrap multiple particle containers // into a single blueprint tree. - template - void ParticleContainerToBlueprint (const ParticleContainer + void ParticleContainerToBlueprint (const ParticleContainer_impl &pc, const Vector &real_comp_names, diff --git a/Src/Extern/Conduit/AMReX_Conduit_Blueprint_ParticlesI.H b/Src/Extern/Conduit/AMReX_Conduit_Blueprint_ParticlesI.H index 9b8c0a2c108..c05ed8eb3fc 100644 --- a/Src/Extern/Conduit/AMReX_Conduit_Blueprint_ParticlesI.H +++ b/Src/Extern/Conduit/AMReX_Conduit_Blueprint_ParticlesI.H @@ -320,4 +320,4 @@ ParticleContainerToBlueprint(const ParticleContainer