From 3a5385bfd2d5de311277f7199f4ef86735da69fd Mon Sep 17 00:00:00 2001
From: Ross Brodie <rcb547@users.noreply.github.com>
Date: Tue, 23 Apr 2024 14:46:29 +1000
Subject: [PATCH] Resolved merge problem with outputmanager.h Removed
 PostInstall.cmake

---
 PostInstall.cmake   | 19 -------------------
 src/outputmanager.h |  4 +---
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 PostInstall.cmake

diff --git a/PostInstall.cmake b/PostInstall.cmake
deleted file mode 100644
index eb7763d..0000000
--- a/PostInstall.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-message(STATUS "Running cmake post install script")
-
-if(UNIX)
-	if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib/libgatdaem1d.so")
-		message(STATUS "Copying shared library libgatdaem1d.so to matlab and python directories")
-		configure_file("${CMAKE_INSTALL_PREFIX}/lib/libgatdaem1d.so" "${CMAKE_INSTALL_PREFIX}/python/gatdaem1d/gatdaem1d.so" COPYONLY)	
-		configure_file("${CMAKE_INSTALL_PREFIX}/lib/libgatdaem1d.so" "${CMAKE_INSTALL_PREFIX}/matlab/bin/gatdaem1d.so" COPYONLY)	
-	endif()
-else()
-	if(EXISTS "${CMAKE_INSTALL_PREFIX}/bin/gatdaem1d.dll")
-		message(STATUS "Copying shared library libgatdaem1d.dll to matlab and python directories")
-		configure_file("${CMAKE_INSTALL_PREFIX}/bin/gatdaem1d.dll" "${CMAKE_INSTALL_PREFIX}/python/gatdaem1d/gatdaem1d.dll" COPYONLY)
-		configure_file("${CMAKE_INSTALL_PREFIX}/bin/gatdaem1d.dll" "${CMAKE_INSTALL_PREFIX}/matlab/bin/gatdaem1d.mexw64" COPYONLY)
-	endif()
-endif()
-
-
-
-
diff --git a/src/outputmanager.h b/src/outputmanager.h
index 5cf8bf4..947c64e 100644
--- a/src/outputmanager.h
+++ b/src/outputmanager.h
@@ -295,9 +295,7 @@ class cASCIIOutputManager : public cOutputManager {
 	bool SaveHDRHeader = true;
 	bool SaveI3Header  = true;
 
-	bool SaveDFNHeader = true;
-	bool SaveCSVHeader = true;
-	bool SaveHDRHeader = true;
+public:
 
 	cASCIIOutputManager(const cBlock& b, const int& size, const int& rank) {
 		cOutputManager::initialise(b, size, rank);