From 53c4246cb7f499d94c09ffbe5d19e24ddd4a71fd Mon Sep 17 00:00:00 2001 From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com> Date: Tue, 12 Sep 2023 11:42:21 -0400 Subject: [PATCH] Changed relative path to CTEM executable --- .gitignore | 3 +-- CMakeLists.txt | 2 +- ctem/ctem/driver.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ab7aae65..733dc353 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,5 @@ !README.md !version.txt !src/**.f90 -!ctem/setup.py -!ctem/ctem/*.py +!ctem/**.py !cmake/Modules/*.cmake \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index fd259936..eb4fdb32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ ENDIF () OPTION(USE_COARRAY "Use Coarray Fortran for parallelization of test particles" OFF) OPTION(USE_OPENMP "Use OpenMP for parallelization" ON) OPTION(USE_SIMD "Use SIMD vectorization" ON) -OPTION(BUILD_SHARED_LIBS "Build using shared libraries" OFF) +OPTION(BUILD_SHARED_LIBS "Build using shared libraries" ON) # The following section is modified from Numpy f2py documentation IF(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR) diff --git a/ctem/ctem/driver.py b/ctem/ctem/driver.py index 0c9bd611..0249c19d 100644 --- a/ctem/ctem/driver.py +++ b/ctem/ctem/driver.py @@ -52,7 +52,7 @@ def __init__(self, param_file="ctem.in", isnew=True): } # Get the location of the CTEM executable - self.ctem_executable = Path(_pyfile).parent.parent.parent.parent / "build" / "src" / "CTEM" + self.ctem_executable = Path(_pyfile).parent.parent.parent / "bin" / "CTEM" if not self.ctem_executable.exists(): print(f"CTEM driver not found at {self.ctem_executable}. Trying current directory.") self.ctem_executable = Path(currentdir) / "CTEM"