From 6d53e489c96d598b5d473fd620e25c9c4adfa0d2 Mon Sep 17 00:00:00 2001 From: John Tramm Date: Mon, 13 Jan 2020 22:24:34 +0000 Subject: [PATCH] removed event-based define build option --- CMakeLists.txt | 6 ------ tools/ci/travis-install.py | 8 ++------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f58d03d8..2e606f8d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,6 @@ option(debug "Compile with debug flags" OFF) option(optimize "Turn on all compiler optimization flags" OFF) option(coverage "Compile with coverage analysis flags" OFF) option(dagmc "Enable support for DAGMC (CAD) geometry" OFF) -option(event-based "Enable event-based simulation mode" OFF) #=============================================================================== # MPI for distributed-memory parallelism @@ -209,7 +208,6 @@ list(APPEND libopenmc_SOURCES src/eigenvalue.cpp src/endf.cpp src/error.cpp - src/event.cpp src/initialize.cpp src/finalize.cpp src/geometry.cpp @@ -336,10 +334,6 @@ if(dagmc) target_include_directories(libopenmc PRIVATE ${DAGMC_INCLUDE_DIRS}) endif() -if(event-based) - target_compile_definitions(libopenmc PRIVATE EVENT_BASED) -endif() - #=============================================================================== # openmc executable #=============================================================================== diff --git a/tools/ci/travis-install.py b/tools/ci/travis-install.py index a28fa0339..a2b1b6175 100644 --- a/tools/ci/travis-install.py +++ b/tools/ci/travis-install.py @@ -19,7 +19,7 @@ def which(program): return None -def install(omp=False, mpi=False, phdf5=False, dagmc=False, event_based=False): +def install(omp=False, mpi=False, phdf5=False, dagmc=False): # Create build directory and change to it shutil.rmtree('build', ignore_errors=True) os.mkdir('build') @@ -47,9 +47,6 @@ def install(omp=False, mpi=False, phdf5=False, dagmc=False, event_based=False): if dagmc: cmake_cmd.append('-Ddagmc=ON') - - if event_based: - cmake_cmd.append('-Devent-based=ON') # Build in coverage mode for coverage testing cmake_cmd.append('-Dcoverage=on') @@ -67,10 +64,9 @@ def main(): mpi = (os.environ.get('MPI') == 'y') phdf5 = (os.environ.get('PHDF5') == 'y') dagmc = (os.environ.get('DAGMC') == 'y') - event_based = (os.environ.get('EVENT_BASED') == 'y') # Build and install - install(omp, mpi, phdf5, dagmc, event_based) + install(omp, mpi, phdf5, dagmc) if __name__ == '__main__': main()