diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp | 4 | ||||
| -rw-r--r-- | Source/Diagnostics/requirements.txt | 4 | ||||
| -rw-r--r-- | Source/Make.WarpX | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp index 11778a8f7..8af12308e 100644 --- a/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp +++ b/Source/Diagnostics/FlushFormats/FlushFormatOpenPMD.cpp @@ -29,11 +29,7 @@ FlushFormatOpenPMD::FlushFormatOpenPMD (const std::string& diag_name) openPMD::IterationEncoding encoding = openPMD::IterationEncoding::groupBased; if ( 0 == openpmd_encoding.compare("v") ) -#if OPENPMDAPI_VERSION_GE(0, 14, 0) encoding = openPMD::IterationEncoding::variableBased; -#else - encoding = openPMD::IterationEncoding::groupBased; -#endif else if ( 0 == openpmd_encoding.compare("g") ) encoding = openPMD::IterationEncoding::groupBased; else if ( 0 == openpmd_encoding.compare("f") ) diff --git a/Source/Diagnostics/requirements.txt b/Source/Diagnostics/requirements.txt index bd0b24cb1..8d9176f92 100644 --- a/Source/Diagnostics/requirements.txt +++ b/Source/Diagnostics/requirements.txt @@ -1,8 +1,8 @@ -# Copyright 2020 Axel Huebl +# Copyright 2020-2021 Axel Huebl # # This file is part of WarpX. # # License: BSD-3-Clause-LBNL # keep this entry for GitHub's dependency graph -openPMD-api>=0.13.0 +openPMD-api>=0.14.2 diff --git a/Source/Make.WarpX b/Source/Make.WarpX index 3d893d3c0..c79f9ce5f 100644 --- a/Source/Make.WarpX +++ b/Source/Make.WarpX @@ -144,7 +144,7 @@ endif ifeq ($(USE_OPENPMD), TRUE) # try pkg-config query - ifeq (0, $(shell pkg-config "openPMD >= 0.13.0"; echo $$?)) + ifeq (0, $(shell pkg-config "openPMD >= 0.14.2"; echo $$?)) CXXFLAGS += $(shell pkg-config --cflags openPMD) LIBRARY_LOCATIONS += $(shell pkg-config --variable=libdir openPMD) libraries += $(shell pkg-config --libs-only-l openPMD) |