From 0f6cb85d3bbdc69a8372955ab920ee6e7ed70a35 Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Wed, 19 Apr 2017 15:36:05 -0400
Subject: [PATCH] Fix include issues with examples
---
examples/heatTransfer/write/CMakeLists.txt | 18 ++++++++++++++++++
examples/heatTransfer/write/HeatTransfer.cpp | 2 +-
examples/heatTransfer/write/HeatTransfer.h | 2 +-
examples/heatTransfer/write/IO.h | 4 ++--
examples/heatTransfer/write/IO_adios1.cpp | 5 +++--
examples/heatTransfer/write/IO_adios2.cpp | 5 +++--
examples/heatTransfer/write/IO_ascii.cpp | 4 ++--
examples/heatTransfer/write/IO_hdf5_a.cpp | 5 +++--
examples/heatTransfer/write/Settings.cpp | 7 ++++---
examples/heatTransfer/write/main.cpp | 6 +++---
10 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/examples/heatTransfer/write/CMakeLists.txt b/examples/heatTransfer/write/CMakeLists.txt
index fb0b9f029..89373e645 100644
--- a/examples/heatTransfer/write/CMakeLists.txt
+++ b/examples/heatTransfer/write/CMakeLists.txt
@@ -34,4 +34,22 @@ if(ADIOS_USE_MPI)
adios1::adios ${MPI_C_LIBRARIES}
)
endif()
+
+ if(ADIOS_USE_HDF5)
+ find_package(HDF5 REQUIRED)
+ find_package(MPI COMPONENTS C REQUIRED)
+
+ add_executable(heatTransfer_write_hdf5
+ main.cpp
+ HeatTransfer.cpp
+ Settings.cpp
+ IO_hdf5_a.cpp
+ )
+ target_include_directories(heatTransfer_write_hdf5
+ PRIVATE ${MPI_C_INCLUDE_PATH} ${HDF5_INCLUDE_DIRS}
+ )
+ target_link_libraries(heatTransfer_write_hdf5
+ ${MPI_C_LIBRARIES} ${HDF5_C_LIBRARIES}
+ )
+ endif()
endif()
diff --git a/examples/heatTransfer/write/HeatTransfer.cpp b/examples/heatTransfer/write/HeatTransfer.cpp
index eb37cadc5..29283fa77 100644
--- a/examples/heatTransfer/write/HeatTransfer.cpp
+++ b/examples/heatTransfer/write/HeatTransfer.cpp
@@ -18,7 +18,7 @@
#include <stdexcept>
#include <string>
-#include "adios2/HeatTransfer.h"
+#include "HeatTransfer.h"
HeatTransfer::HeatTransfer(const Settings &settings) : m_s{settings}
{
diff --git a/examples/heatTransfer/write/HeatTransfer.h b/examples/heatTransfer/write/HeatTransfer.h
index c1efc5fdf..a52acbb74 100644
--- a/examples/heatTransfer/write/HeatTransfer.h
+++ b/examples/heatTransfer/write/HeatTransfer.h
@@ -15,7 +15,7 @@
#include <vector>
-#include "adios2/Settings.h"
+#include "Settings.h"
class HeatTransfer
{
diff --git a/examples/heatTransfer/write/IO.h b/examples/heatTransfer/write/IO.h
index 8c888d26e..53caaf599 100644
--- a/examples/heatTransfer/write/IO.h
+++ b/examples/heatTransfer/write/IO.h
@@ -11,8 +11,8 @@
#ifndef IO_H_
#define IO_H_
-#include "adios2/HeatTransfer.h"
-#include "adios2/Settings.h"
+#include "HeatTransfer.h"
+#include "Settings.h"
#include <mpi.h>
diff --git a/examples/heatTransfer/write/IO_adios1.cpp b/examples/heatTransfer/write/IO_adios1.cpp
index c858c07d9..898691a1d 100644
--- a/examples/heatTransfer/write/IO_adios1.cpp
+++ b/examples/heatTransfer/write/IO_adios1.cpp
@@ -8,12 +8,13 @@
* Author: Norbert Podhorszki
*/
+#include "IO.h"
+
#include <iomanip>
#include <iostream>
#include <string>
-#include "adios2/IO.h"
-#include "adios2/adios.h"
+#include <adios.h>
static int64_t group;
static int rank_saved;
diff --git a/examples/heatTransfer/write/IO_adios2.cpp b/examples/heatTransfer/write/IO_adios2.cpp
index 9eb19b2ec..c16c4000d 100644
--- a/examples/heatTransfer/write/IO_adios2.cpp
+++ b/examples/heatTransfer/write/IO_adios2.cpp
@@ -8,11 +8,12 @@
* Author: Norbert Podhorszki
*/
-#include "adios2/IO.h"
-#include <adios2.h>
+#include "IO.h"
#include <string>
+#include <adios2.h>
+
static int rank_saved;
adios::ADIOS *ad = nullptr;
std::shared_ptr<adios::Engine> bpWriter;
diff --git a/examples/heatTransfer/write/IO_ascii.cpp b/examples/heatTransfer/write/IO_ascii.cpp
index a83e11512..0cce79fbb 100644
--- a/examples/heatTransfer/write/IO_ascii.cpp
+++ b/examples/heatTransfer/write/IO_ascii.cpp
@@ -8,12 +8,12 @@
* Author: Norbert Podhorszki
*/
+#include "IO.h"
+
#include <fstream>
#include <iomanip>
#include <iostream>
-#include "adios2/IO.h"
-
static std::ofstream of;
static std::streambuf *buf;
diff --git a/examples/heatTransfer/write/IO_hdf5_a.cpp b/examples/heatTransfer/write/IO_hdf5_a.cpp
index b63553ebd..1100fbeb8 100644
--- a/examples/heatTransfer/write/IO_hdf5_a.cpp
+++ b/examples/heatTransfer/write/IO_hdf5_a.cpp
@@ -11,13 +11,14 @@
* Author: Norbert Podhorszki
*/
+#include "IO.h"
+
#include <fstream>
#include <iomanip>
#include <iostream>
#include <string>
-#include "adios2/IO.h"
-#include "adios2/hdf5.h"
+#include <hdf5.h>
IO::IO(const Settings &s, MPI_Comm comm) : m_outputfilename{s.outputfile} {}
diff --git a/examples/heatTransfer/write/Settings.cpp b/examples/heatTransfer/write/Settings.cpp
index 7e5631809..bb473192c 100644
--- a/examples/heatTransfer/write/Settings.cpp
+++ b/examples/heatTransfer/write/Settings.cpp
@@ -8,12 +8,13 @@
* Author: Norbert Podhorszki
*/
-#include <cstdlib>
+#include "Settings.h"
+
#include <errno.h>
-#include <stdexcept>
+#include <cstdlib>
-#include "adios2/Settings.h"
+#include <stdexcept>
static unsigned int convertToUint(std::string varName, char *arg)
{
diff --git a/examples/heatTransfer/write/main.cpp b/examples/heatTransfer/write/main.cpp
index 34b10ca2e..657348f1d 100644
--- a/examples/heatTransfer/write/main.cpp
+++ b/examples/heatTransfer/write/main.cpp
@@ -17,9 +17,9 @@
#include <stdexcept>
#include <string>
-#include "adios2/HeatTransfer.h"
-#include "adios2/IO.h"
-#include "adios2/Settings.h"
+#include "HeatTransfer.h"
+#include "IO.h"
+#include "Settings.h"
void printUsage()
{
--
GitLab