diff --git a/Source/Diagnostics/WarpXOpenPMD.cpp b/Source/Diagnostics/WarpXOpenPMD.cpp index e38ae8c8300..bba7d004c60 100644 --- a/Source/Diagnostics/WarpXOpenPMD.cpp +++ b/Source/Diagnostics/WarpXOpenPMD.cpp @@ -16,6 +16,7 @@ #include "Utils/RelativeCellPosition.H" #include "Utils/WarpXAlgorithmSelection.H" #include "Utils/WarpXProfilerWrapper.H" +#include "Utils/WarpXGetVersion.H" #include "WarpX.H" #include "OpenPMDHelpFunction.H" @@ -518,7 +519,7 @@ WarpXOpenPMDPlot::Init (openPMD::Access access, bool isBTD) uint32_t const openPMD_ED_PIC = 1u; m_Series->setOpenPMDextension( openPMD_ED_PIC ); // meta info - m_Series->setSoftware( "WarpX", WarpX::Version() ); + m_Series->setSoftware( "WarpX", warpx::Version() ); } void diff --git a/Source/Initialization/WarpXInitData.cpp b/Source/Initialization/WarpXInitData.cpp index 3d78615fbc3..bf68f532a90 100644 --- a/Source/Initialization/WarpXInitData.cpp +++ b/Source/Initialization/WarpXInitData.cpp @@ -34,6 +34,7 @@ #include "Utils/WarpXConst.H" #include "Utils/WarpXProfilerWrapper.H" #include "Utils/WarpXUtil.H" +#include "Utils/WarpXGetVersion.H" #include "Python/callbacks.H" #include @@ -514,10 +515,10 @@ WarpX::InitData () ablastr::parallelization::check_mpi_thread_level(); #ifdef WARPX_QED - Print() << "PICSAR (" << WarpX::PicsarVersion() << ")\n"; + Print() << "PICSAR (" << warpx::PicsarVersion() << ")\n"; #endif - Print() << "WarpX (" << WarpX::Version() << ")\n"; + Print() << "WarpX (" << warpx::Version() << ")\n"; Print() << utils::logo::get_logo(); diff --git a/Source/Python/pyWarpX.cpp b/Source/Python/pyWarpX.cpp index e128599abd0..cbc701d6db5 100644 --- a/Source/Python/pyWarpX.cpp +++ b/Source/Python/pyWarpX.cpp @@ -78,7 +78,7 @@ PYBIND11_MODULE(PYWARPX_MODULE_NAME, m) { m.attr("__version__") = MACRO_STRINGIFY(PYWARPX_VERSION_INFO); #else // note: not necessarily PEP-440 compliant - m.attr("__version__") = WarpX::Version(); + m.attr("__version__") = warpx::Version(); #endif // authors diff --git a/Source/Utils/CMakeLists.txt b/Source/Utils/CMakeLists.txt index 82053bfc88a..9b72e9cf21f 100644 --- a/Source/Utils/CMakeLists.txt +++ b/Source/Utils/CMakeLists.txt @@ -9,7 +9,7 @@ foreach(D IN LISTS WarpX_DIMS) WarpXMovingWindow.cpp WarpXTagging.cpp WarpXUtil.cpp - WarpXVersion.cpp + WarpXGetVersion.cpp ) endforeach() diff --git a/Source/Utils/Make.package b/Source/Utils/Make.package index dc1f1da5c4c..758caa376e5 100644 --- a/Source/Utils/Make.package +++ b/Source/Utils/Make.package @@ -1,7 +1,7 @@ CEXE_sources += WarpXMovingWindow.cpp CEXE_sources += WarpXTagging.cpp CEXE_sources += WarpXUtil.cpp -CEXE_sources += WarpXVersion.cpp +CEXE_sources += WarpXGetVersion.cpp CEXE_sources += Interpolate.cpp CEXE_sources += IntervalsParser.cpp CEXE_sources += RelativeCellPosition.cpp diff --git a/Source/Utils/WarpXGetVersion.H b/Source/Utils/WarpXGetVersion.H new file mode 100644 index 00000000000..78cfe8e27f3 --- /dev/null +++ b/Source/Utils/WarpXGetVersion.H @@ -0,0 +1,19 @@ +/* Copyright 2025 Axel Huebl, Luca Fedeli + * + * This file is part of WarpX. + * + * License: BSD-3-Clause-LBNL + */ +#include + +#ifndef WARPX_GET_VERSION_H_ +#define WARPX_GET_VERSION_H_ + +namespace warpx +{ + [[nodiscard]] std::string Version () noexcept; //!< Version of WarpX executable + + [[nodiscard]] std::string PicsarVersion () noexcept; //!< Version of PICSAR dependency +} + +#endif //WARPX_GET_VERSION_H_ diff --git a/Source/Utils/WarpXVersion.cpp b/Source/Utils/WarpXGetVersion.cpp similarity index 76% rename from Source/Utils/WarpXVersion.cpp rename to Source/Utils/WarpXGetVersion.cpp index 41abfebb38c..05109e16c02 100644 --- a/Source/Utils/WarpXVersion.cpp +++ b/Source/Utils/WarpXGetVersion.cpp @@ -1,17 +1,15 @@ -/* Copyright 2022 Axel Huebl +/* Copyright 2025 Axel Huebl, Luca Fedeli * * This file is part of WarpX. * * License: BSD-3-Clause-LBNL */ -#include "WarpX.H" -#include "Utils/WarpXVersion.H" -#include +#include "Utils/WarpXGetVersion.H" +#include "Utils/WarpXVersion.H" -std::string -WarpX::Version () +std::string warpx::Version () noexcept { std::string version; #ifdef WARPX_GIT_VERSION @@ -24,8 +22,7 @@ WarpX::Version () } } -std::string -WarpX::PicsarVersion () +std::string warpx::PicsarVersion () noexcept { std::string version; #ifdef PICSAR_GIT_VERSION diff --git a/Source/WarpX.H b/Source/WarpX.H index f500347febc..35e0fb63fb9 100644 --- a/Source/WarpX.H +++ b/Source/WarpX.H @@ -109,9 +109,6 @@ public: /** Move operator */ WarpX& operator= ( WarpX && ) = delete; - static std::string Version (); //!< Version of WarpX executable - static std::string PicsarVersion (); //!< Version of PICSAR dependency - [[nodiscard]] int Verbose () const { return verbose; } [[nodiscard]] const amrex::Array& GetFieldBoundaryLo () const