Nbc rebase

CMakeLists.txt

@@ -20,13 +20,9 @@ set(HEMELB_READING_GROUP_SIZE 5
   CACHE INTEGER "Number of cores to use to read geometry file.")
 set(HEMELB_LOG_LEVEL Info
 	CACHE STRING "Log level, choose 'Critical', 'Error', 'Warning', 'Info', 'Debug' or 'Trace'" )
-set(HEMELB_STEERING_LIB basic
-	CACHE STRING "Steering library, choose 'basic' or 'none'" )
 option(HEMELB_USE_MULTIMACHINE "Use multi-level parallelism support" OFF)
 option(HEMELB_BUILD_UNITTESTS "Build the unit-tests" ON)
-option(HEMELB_USE_STREAKLINES "Calculate streakline images" OFF)
 option(HEMELB_USE_ALL_WARNINGS_GNU "Show all compiler warnings on development builds (gnu-style-compilers)" ON)
-option(HEMELB_STATIC_ASSERT "Use simple compile-time assertions" ON)
 set(HEMELB_OPTIMISATION "-O4" CACHE STRING "Optimisation level (can be blank or -O1 to -O4)")
 option(HEMELB_BUILD_MULTISCALE "Build HemeLB Multiscale functionality" OFF)
 set(HEMELB_LATTICE "D3Q15"
@@ -35,10 +31,8 @@ set(HEMELB_KERNEL "LBGK"
   CACHE STRING "Select the kernel to use (LBGK,EntropicAnsumali,EntropicChik,MRT,NNCY,NNC,NNTPL)")
 set(HEMELB_WALL_BOUNDARY "SIMPLEBOUNCEBACK"
   CACHE STRING "Select the boundary conditions to be used at the walls (FINTERPOLATION,GZS,SIMPLEBOUNCEBACK,JUNKYANG)")
-set(HEMELB_STEERING_HOST "CCS" CACHE STRING "Use a default host suffix for steering? (CCS, NGS2Leeds, NGS2Manchester, LONI, NCSA or blank)")
 option(HEMELB_DEPENDENCIES_SET_RPATH "Set runtime RPATH" ON)
 set(HEMELB_SUBPROJECT_MAKE_JOBS 1 CACHE INTEGER "Number of jobs to use for subproject build steps")
-option(HEMELB_WAIT_ON_CONNECT "Wait for steering client" OFF)
 option(HEMELB_IMAGES_TO_NULL "Write images to null" OFF) 
 option(HEMELB_USE_SSE3 "Use SSE3 intrinsics" OFF)
 set(HEMELB_COMPUTE_ARCHITECTURE "AMDBULLDOZER"
@@ -62,10 +56,8 @@ ExternalProject_Add(
 	-DHEMELB_USE_DEBUGGER=${HEMELB_USE_DEBUGGER}
         -DHEMELB_VALIDATE_GEOMETRY=${HEMELB_VALIDATE_GEOMETRY}
 	-DHEMELB_LOG_LEVEL=${HEMELB_LOG_LEVEL}
-	-DHEMELB_STEERING_LIB=${HEMELB_STEERING_LIB}
 	-DHEMELB_USE_MULTIMACHINE=${HEMELB_USE_MULTIMACHINE}
 	-DHEMELB_BUILD_UNITTESTS=${HEMELB_BUILD_UNITTESTS}
-	-DHEMELB_USE_STREAKLINES=${HEMELB_USE_STREAKLINES}
 	-DHEMELB_OPTIMISATION=${HEMELB_OPTIMISATION}
 	-DHEMELB_READING_GROUP_SIZE=${HEMELB_READING_GROUP_SIZE}
 	-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
@@ -75,11 +67,9 @@ ExternalProject_Add(
 	-DMPI_C_NO_INTERROGATE=${MPI_C_NO_INTERROGATE}
 	-DMPI_CXX_NO_INTERROGATE=${MPI_CXX_NO_INTERROGATE}
 	-DHEMELB_USE_ALL_WARNINGS_GNU=${HEMELB_USE_ALL_WARNINGS_GNU}
-	-DHEMELB_STEERING_HOST=${HEMELB_STEERING_HOST}
 	-DCTEMPLATE_USE_STATIC=${CTEMPLATE_USE_STATIC}
 	-DCPPUNIT_USE_STATIC=${CPPUNIT_USE_STATIC}
 	-DHEMELB_DEPENDENCIES_SET_RPATH=${HEMELB_DEPENDENCIES_SET_RPATH}
-	-DHEMELB_STATIC_ASSERT=${HEMELB_STATIC_ASSERT}
         -DHEMELB_LATTICE=${HEMELB_LATTICE}
         -DHEMELB_KERNEL=${HEMELB_KERNEL}
         -DHEMELB_WALL_BOUNDARY=${HEMELB_WALL_BOUNDARY}

Code/CMakeLists.txt

@@ -7,9 +7,6 @@ cmake_minimum_required (VERSION 3.2)
 
 project(HemeLB)
 
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
 #---- OPTION switches accepted by the build -------
 
 option(HEMELB_BUILD_DEBUGGER "Build the built in debugger" ON)
@@ -21,10 +18,7 @@ option(HEMELB_BUILD_TESTS_ALL "Build all the tests" ON)
 option(HEMELB_BUILD_TESTS_UNIT "Build the unit-tests (HEMELB_BUILD_TESTS_ALL takes precedence)" ON)
 option(HEMELB_BUILD_TESTS_FUNCTIONAL "Build the functional tests (HEMELB_BUILD_TESTS_ALL takes precedence)" ON)
 option(HEMELB_USE_ALL_WARNINGS_GNU "Show all compiler warnings on development builds (gnu-style-compilers)" ON)
-option(HEMELB_USE_STREAKLINES "Calculate streakline images" OFF)
 option(HEMELB_DEPENDENCIES_SET_RPATH "Set runtime RPATH" ON)
-option(HEMELB_STATIC_ASSERT "Use simple compile-time assertions" ON)
-option(HEMELB_WAIT_ON_CONNECT "Wait for steering client" OFF)
 option(HEMELB_BUILD_MULTISCALE "Build HemeLB Multiscale functionality" OFF)
 option(HEMELB_IMAGES_TO_NULL "Write images to null" OFF)
 option(HEMELB_USE_SSE3 "Use SSE3 intrinsics" OFF)
@@ -36,8 +30,6 @@ set(HEMELB_READING_GROUP_SIZE 5
   CACHE INTEGER "Number of cores to use to read geometry file.")
 set(HEMELB_LOG_LEVEL Info
 	CACHE STRING "Log level, choose 'Critical', 'Error', 'Warning', 'Info', 'Debug' or 'Trace'" )
-set(HEMELB_STEERING_LIB basic
-	CACHE STRING "Steering library, choose 'basic' or 'none'" )
 set(HEMELB_DEPENDENCIES_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../dependencies"
 	CACHE FILEPATH "Path to find dependency find modules")
 set(HEMELB_DEPENDENCIES_INSTALL_PATH ${HEMELB_DEPENDENCIES_PATH}
@@ -61,10 +53,6 @@ set(HEMELB_WALL_OUTLET_BOUNDARY "NASHZEROTHORDERPRESSURESBB"
   CACHE STRING "Select the boundary conditions to be used at corners between walls and outlets (NASHZEROTHORDERPRESSURESBB,NASHZEROTHORDERPRESSUREBFL,LADDIOLETSBB,LADDIOLETBFL)")
 set(HEMELB_POINTPOINT_IMPLEMENTATION Coalesce
 	CACHE STRING "Point to point comms implementation, choose 'Coalesce', 'Separated', or 'Immediate'" )
-set(HEMELB_GATHERS_IMPLEMENTATION Separated
-	CACHE STRING "Gather comms implementation, choose 'Separated', or 'ViaPointPoint'" )
-set(HEMELB_ALLTOALL_IMPLEMENTATION Separated
-	CACHE STRING "Alltoall comms implementation, choose 'Separated', or 'ViaPointPoint'" )
 option(HEMELB_SEPARATE_CONCERNS "Communicate for each concern separately" OFF)
 
 # Add warnings flags to development build types
@@ -94,18 +82,10 @@ if(HEMELB_VALIDATE_GEOMETRY)
   add_definitions(-DHEMELB_VALIDATE_GEOMETRY)
 endif()
 
-if (NOT HEMELB_USE_STREAKLINES)
-	add_definitions(-DNO_STREAKLINES)
-endif()
-
 if (HEMELB_WAIT_ON_CONNECT)
 	add_definitions(-DHEMELB_WAIT_ON_CONNECT)
 endif()
 
-if (NOT HEMELB_STATIC_ASSERT)
-	add_definitions(-DHEMELB_NO_STATIC_ASSERT)
-endif()
-
 if (HEMELB_IMAGES_TO_NULL)
 	add_definitions(-DHEMELB_IMAGES_TO_NULL)
 endif()
@@ -121,6 +101,7 @@ if (HEMELB_USE_VELOCITY_WEIGHTS_FILE)
     add_definitions(-DHEMELB_USE_VELOCITY_WEIGHTS_FILE)
 endif()
 
+
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${HEMELB_DEPENDENCIES_PATH}/Modules/")
 list(APPEND CMAKE_INCLUDE_PATH ${HEMELB_DEPENDENCIES_INSTALL_PATH}/include)
 list(APPEND CMAKE_LIBRARY_PATH ${HEMELB_DEPENDENCIES_INSTALL_PATH}/lib)
@@ -131,6 +112,7 @@ if(HEMELB_DEPENDENCIES_SET_RPATH)
 	SET(CMAKE_INSTALL_RPATH "${HEMELB_DEPENDENCIES_INSTALL_PATH}/lib")
 endif()
 
+include(cxx11)
 include(build_environment)
 include(platform_checks)
 
@@ -158,6 +140,10 @@ if(NOT HAVE_XDRUINTXX_T)
 endif()
 
 include(mpi)
+if(MPI_STANDARD_VERSION VERSION_LESS 3)
+  message(FATAL_ERROR "Must have MPI 3.0 or greater")
+endif()
+
 include(dependencies)
 
 #-------------Resources -----------------------
@@ -190,13 +176,12 @@ add_executable(${HEMELB_EXECUTABLE} main.cc ${root_sources})
 include_directories(${PROJECT_SOURCE_DIR})
 set(package_subdirs
 	configuration
+	comm
 	extraction
 	reporting
-	steering
-	vis
 	lb
 	geometry
-	net
+	timestep
 	debug
 	util
 	io
@@ -236,14 +221,13 @@ if (HEMELB_BUILD_MULTISCALE)
 	add_executable(multiscale_hemelb mainMultiscale.cc ${root_sources})
 	include_directories(${PROJECT_SOURCE_DIR})
 	set(package_subdirs
+		comm
 		configuration
 		extraction
 		reporting
-		steering
-		vis
 		lb
 		geometry
-		net
+		timestep
 		debug
 		util
 		io