Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Minor maintenence on cmake stuff
  • Loading branch information
daminton committed Oct 14, 2022
1 parent 13cf14b commit 571f26d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 51 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ SET(VERSION 1.0.0)
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules/")

# Uncomment if it is required that Fortran 90 is supported
#IF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90)
# MESSAGE(FATAL_ERROR "Fortran compiler does not support F90")
#ENDIF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90)
IF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90)
MESSAGE(FATAL_ERROR "Fortran compiler does not support F90")
ENDIF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90)

# Set some options the user may choose
# Uncomment the below if you want the user to choose a parallelization library
Expand Down
14 changes: 1 addition & 13 deletions cmake/Modules/SetFortranFlags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ ELSE()
ENDIF()
# Optimize for the host's architecture
SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}"
Fortran "-xHost" # Intel
Fortran "-xhost" # Intel
"/QxHost" # Intel Windows
${GNUNATIVE} # GNU
"-ta=host" # Portland Group
Expand Down Expand Up @@ -244,13 +244,6 @@ SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
"/Qip" # Intel Windows
)

# Vectorize code
SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
Fortran "-vec-report0" # Intel
"/Qvec-report0" # Intel Windows
"-Mvect" # Portland Group
)

# Allows for lines longer than 80 characters without truncation
SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
Fortran "-no-wrap-margin" # Intel
Expand All @@ -277,11 +270,6 @@ SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
Fortran "-simd" # Intel
)

# Generate instructions for the highest instruction set available
SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
Fortran "-xhost" # Intel
)

# Aligns a variable to a specified boundary and offset
SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
Fortran "-align all" # Intel
Expand Down
3 changes: 0 additions & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ SET(FOO_src ${SRC}/discard/discard.f90
${SRC}/operators/operator_cross.f90
${SRC}/operators/operator_mag.f90
${SRC}/orbel/orbel.f90
# ${SRC}/python_bindings/orbel.f90
${SRC}/rmvs/rmvs_discard.f90
${SRC}/rmvs/rmvs_encounter_check.f90
${SRC}/rmvs/rmvs_io.f90
Expand All @@ -62,8 +61,6 @@ SET(FOO_src ${SRC}/discard/discard.f90
${SRC}/symba/symba_setup.f90
${SRC}/symba/symba_step.f90
${SRC}/symba/symba_util.f90
# ${SRC}/tides/tides_getacch_pl.f90
# ${SRC}/tides/tides_spin_step.f90
${SRC}/user/user_getacch.f90
${SRC}/util/util_append.f90
${SRC}/util/util_coord.f90
Expand Down
32 changes: 0 additions & 32 deletions src/python_bindings/orbel.f90

This file was deleted.

0 comments on commit 571f26d

Please sign in to comment.