diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f59a4fb8..93c669a3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,13 +49,12 @@ SET(FOOEXE swiftest_driver) SET(SRC ${CMAKE_SOURCE_DIR}/src) SET(LIB ${CMAKE_SOURCE_DIR}/lib) SET(BIN ${CMAKE_SOURCE_DIR}/bin) -SET(SRCOPT ${SRC}) # Have the .mod files placed in the lib folder SET(CMAKE_Fortran_MODULE_DIRECTORY ${LIB}) # The source for the FOO binary and have it placed in the bin folder -ADD_SUBDIRECTORY(${SRCOPT} ${BIN}) +ADD_SUBDIRECTORY(${SRC} ${BIN}) # Add a distclean target to the Makefile ADD_CUSTOM_TARGET(distclean diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 94a6205f3..ee3c64528 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,95 +3,95 @@ ######################################## # Add the source files -SET(FOO_src ${SRCOPT}/discard/discard.f90 - ${SRCOPT}/drift/drift.f90 - ${SRCOPT}/encounter/encounter_check.f90 - ${SRCOPT}/encounter/encounter_io.f90 - ${SRCOPT}/encounter/encounter_setup.f90 - ${SRCOPT}/encounter/encounter_util.f90 - ${SRCOPT}/fraggle/fraggle_generate.f90 - ${SRCOPT}/fraggle/fraggle_io.f90 - ${SRCOPT}/fraggle/fraggle_placeholder.f90 - ${SRCOPT}/fraggle/fraggle_regime.f90 - ${SRCOPT}/fraggle/fraggle_set.f90 - ${SRCOPT}/fraggle/fraggle_setup.f90 - ${SRCOPT}/fraggle/fraggle_util.f90 - ${SRCOPT}/gr/gr.f90 - ${SRCOPT}/helio/helio_drift.f90 - ${SRCOPT}/helio/helio_gr.f90 - ${SRCOPT}/helio/helio_kick.f90 - ${SRCOPT}/helio/helio_setup.f90 - ${SRCOPT}/helio/helio_step.f90 - ${SRCOPT}/helio/helio_util.f90 - ${SRCOPT}/io/io.f90 - ${SRCOPT}/kick/kick.f90 - ${SRCOPT}/main/swiftest_driver.f90 - ${SRCOPT}/modules/encounter_classes.f90 - ${SRCOPT}/modules/fraggle_classes.f90 - ${SRCOPT}/modules/helio_classes.f90 - ${SRCOPT}/modules/lambda_function.f90 - ${SRCOPT}/modules/rmvs_classes.f90 - ${SRCOPT}/modules/swiftest_classes.f90 - ${SRCOPT}/modules/swiftest_globals.f90 - ${SRCOPT}/modules/swiftest_operators.f90 - ${SRCOPT}/modules/swiftest.f90 - ${SRCOPT}/modules/symba_classes.f90 - ${SRCOPT}/modules/walltime_classes.f90 - ${SRCOPT}/modules/whm_classes.f90 - ${SRCOPT}/netcdf/netcdf.f90 - ${SRCOPT}/obl/obl.f90 - ${SRCOPT}/operators/operator_cross.f90 - ${SRCOPT}/operators/operator_mag.f90 - ${SRCOPT}/orbel/orbel.f90 -# ${SRCOPT}/python_bindings/orbel.f90 - ${SRCOPT}/rmvs/rmvs_discard.f90 - ${SRCOPT}/rmvs/rmvs_encounter_check.f90 - ${SRCOPT}/rmvs/rmvs_io.f90 - ${SRCOPT}/rmvs/rmvs_kick.f90 - ${SRCOPT}/rmvs/rmvs_setup.f90 - ${SRCOPT}/rmvs/rmvs_step.f90 - ${SRCOPT}/rmvs/rmvs_util.f90 - ${SRCOPT}/setup/setup.f90 - ${SRCOPT}/symba/symba_collision.f90 - ${SRCOPT}/symba/symba_discard.f90 - ${SRCOPT}/symba/symba_drift.f90 - ${SRCOPT}/symba/symba_encounter_check.f90 - ${SRCOPT}/symba/symba_gr.f90 - ${SRCOPT}/symba/symba_io.f90 - ${SRCOPT}/symba/symba_kick.f90 - ${SRCOPT}/symba/symba_setup.f90 - ${SRCOPT}/symba/symba_step.f90 - ${SRCOPT}/symba/symba_util.f90 -# ${SRCOPT}/tides/tides_getacch_pl.f90 -# ${SRCOPT}/tides/tides_spin_step.f90 - ${SRCOPT}/user/user_getacch.f90 - ${SRCOPT}/util/util_append.f90 - ${SRCOPT}/util/util_coord.f90 - ${SRCOPT}/util/util_copy.f90 - ${SRCOPT}/util/util_dealloc.f90 - ${SRCOPT}/util/util_exit.f90 - ${SRCOPT}/util/util_fill.f90 - ${SRCOPT}/util/util_flatten.f90 - ${SRCOPT}/util/util_get_energy_momentum.f90 - ${SRCOPT}/util/util_index_array.f90 - ${SRCOPT}/util/util_minimize_bfgs.f90 - ${SRCOPT}/util/util_peri.f90 - ${SRCOPT}/util/util_rescale.f90 - ${SRCOPT}/util/util_resize.f90 - ${SRCOPT}/util/util_set.f90 - ${SRCOPT}/util/util_solve.f90 - ${SRCOPT}/util/util_sort.f90 - ${SRCOPT}/util/util_spill.f90 - ${SRCOPT}/util/util_valid.f90 - ${SRCOPT}/util/util_version.f90 - ${SRCOPT}/walltime/walltime.f90 - ${SRCOPT}/whm/whm_coord.f90 - ${SRCOPT}/whm/whm_drift.f90 - ${SRCOPT}/whm/whm_gr.f90 - ${SRCOPT}/whm/whm_kick.f90 - ${SRCOPT}/whm/whm_setup.f90 - ${SRCOPT}/whm/whm_step.f90 - ${SRCOPT}/whm/whm_util.f90 +SET(FOO_src ${SRC}/discard/discard.f90 + ${SRC}/drift/drift.f90 + ${SRC}/encounter/encounter_check.f90 + ${SRC}/encounter/encounter_io.f90 + ${SRC}/encounter/encounter_setup.f90 + ${SRC}/encounter/encounter_util.f90 + ${SRC}/fraggle/fraggle_generate.f90 + ${SRC}/fraggle/fraggle_io.f90 + ${SRC}/fraggle/fraggle_placeholder.f90 + ${SRC}/fraggle/fraggle_regime.f90 + ${SRC}/fraggle/fraggle_set.f90 + ${SRC}/fraggle/fraggle_setup.f90 + ${SRC}/fraggle/fraggle_util.f90 + ${SRC}/gr/gr.f90 + ${SRC}/helio/helio_drift.f90 + ${SRC}/helio/helio_gr.f90 + ${SRC}/helio/helio_kick.f90 + ${SRC}/helio/helio_setup.f90 + ${SRC}/helio/helio_step.f90 + ${SRC}/helio/helio_util.f90 + ${SRC}/io/io.f90 + ${SRC}/kick/kick.f90 + ${SRC}/main/swiftest_driver.f90 + ${SRC}/modules/encounter_classes.f90 + ${SRC}/modules/fraggle_classes.f90 + ${SRC}/modules/helio_classes.f90 + ${SRC}/modules/lambda_function.f90 + ${SRC}/modules/rmvs_classes.f90 + ${SRC}/modules/swiftest_classes.f90 + ${SRC}/modules/swiftest_globals.f90 + ${SRC}/modules/swiftest_operators.f90 + ${SRC}/modules/swiftest.f90 + ${SRC}/modules/symba_classes.f90 + ${SRC}/modules/walltime_classes.f90 + ${SRC}/modules/whm_classes.f90 + ${SRC}/netcdf/netcdf.f90 + ${SRC}/obl/obl.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 + ${SRC}/rmvs/rmvs_kick.f90 + ${SRC}/rmvs/rmvs_setup.f90 + ${SRC}/rmvs/rmvs_step.f90 + ${SRC}/rmvs/rmvs_util.f90 + ${SRC}/setup/setup.f90 + ${SRC}/symba/symba_collision.f90 + ${SRC}/symba/symba_discard.f90 + ${SRC}/symba/symba_drift.f90 + ${SRC}/symba/symba_encounter_check.f90 + ${SRC}/symba/symba_gr.f90 + ${SRC}/symba/symba_io.f90 + ${SRC}/symba/symba_kick.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 + ${SRC}/util/util_copy.f90 + ${SRC}/util/util_dealloc.f90 + ${SRC}/util/util_exit.f90 + ${SRC}/util/util_fill.f90 + ${SRC}/util/util_flatten.f90 + ${SRC}/util/util_get_energy_momentum.f90 + ${SRC}/util/util_index_array.f90 + ${SRC}/util/util_minimize_bfgs.f90 + ${SRC}/util/util_peri.f90 + ${SRC}/util/util_rescale.f90 + ${SRC}/util/util_resize.f90 + ${SRC}/util/util_set.f90 + ${SRC}/util/util_solve.f90 + ${SRC}/util/util_sort.f90 + ${SRC}/util/util_spill.f90 + ${SRC}/util/util_valid.f90 + ${SRC}/util/util_version.f90 + ${SRC}/walltime/walltime.f90 + ${SRC}/whm/whm_coord.f90 + ${SRC}/whm/whm_drift.f90 + ${SRC}/whm/whm_gr.f90 + ${SRC}/whm/whm_kick.f90 + ${SRC}/whm/whm_setup.f90 + ${SRC}/whm/whm_step.f90 + ${SRC}/whm/whm_util.f90 ) # Define the executable in terms of the source files