Update to GridTools v0.21.0 (#206)

Author: havogt

examples/gridtools/simple/example-01-laplacian.cpp

@@ -23,8 +23,8 @@
 //
 // Include gridtools headers (Serialbox only supports C++11)
 //
-#include <gridtools/stencil-composition/stencil-composition.hpp>
-#include <gridtools/storage/storage-facility.hpp>
+#include <gridtools/stencil_composition/stencil_composition.hpp>
+#include <gridtools/storage/storage_facility.hpp>
 
 //
 // Include Serialbox headers

examples/gridtools/simple/example-02-stateless.cpp

@@ -19,7 +19,7 @@
 //
 // Include gridtools headers (Serialbox only supports C++11)
 //
-#include <gridtools/stencil-composition/stencil-composition.hpp>
+#include <gridtools/stencil_composition/stencil_composition.hpp>
 
 //
 // Include Serialbox headers

examples/gridtools/simple/example-03-slice.cpp

@@ -18,7 +18,7 @@
 //
 // Include gridtools headers (Serialbox only supports C++11)
 //
-#include <gridtools/stencil-composition/stencil-composition.hpp>
+#include <gridtools/stencil_composition/stencil_composition.hpp>
 
 //
 // Include Serialbox headers

test/serialbox-c/UnittestSerializer.cpp

@@ -12,12 +12,13 @@
 ///
 //===------------------------------------------------------------------------------------------===//
 
-#include "utility/CInterfaceTestBase.h"
-#include "utility/Storage.h"
 #include "serialbox-c/FieldMetainfo.h"
 #include "serialbox-c/Metainfo.h"
 #include "serialbox-c/Savepoint.h"
 #include "serialbox-c/Serializer.h"
+#include "utility/CInterfaceTestBase.h"
+#include "utility/Storage.h"
+#include <algorithm>
 #include <gtest/gtest.h>
 
 namespace {
@@ -43,14 +44,14 @@ TEST_F(CSerializerUtilityTest, Construction) {
     ASSERT_FALSE(this->hasErrorAndReset()) << this->getLastErrorMsg();
 
     EXPECT_EQ(serialboxSerializerGetMode(ser), Write);
-    
+
     char* dir = serialboxSerializerGetDirectory(ser);
     EXPECT_STREQ(dir, directory->path().c_str());
     std::free(dir);
 
     char* prefix = serialboxSerializerGetPrefix(ser);
     EXPECT_STREQ(prefix, "Field");
-    std::free(prefix);    
+    std::free(prefix);
 
     serialboxSerializerUpdateMetaData(ser);
     ASSERT_FALSE(this->hasErrorAndReset()) << this->getLastErrorMsg();
@@ -91,8 +92,7 @@ TEST_F(CSerializerUtilityTest, Construction) {
 
   {
     // MetaData-prefix.json does not exist -> Exception
-    filesystem::remove((directory->path() / "dir-is-created-from-write") /
-                          "MetaData-Field.json");
+    filesystem::remove((directory->path() / "dir-is-created-from-write") / "MetaData-Field.json");
 
     serialboxSerializer_t* ser = serialboxSerializerCreate(
         Read, (directory->path() / "dir-is-created-from-write").c_str(), "Field", "Binary");