Skip to content

Commit

Permalink
Merge branch 'restructure' of github.itap.purdue.edu:MintonGroup/CTEM…
Browse files Browse the repository at this point in the history
… into restructure
  • Loading branch information
daminton committed Sep 12, 2023
2 parents 97446ba + 992658e commit aea2659
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 674 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
!README.md
!version.txt
!src/**.f90
!ctem/setup.py
!ctem/ctem/*.py
!ctem/**.py
!cmake/Modules/*.cmake
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ctem/ctem/driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
216 changes: 0 additions & 216 deletions examples/global-lunar-bombardment/craterproduction.py

This file was deleted.

6 changes: 3 additions & 3 deletions examples/global-lunar-bombardment/ctem_driver.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python3
import ctem
sim = ctem.Simulation()
#!/usr/bin/env python3
import ctem
sim = ctem.Simulation()
sim.run()
Loading

0 comments on commit aea2659

Please sign in to comment.