From 7e160752e972fb059f91be871c91605100e83379 Mon Sep 17 00:00:00 2001 From: Ishaan Desai Date: Mon, 4 Nov 2024 08:38:31 +0100 Subject: [PATCH] Remove unnecessary parts from pyfans/CmakeLists.txt --- CMakeLists.txt | 5 +---- pyfans/CMakeLists.txt | 6 ------ pyfans/micro.cpp | 2 ++ 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4f25c2..ea22f70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,10 +87,7 @@ find_package(MPI REQUIRED) find_package(FFTW3 REQUIRED COMPONENTS DOUBLE MPI) -if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) - set(FANS_LIBRARY_FOR_MICRO_MANAGER_DEFAULT OFF) -endif () -option(FANS_LIBRARY_FOR_MICRO_MANAGER "Building FANS as a library to be used by the Micro Manager." ${FANS_LIBRARY_FOR_MICRO_MANAGER_DEFAULT}) +option(FANS_LIBRARY_FOR_MICRO_MANAGER "Building FANS as a library to be used by the Micro Manager." OFF) if (FANS_LIBRARY_FOR_MICRO_MANAGER) include(FetchContent) diff --git a/pyfans/CMakeLists.txt b/pyfans/CMakeLists.txt index 38df8a9..fd6ad8b 100644 --- a/pyfans/CMakeLists.txt +++ b/pyfans/CMakeLists.txt @@ -9,9 +9,3 @@ add_custom_command( ${CMAKE_CURRENT_SOURCE_DIR}/../test/test_pyfans/$ COMMENT "Create a symlink for FANS python bindings to ${CMAKE_CURRENT_SOURCE_DIR}/../test/" ) - -option(FANS_USE_MPI "Use MPI" OFF) - -if (FANS_USE_MPI) - add_definitions(-DFANS_USE_MPI) -endif() diff --git a/pyfans/micro.cpp b/pyfans/micro.cpp index f8071d3..9353801 100644 --- a/pyfans/micro.cpp +++ b/pyfans/micro.cpp @@ -45,6 +45,8 @@ MicroSimulation::MicroSimulation(int sim_id) py::dict MicroSimulation::solve(py::dict macro_data, double dt) { + // Time step value dt is not used currently, but is available for future use + // Create a pybind style Numpy array from macro_write_data["micro_vector_data"], which is a Numpy array py::array_t strain1 = macro_data["strains1to3"].cast>(); py::array_t strain2 = macro_data["strains4to6"].cast>();