diff --git a/Source/Diagnostics/WarpXOpenPMD.cpp b/Source/Diagnostics/WarpXOpenPMD.cpp index 45d5dc1cdee..77645425275 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/WarpXVersion.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 68b38153f8d..0185cfc5bb3 100644 --- a/Source/Initialization/WarpXInitData.cpp +++ b/Source/Initialization/WarpXInitData.cpp @@ -31,6 +31,7 @@ #include "Utils/WarpXConst.H" #include "Utils/WarpXProfilerWrapper.H" #include "Utils/WarpXUtil.H" +#include"Utils/WarpXVersion.H" #include "Python/callbacks.H" #include @@ -430,10 +431,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 26f4c77502d..073b02f07a0 100644 --- a/Source/Python/pyWarpX.cpp +++ b/Source/Python/pyWarpX.cpp @@ -76,7 +76,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/WarpXVersion.H.in b/Source/Utils/WarpXVersion.H.in index 15ec21c86d9..e0ffaf27385 100644 --- a/Source/Utils/WarpXVersion.H.in +++ b/Source/Utils/WarpXVersion.H.in @@ -7,6 +7,8 @@ #ifndef WARPX_VERSION_H_ #define WARPX_VERSION_H_ +#include + #ifndef WARPX_GIT_VERSION # define WARPX_GIT_VERSION "@WarpX_GIT_VERSION@" #endif @@ -15,4 +17,11 @@ # define PICSAR_GIT_VERSION "@PXRMP_QED_GIT_VERSION@" #endif +namespace warpx +{ + [[nodiscard]] std::string Version () noexcept; //!< Version of WarpX executable + + [[nodiscard]] std::string PicsarVersion () noexcept; //!< Version of PICSAR dependency +} + #endif // WARPX_VERSION_H_ diff --git a/Source/Utils/WarpXVersion.cpp b/Source/Utils/WarpXVersion.cpp index 41abfebb38c..6874a66bdc1 100644 --- a/Source/Utils/WarpXVersion.cpp +++ b/Source/Utils/WarpXVersion.cpp @@ -4,14 +4,9 @@ * * License: BSD-3-Clause-LBNL */ -#include "WarpX.H" #include "Utils/WarpXVersion.H" -#include - - -std::string -WarpX::Version () +std::string warpx::Version () noexcept { std::string version; #ifdef WARPX_GIT_VERSION @@ -24,8 +19,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 a0a1379d9e2..607075f3d23 100644 --- a/Source/WarpX.H +++ b/Source/WarpX.H @@ -106,9 +106,6 @@ public: /** Move operator */ WarpX& operator= ( WarpX && ) = default; - static std::string Version (); //!< Version of WarpX executable - static std::string PicsarVersion (); //!< Version of PICSAR dependency - [[nodiscard]] int Verbose () const { return verbose; } void InitData ();