From f89e8a419eb0bc5c8b1240d2b9a4fe09ffb92ce9 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 25 Nov 2020 13:55:50 +0100
Subject: [PATCH] [ci] Fixed build on eve frontends.
---
MeshLib/IO/XDMF/writeHDF5.h | 3 +++
ProcessLib/Output/ProcessOutput.cpp | 9 ++++++---
scripts/env/eve/cli.sh | 1 +
scripts/env/eve/mpi.sh | 1 +
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/MeshLib/IO/XDMF/writeHDF5.h b/MeshLib/IO/XDMF/writeHDF5.h
index fef147a2334..9c262a65c2b 100644
--- a/MeshLib/IO/XDMF/writeHDF5.h
+++ b/MeshLib/IO/XDMF/writeHDF5.h
@@ -12,9 +12,12 @@
#pragma once
+#include <boost/shared_ptr.hpp>
#include <filesystem>
#include <vector>
+class XdmfArrayType;
+
namespace MeshLib::IO
{
/**
diff --git a/ProcessLib/Output/ProcessOutput.cpp b/ProcessLib/Output/ProcessOutput.cpp
index 7cde482d1c0..71159bd94ea 100644
--- a/ProcessLib/Output/ProcessOutput.cpp
+++ b/ProcessLib/Output/ProcessOutput.cpp
@@ -20,6 +20,8 @@
#include "IntegrationPointWriter.h"
#include "MathLib/LinAlg/LinAlg.h"
#include "MeshLib/IO/VtkIO/VtuInterface.h"
+#include "MeshLib/IO/XDMF/Xdmf3Writer.h"
+#include "MeshLib/IO/XDMF/transformData.h"
#include "NumLib/DOF/LocalToGlobalIndexMap.h"
/// Copies the ogs_version string containing the release number and the git
@@ -27,7 +29,8 @@
static void addOgsVersion(MeshLib::Mesh& mesh)
{
auto& ogs_version_field = *MeshLib::getOrCreateMeshProperty<char>(
- mesh, GitInfoLib::GitInfo::OGS_VERSION, MeshLib::MeshItemType::IntegrationPoint, 1);
+ mesh, GitInfoLib::GitInfo::OGS_VERSION,
+ MeshLib::MeshItemType::IntegrationPoint, 1);
ogs_version_field.assign(GitInfoLib::GitInfo::ogs_version.begin(),
GitInfoLib::GitInfo::ogs_version.end());
@@ -267,8 +270,8 @@ void makeOutput(std::string const& file_name, MeshLib::Mesh const& mesh,
fegetenv(&fe_env);
fesetenv(FE_DFL_ENV); // Set default environment effectively disabling
// exceptions.
-#endif //_WIN32
-#endif //__APPLE__
+#endif //_WIN32
+#endif //__APPLE__
switch (file_type)
{
diff --git a/scripts/env/eve/cli.sh b/scripts/env/eve/cli.sh
index 0d737f60083..4931b87fb6b 100644
--- a/scripts/env/eve/cli.sh
+++ b/scripts/env/eve/cli.sh
@@ -17,6 +17,7 @@ module load git-lfs/2.7.1
module load boost/1.67.0-1
module load eigen/3.3.4-1-cmake
module load vtk/8.2.0/foss2019b/serial
+module load HDF5/1.10.5-nompi
# Tools
module load ccache/3.3.3
diff --git a/scripts/env/eve/mpi.sh b/scripts/env/eve/mpi.sh
index 898ccf678f1..35405a29aa5 100644
--- a/scripts/env/eve/mpi.sh
+++ b/scripts/env/eve/mpi.sh
@@ -6,5 +6,6 @@ fi
source $DIR/cli.sh
module load vtk/8.2.0/foss2019b/openmpi
+module load HDF5/1.10.5
export CC=mpicc
export CXX=mpic++
--
GitLab