Revert "Add openPMD 2.0 standard setting"

This reverts commit 1cade93.

include/openPMD/Error.hpp

@@ -109,12 +109,6 @@ namespace error
     public:
         NoSuchAttribute(std::string attributeName);
     };
-
-    class IllegalInOpenPMDStandard : public Error
-    {
-    public:
-        IllegalInOpenPMDStandard(std::string what);
-    };
 } // namespace error
 
 /**

include/openPMD/version.hpp

@@ -37,20 +37,11 @@
  * compile-time)
  * @{
  */
-#define OPENPMD_STANDARD_MAJOR 2
-#define OPENPMD_STANDARD_MINOR 0
+#define OPENPMD_STANDARD_MAJOR 1
+#define OPENPMD_STANDARD_MINOR 1
 #define OPENPMD_STANDARD_PATCH 0
 /** @} */
 
-/** maximum supported version of the openPMD standard (read & write,
- * compile-time)
- * @{
- */
-#define OPENPMD_STANDARD_DEFAULT_MAJOR 1
-#define OPENPMD_STANDARD_DEFAULT_MINOR 1
-#define OPENPMD_STANDARD_DEFAULT_PATCH 0
-/** @} */
-
 /** minimum supported version of the openPMD standard (read, compile-time)
  * @{
  */
@@ -88,13 +79,6 @@ std::string getVersion();
  */
 std::string getStandard();
 
-/** Return the default used version of the openPMD standard (read & write,
- * run-time)
- *
- * @return std::string openPMD standard version (dot separated)
- */
-std::string getStandardDefault();
-
 /** Return the minimum supported version of the openPMD standard (read,
  * run-time)
  *

src/Error.cpp

@@ -122,12 +122,6 @@ namespace error
         , description(std::move(description_in))
     {}
 
-    IllegalInOpenPMDStandard::IllegalInOpenPMDStandard(std::string what_in)
-        : Error(
-              "Operation leads to illegal use of the openPMD standard:\n" +
-              std::move(what_in))
-    {}
-
     void throwReadError(
         AffectedObject affectedObject,
         Reason reason,

src/Series.cpp

@@ -147,10 +147,9 @@ std::string Series::basePath() const
 Series &Series::setBasePath(std::string const &bp)
 {
     std::string version = openPMD();
-    if (version == "1.0.0" || version == "1.0.1" || version == "1.1.0" ||
-        version == "2.0.0")
+    if (version == "1.0.0" || version == "1.0.1" || version == "1.1.0")
         throw std::runtime_error(
-            "Custom basePath not allowed in openPMD <=2.0");
+            "Custom basePath not allowed in openPMD <=1.1.0");
 
     setAttribute("basePath", bp);
     return *this;
@@ -685,7 +684,7 @@ void Series::initDefaults(IterationEncoding ie, bool initAll)
         }
     }
     if (!containsAttribute("openPMD"))
-        setOpenPMD(getStandardDefault());
+        setOpenPMD(getStandard());
     /*
      * In Append mode, only init the rest of the defaults after checking that
      * the file does not yet exist to avoid overriding more than needed.
@@ -1269,8 +1268,7 @@ void Series::readOneIterationFileBased(std::string const &filePath)
 
     Parameter<Operation::OPEN_PATH> pOpen;
     std::string version = openPMD();
-    if (version == "1.0.0" || version == "1.0.1" || version == "1.1.0" ||
-        version == "2.0.0")
+    if (version == "1.0.0" || version == "1.0.1" || version == "1.1.0")
         pOpen.path = auxiliary::replace_first(basePath(), "/%T/", "");
     else
         throw error::ReadError(
@@ -1422,8 +1420,7 @@ creating new iterations.
 
     Parameter<Operation::OPEN_PATH> pOpen;
     std::string version = openPMD();
-    if (version == "1.0.0" || version == "1.0.1" || version == "1.1.0" ||
-        version == "2.0.0")
+    if (version == "1.0.0" || version == "1.0.1" || version == "1.1.0")
         pOpen.path = auxiliary::replace_first(basePath(), "/%T/", "");
     else
         throw error::ReadError(

src/binding/python/Error.cpp

@@ -9,7 +9,6 @@
 #include "openPMD/Error.hpp"
 
 #include "openPMD/binding/python/Common.hpp"
-#include <pybind11/pybind11.h>
 
 void init_Error(py::module &m)
 {
@@ -23,8 +22,6 @@ void init_Error(py::module &m)
     py::register_exception<error::Internal>(m, "ErrorInternal", baseError);
     py::register_exception<error::NoSuchAttribute>(
         m, "ErrorNoSuchAttribute", baseError);
-    py::register_exception<error::IllegalInOpenPMDStandard>(
-        m, "ErrorIllegalInOpenPMDStandard", baseError);
 
 #ifndef NDEBUG
     m.def("test_throw", [](std::string description) {

src/version.cpp

@@ -41,16 +41,6 @@ std::string openPMD::getStandard()
     return standard.str();
 }
 
-std::string openPMD::getStandardDefault()
-{
-    std::stringstream standard;
-    standard << OPENPMD_STANDARD_DEFAULT_MAJOR << "."
-             << OPENPMD_STANDARD_DEFAULT_MINOR << "."
-             << OPENPMD_STANDARD_DEFAULT_PATCH;
-    std::string const standardstr = standard.str();
-    return standardstr;
-}
-
 std::string openPMD::getStandardMinimum()
 {
     std::stringstream standardMin;

test/CoreTest.cpp

@@ -35,11 +35,8 @@ TEST_CASE("versions_test", "[core]")
     auto const is_dot = [](char const c) { return c == '.'; };
     REQUIRE(2u == std::count_if(apiVersion.begin(), apiVersion.end(), is_dot));
 
-    auto const standardDefault = getStandardDefault();
-    REQUIRE(standardDefault == "1.1.0");
-
     auto const standard = getStandard();
-    REQUIRE(standard == "2.0.0");
+    REQUIRE(standard == "1.1.0");
 
     auto const standardMin = getStandardMinimum();
     REQUIRE(standardMin == "1.0.0");

test/SerialIOTest.cpp

@@ -905,7 +905,6 @@ inline void constant_scalar(std::string const &file_ending)
         // constant scalar
         Series s =
             Series("../samples/constant_scalar." + file_ending, Access::CREATE);
-        s.setOpenPMD("2.0.0");
         auto rho = s.iterations[1].meshes["rho"][MeshRecordComponent::SCALAR];
         REQUIRE(s.iterations[1].meshes["rho"].scalar());
         rho.resetDataset(Dataset(Datatype::CHAR, {1, 2, 3}));