diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Diagnostics/WarpXOpenPMD.H | 2 | ||||
| -rw-r--r-- | Source/Diagnostics/WarpXOpenPMD.cpp | 8 | ||||
| -rw-r--r-- | Source/Diagnostics/requirements.txt | 2 | ||||
| -rw-r--r-- | Source/Initialization/PlasmaInjector.cpp | 2 | ||||
| -rw-r--r-- | Source/Make.WarpX | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/Source/Diagnostics/WarpXOpenPMD.H b/Source/Diagnostics/WarpXOpenPMD.H index 78a5bddea..2141738a9 100644 --- a/Source/Diagnostics/WarpXOpenPMD.H +++ b/Source/Diagnostics/WarpXOpenPMD.H @@ -110,7 +110,7 @@ public: private: - void Init(openPMD::AccessType accessType, const std::string& filePrefix); + void Init(openPMD::Access access, const std::string& filePrefix); /** This function sets up the entries for storing the particle positions, global IDs, and constant records (charge, mass) * diff --git a/Source/Diagnostics/WarpXOpenPMD.cpp b/Source/Diagnostics/WarpXOpenPMD.cpp index a2c25f903..04877444b 100644 --- a/Source/Diagnostics/WarpXOpenPMD.cpp +++ b/Source/Diagnostics/WarpXOpenPMD.cpp @@ -247,12 +247,12 @@ void WarpXOpenPMDPlot::SetStep(int ts, const std::string& filePrefix) } m_CurrentStep = ts; - Init(openPMD::AccessType::CREATE, filePrefix); + Init(openPMD::Access::CREATE, filePrefix); } void -WarpXOpenPMDPlot::Init(openPMD::AccessType accessType, const std::string& filePrefix) +WarpXOpenPMDPlot::Init(openPMD::Access access, const std::string& filePrefix) { // either for the next ts file, // or init a single file for all ts @@ -267,7 +267,7 @@ WarpXOpenPMDPlot::Init(openPMD::AccessType accessType, const std::string& filePr { #if defined(AMREX_USE_MPI) m_Series = std::make_unique<openPMD::Series>( - filename, accessType, + filename, access, amrex::ParallelDescriptor::Communicator() ); m_MPISize = amrex::ParallelDescriptor::NProcs(); @@ -278,7 +278,7 @@ WarpXOpenPMDPlot::Init(openPMD::AccessType accessType, const std::string& filePr } else { - m_Series = std::make_unique<openPMD::Series>(filename, accessType); + m_Series = std::make_unique<openPMD::Series>(filename, access); m_MPISize = 1; m_MPIRank = 1; } diff --git a/Source/Diagnostics/requirements.txt b/Source/Diagnostics/requirements.txt index c8826d054..89d14e604 100644 --- a/Source/Diagnostics/requirements.txt +++ b/Source/Diagnostics/requirements.txt @@ -5,4 +5,4 @@ # License: BSD-3-Clause-LBNL # keep this entry for GitHub's dependency graph -openPMD-api>=0.11.0 +openPMD-api>=0.12.0 diff --git a/Source/Initialization/PlasmaInjector.cpp b/Source/Initialization/PlasmaInjector.cpp index ca3cc340c..24f8dded7 100644 --- a/Source/Initialization/PlasmaInjector.cpp +++ b/Source/Initialization/PlasmaInjector.cpp @@ -268,7 +268,7 @@ PlasmaInjector::PlasmaInjector (int ispecies, const std::string& name) #ifdef WARPX_USE_OPENPMD if (ParallelDescriptor::IOProcessor()) { m_openpmd_input_series = std::make_unique<openPMD::Series>( - str_injection_file, openPMD::AccessType::READ_ONLY); + str_injection_file, openPMD::Access::READ_ONLY); AMREX_ALWAYS_ASSERT_WITH_MESSAGE( m_openpmd_input_series->iterations.size() == 1u, diff --git a/Source/Make.WarpX b/Source/Make.WarpX index 92a944544..d9690d1f1 100644 --- a/Source/Make.WarpX +++ b/Source/Make.WarpX @@ -136,7 +136,7 @@ endif ifeq ($(USE_OPENPMD), TRUE) # try pkg-config query - ifeq (0, $(shell pkg-config "openPMD >= 0.11.0"; echo $$?)) + ifeq (0, $(shell pkg-config "openPMD >= 0.12.0"; echo $$?)) CXXFLAGS += $(shell pkg-config --cflags openPMD) LIBRARY_LOCATIONS += $(shell pkg-config --variable=libdir openPMD) libraries += $(shell pkg-config --libs-only-l openPMD) |