diff --git a/mathmech/CMakeLists.txt b/mathmech/CMakeLists.txt index 5c399bc..a4e9312 100644 --- a/mathmech/CMakeLists.txt +++ b/mathmech/CMakeLists.txt @@ -1,32 +1,11 @@ -cmake_minimum_required (VERSION 2.8) +set (COMPS mathmech + mm_agl + mm_envir + mm_radf + mm_statgen + mm_trj + mm_trj2pdb) -cmake_policy(SET CMP0003 OLD) -cmake_policy(SET CMP0011 NEW) -cmake_policy(SET CMP0015 NEW) - -# set project name -set (PROJECT mathmech) -# set additional cmake file -include (${PROJECT}.cmake) - - -# additional options -OPTION (WITH_DEBUG_MODE "Build with debug mode" OFF) -OPTION (ADD_INCLUDE "Add include files" OFF) - -# set libraries -set (LIBRARIES) - foreach (LIBRARY ${LIBRARIES}) - find_library ("${LIBRARY}_FOUND" ${LIBRARY}) - message (STATUS "Check the ${LIBRARY} is installed: " ${${LIBRARY}_FOUND}) - if ("${${LIBRARY}_FOUND}" STREQUAL "${LIBRARY}_FOUND-NOTFOUND") - message (STATUS "Adding library sources") - add_subdirectory (../${LIBRARY} lib/${LIBRARY}) - endif () - endforeach () - -# additional targets -set (TARGETS "") -set (HEADERS "") - -add_subdirectory (${${PROJECT}_SOURCE_DIR}) \ No newline at end of file +foreach (COMP ${COMPS}) + add_subdirectory (${COMP}) +endforeach() \ No newline at end of file diff --git a/mathmech/mathmech/CMakeLists.txt b/mathmech/mathmech/CMakeLists.txt new file mode 100644 index 0000000..d3528a4 --- /dev/null +++ b/mathmech/mathmech/CMakeLists.txt @@ -0,0 +1,32 @@ +cmake_minimum_required (VERSION 2.8) + +cmake_policy(SET CMP0003 OLD) +cmake_policy(SET CMP0011 NEW) +cmake_policy(SET CMP0015 NEW) + +# set project name +set (PROJECT mathmech) +# set additional cmake file +include (${PROJECT}.cmake) + + +# additional options +OPTION (WITH_DEBUG_MODE "Build with debug mode" OFF) +OPTION (ADD_INCLUDE "Add include files" OFF) + +# set libraries +set (LIBRARIES) + foreach (LIBRARY ${LIBRARIES}) + find_library ("${LIBRARY}_FOUND" ${LIBRARY}) + message (STATUS "Check the ${LIBRARY} is installed: " ${${LIBRARY}_FOUND}) + if ("${${LIBRARY}_FOUND}" STREQUAL "${LIBRARY}_FOUND-NOTFOUND") + message (STATUS "Adding library sources") + add_subdirectory (../${LIBRARY} lib/${LIBRARY}) + endif () + endforeach () + +# additional targets +set (TARGETS "") +set (HEADERS "") + +add_subdirectory (${PROJECT_SOURCE_DIR}) \ No newline at end of file diff --git a/mathmech/bin/mm_agl b/mathmech/mathmech/bin/mm_agl similarity index 100% rename from mathmech/bin/mm_agl rename to mathmech/mathmech/bin/mm_agl diff --git a/mathmech/bin/mm_envir b/mathmech/mathmech/bin/mm_envir similarity index 100% rename from mathmech/bin/mm_envir rename to mathmech/mathmech/bin/mm_envir diff --git a/mathmech/bin/mm_radf b/mathmech/mathmech/bin/mm_radf similarity index 100% rename from mathmech/bin/mm_radf rename to mathmech/mathmech/bin/mm_radf diff --git a/mathmech/bin/mm_statgen b/mathmech/mathmech/bin/mm_statgen similarity index 100% rename from mathmech/bin/mm_statgen rename to mathmech/mathmech/bin/mm_statgen diff --git a/mathmech/bin/mm_trj b/mathmech/mathmech/bin/mm_trj similarity index 100% rename from mathmech/bin/mm_trj rename to mathmech/mathmech/bin/mm_trj diff --git a/mathmech/bin/mm_trj2pdb b/mathmech/mathmech/bin/mm_trj2pdb similarity index 100% rename from mathmech/bin/mm_trj2pdb rename to mathmech/mathmech/bin/mm_trj2pdb diff --git a/mathmech/mathmech.cmake b/mathmech/mathmech/mathmech.cmake similarity index 51% rename from mathmech/mathmech.cmake rename to mathmech/mathmech/mathmech.cmake index dd834b0..91f4335 100644 --- a/mathmech/mathmech.cmake +++ b/mathmech/mathmech/mathmech.cmake @@ -1,15 +1,15 @@ # set directories -set (${PROJECT}_BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin) -set (${PROJECT}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) -set (${PROJECT}_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) -set (${PROJECT}_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib) -set (${PROJECT}_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/resources) -set (${PROJECT}_TRANSLATION_DIR ${${PROJECT}_RESOURCE_DIR}/translations) +set (PROJECT_BINARY_DIR bin) +set (PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) +set (PROJECT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) +set (PROJECT_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib) +set (PROJECT_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/resources) +set (PROJECT_TRANSLATION_DIR ${PROJECT_RESOURCE_DIR}/translations) # library path -link_directories (${${PROJECT}_LIB_DIR}) +link_directories (${PROJECT_LIB_DIR}) # executable path -set (EXECUTABLE_OUTPUT_PATH ${${PROJECT}_BINARY_DIR}) +set (EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}) # verbose set (CMAKE_VERBOSE_MAKEFILE ON) diff --git a/mathmech/resources/resources.qrc b/mathmech/mathmech/resources/resources.qrc similarity index 100% rename from mathmech/resources/resources.qrc rename to mathmech/mathmech/resources/resources.qrc diff --git a/mathmech/resources/translations/eng.qm b/mathmech/mathmech/resources/translations/eng.qm similarity index 100% rename from mathmech/resources/translations/eng.qm rename to mathmech/mathmech/resources/translations/eng.qm diff --git a/mathmech/resources/translations/eng.ts b/mathmech/mathmech/resources/translations/eng.ts similarity index 100% rename from mathmech/resources/translations/eng.ts rename to mathmech/mathmech/resources/translations/eng.ts diff --git a/mathmech/resources/translations/rus.qm b/mathmech/mathmech/resources/translations/rus.qm similarity index 100% rename from mathmech/resources/translations/rus.qm rename to mathmech/mathmech/resources/translations/rus.qm diff --git a/mathmech/resources/translations/rus.ts b/mathmech/mathmech/resources/translations/rus.ts similarity index 100% rename from mathmech/resources/translations/rus.ts rename to mathmech/mathmech/resources/translations/rus.ts diff --git a/mathmech/src/CMakeLists.txt b/mathmech/mathmech/src/CMakeLists.txt similarity index 73% rename from mathmech/src/CMakeLists.txt rename to mathmech/mathmech/src/CMakeLists.txt index 1c62faf..475b952 100644 --- a/mathmech/src/CMakeLists.txt +++ b/mathmech/mathmech/src/CMakeLists.txt @@ -1,9 +1,9 @@ -set ("${PROJECT}_VERSION_MAJOR" 1) -set ("${PROJECT}_VERSION_MINOR" 0) -set ("${PROJECT}_VERSION_PATCH" 0) -set ("${PROJECT}_VERSION" ${${PROJECT}_VERSION_MAJOR}.${${PROJECT}_VERSION_MINOR}.${${PROJECT}_VERSION_PATCH}) +set (PROJECT_VERSION_MAJOR 1) +set (PROJECT_VERSION_MINOR 0) +set (PROJECT_VERSION_PATCH 0) +set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) -message (STATUS "${PROJECT}: Version ${${PROJECT}_VERSION}") +message (STATUS "${PROJECT}: Version ${PROJECT_VERSION}") # set files file (GLOB SOURCES *.cpp) @@ -18,7 +18,7 @@ endif() set (LANGUAGES eng rus) -set (RESOURCES ${${PROJECT}_RESOURCE_DIR}/resources.qrc) +set (RESOURCES ${PROJECT_RESOURCE_DIR}/resources.qrc) message (STATUS "SOURCES: ${SOURCES}") message (STATUS "HEADERS: ${HEADERS}") @@ -28,8 +28,8 @@ message (STATUS "FORMS: ${FORMS}") # compile project (${PROJECT}) # include_path -include_directories (${${PROJECT}_INCLUDE_DIR}/${PROJECT} - ${${PROJECT}_SOURCE_DIR} +include_directories (${PROJECT_INCLUDE_DIR}/${PROJECT} + ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) find_package (Qt4 REQUIRED) @@ -38,8 +38,8 @@ qt4_add_resources (QRC_SOURCES ${RESOURCES}) qt4_wrap_cpp (MOC_SOURCES ${HEADERS}) qt4_wrap_ui (UI_HEADERS ${FORMS}) foreach (LANGUAGE ${LANGUAGES}) - set (TS ${${PROJECT}_TRANSLATION_DIR}/${LANGUAGE}.ts) - set (QM ${${PROJECT}_TRANSLATION_DIR}/${LANGUAGE}.qm) + set (TS ${PROJECT_TRANSLATION_DIR}/${LANGUAGE}.ts) + set (QM ${PROJECT_TRANSLATION_DIR}/${LANGUAGE}.qm) set (TRANSLATIONS ${TRANSLATIONS} ${TS}) set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM}) add_custom_command ( diff --git a/mathmech/src/Makefile b/mathmech/mathmech/src/Makefile similarity index 100% rename from mathmech/src/Makefile rename to mathmech/mathmech/src/Makefile diff --git a/mathmech/src/aboutwindow.cpp b/mathmech/mathmech/src/aboutwindow.cpp similarity index 100% rename from mathmech/src/aboutwindow.cpp rename to mathmech/mathmech/src/aboutwindow.cpp diff --git a/mathmech/src/aboutwindow.h b/mathmech/mathmech/src/aboutwindow.h similarity index 100% rename from mathmech/src/aboutwindow.h rename to mathmech/mathmech/src/aboutwindow.h diff --git a/mathmech/src/aboutwindow.ui b/mathmech/mathmech/src/aboutwindow.ui similarity index 100% rename from mathmech/src/aboutwindow.ui rename to mathmech/mathmech/src/aboutwindow.ui diff --git a/mathmech/src/agglwindow.cpp b/mathmech/mathmech/src/agglwindow.cpp similarity index 100% rename from mathmech/src/agglwindow.cpp rename to mathmech/mathmech/src/agglwindow.cpp diff --git a/mathmech/src/agglwindow.h b/mathmech/mathmech/src/agglwindow.h similarity index 100% rename from mathmech/src/agglwindow.h rename to mathmech/mathmech/src/agglwindow.h diff --git a/mathmech/src/agglwindow.ui b/mathmech/mathmech/src/agglwindow.ui similarity index 100% rename from mathmech/src/agglwindow.ui rename to mathmech/mathmech/src/agglwindow.ui diff --git a/mathmech/src/aglallwindow.cpp b/mathmech/mathmech/src/aglallwindow.cpp similarity index 100% rename from mathmech/src/aglallwindow.cpp rename to mathmech/mathmech/src/aglallwindow.cpp diff --git a/mathmech/src/aglallwindow.h b/mathmech/mathmech/src/aglallwindow.h similarity index 100% rename from mathmech/src/aglallwindow.h rename to mathmech/mathmech/src/aglallwindow.h diff --git a/mathmech/src/aglallwindow.ui b/mathmech/mathmech/src/aglallwindow.ui similarity index 100% rename from mathmech/src/aglallwindow.ui rename to mathmech/mathmech/src/aglallwindow.ui diff --git a/mathmech/src/atomtypeswindow.cpp b/mathmech/mathmech/src/atomtypeswindow.cpp similarity index 100% rename from mathmech/src/atomtypeswindow.cpp rename to mathmech/mathmech/src/atomtypeswindow.cpp diff --git a/mathmech/src/atomtypeswindow.h b/mathmech/mathmech/src/atomtypeswindow.h similarity index 100% rename from mathmech/src/atomtypeswindow.h rename to mathmech/mathmech/src/atomtypeswindow.h diff --git a/mathmech/src/atomtypeswindow.ui b/mathmech/mathmech/src/atomtypeswindow.ui similarity index 100% rename from mathmech/src/atomtypeswindow.ui rename to mathmech/mathmech/src/atomtypeswindow.ui diff --git a/mathmech/src/clear_items.cpp b/mathmech/mathmech/src/clear_items.cpp similarity index 100% rename from mathmech/src/clear_items.cpp rename to mathmech/mathmech/src/clear_items.cpp diff --git a/mathmech/src/clear_items.h b/mathmech/mathmech/src/clear_items.h similarity index 100% rename from mathmech/src/clear_items.h rename to mathmech/mathmech/src/clear_items.h diff --git a/mathmech/src/errorwindow.cpp b/mathmech/mathmech/src/errorwindow.cpp similarity index 100% rename from mathmech/src/errorwindow.cpp rename to mathmech/mathmech/src/errorwindow.cpp diff --git a/mathmech/src/errorwindow.h b/mathmech/mathmech/src/errorwindow.h similarity index 100% rename from mathmech/src/errorwindow.h rename to mathmech/mathmech/src/errorwindow.h diff --git a/mathmech/src/errorwindow.ui b/mathmech/mathmech/src/errorwindow.ui similarity index 100% rename from mathmech/src/errorwindow.ui rename to mathmech/mathmech/src/errorwindow.ui diff --git a/mathmech/src/main.cpp b/mathmech/mathmech/src/main.cpp similarity index 100% rename from mathmech/src/main.cpp rename to mathmech/mathmech/src/main.cpp diff --git a/mathmech/src/mainwindow.cpp b/mathmech/mathmech/src/mainwindow.cpp similarity index 100% rename from mathmech/src/mainwindow.cpp rename to mathmech/mathmech/src/mainwindow.cpp diff --git a/mathmech/src/mainwindow.h b/mathmech/mathmech/src/mainwindow.h similarity index 100% rename from mathmech/src/mainwindow.h rename to mathmech/mathmech/src/mainwindow.h diff --git a/mathmech/src/mainwindow.ui b/mathmech/mathmech/src/mainwindow.ui similarity index 100% rename from mathmech/src/mainwindow.ui rename to mathmech/mathmech/src/mainwindow.ui diff --git a/mathmech/src/mathmech.pro b/mathmech/mathmech/src/mathmech.pro similarity index 100% rename from mathmech/src/mathmech.pro rename to mathmech/mathmech/src/mathmech.pro diff --git a/mathmech/src/mathmech.pro.user b/mathmech/mathmech/src/mathmech.pro.user similarity index 99% rename from mathmech/src/mathmech.pro.user rename to mathmech/mathmech/src/mathmech.pro.user index 79b43ea..144baaa 100644 --- a/mathmech/src/mathmech.pro.user +++ b/mathmech/mathmech/src/mathmech.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -233,8 +233,8 @@ false 3768 - false - true + true + false false false true diff --git a/mathmech/src/settingswindow.cpp b/mathmech/mathmech/src/settingswindow.cpp similarity index 100% rename from mathmech/src/settingswindow.cpp rename to mathmech/mathmech/src/settingswindow.cpp diff --git a/mathmech/src/settingswindow.h b/mathmech/mathmech/src/settingswindow.h similarity index 100% rename from mathmech/src/settingswindow.h rename to mathmech/mathmech/src/settingswindow.h diff --git a/mathmech/src/settingswindow.ui b/mathmech/mathmech/src/settingswindow.ui similarity index 100% rename from mathmech/src/settingswindow.ui rename to mathmech/mathmech/src/settingswindow.ui diff --git a/mathmech/src/start_events.cpp b/mathmech/mathmech/src/start_events.cpp similarity index 100% rename from mathmech/src/start_events.cpp rename to mathmech/mathmech/src/start_events.cpp diff --git a/mathmech/src/start_events.h b/mathmech/mathmech/src/start_events.h similarity index 100% rename from mathmech/src/start_events.h rename to mathmech/mathmech/src/start_events.h diff --git a/mathmech/src/statgengraphwindow.cpp b/mathmech/mathmech/src/statgengraphwindow.cpp similarity index 100% rename from mathmech/src/statgengraphwindow.cpp rename to mathmech/mathmech/src/statgengraphwindow.cpp diff --git a/mathmech/src/statgengraphwindow.h b/mathmech/mathmech/src/statgengraphwindow.h similarity index 100% rename from mathmech/src/statgengraphwindow.h rename to mathmech/mathmech/src/statgengraphwindow.h diff --git a/mathmech/src/statgengraphwindow.ui b/mathmech/mathmech/src/statgengraphwindow.ui similarity index 100% rename from mathmech/src/statgengraphwindow.ui rename to mathmech/mathmech/src/statgengraphwindow.ui diff --git a/mathmech/src/update_fields.cpp b/mathmech/mathmech/src/update_fields.cpp similarity index 100% rename from mathmech/src/update_fields.cpp rename to mathmech/mathmech/src/update_fields.cpp diff --git a/mathmech/src/update_fields.h b/mathmech/mathmech/src/update_fields.h similarity index 100% rename from mathmech/src/update_fields.h rename to mathmech/mathmech/src/update_fields.h diff --git a/mm_agl/AUTHORS b/mathmech/mm_agl/AUTHORS similarity index 100% rename from mm_agl/AUTHORS rename to mathmech/mm_agl/AUTHORS diff --git a/mm_agl/CMakeLists.txt b/mathmech/mm_agl/CMakeLists.txt similarity index 100% rename from mm_agl/CMakeLists.txt rename to mathmech/mm_agl/CMakeLists.txt diff --git a/mm_agl/COPYING b/mathmech/mm_agl/COPYING similarity index 100% rename from mm_agl/COPYING rename to mathmech/mm_agl/COPYING diff --git a/mm_agl/INSTALL b/mathmech/mm_agl/INSTALL similarity index 100% rename from mm_agl/INSTALL rename to mathmech/mm_agl/INSTALL diff --git a/mm_agl/README b/mathmech/mm_agl/README similarity index 100% rename from mm_agl/README rename to mathmech/mm_agl/README diff --git a/mm_agl/logo.png b/mathmech/mm_agl/logo.png similarity index 100% rename from mm_agl/logo.png rename to mathmech/mm_agl/logo.png diff --git a/mm_agl/mm_agl.cmake b/mathmech/mm_agl/mm_agl.cmake similarity index 100% rename from mm_agl/mm_agl.cmake rename to mathmech/mm_agl/mm_agl.cmake diff --git a/mm_agl/mm_agl.doxygen b/mathmech/mm_agl/mm_agl.doxygen similarity index 100% rename from mm_agl/mm_agl.doxygen rename to mathmech/mm_agl/mm_agl.doxygen diff --git a/mm_agl/src/CMakeLists.txt b/mathmech/mm_agl/src/CMakeLists.txt similarity index 100% rename from mm_agl/src/CMakeLists.txt rename to mathmech/mm_agl/src/CMakeLists.txt diff --git a/mm_agl/src/Makefile b/mathmech/mm_agl/src/Makefile similarity index 100% rename from mm_agl/src/Makefile rename to mathmech/mm_agl/src/Makefile diff --git a/mm_agl/src/add_main.c b/mathmech/mm_agl/src/add_main.c similarity index 100% rename from mm_agl/src/add_main.c rename to mathmech/mm_agl/src/add_main.c diff --git a/mm_agl/src/add_main.h b/mathmech/mm_agl/src/add_main.h similarity index 100% rename from mm_agl/src/add_main.h rename to mathmech/mm_agl/src/add_main.h diff --git a/mm_agl/src/coords.c b/mathmech/mm_agl/src/coords.c similarity index 100% rename from mm_agl/src/coords.c rename to mathmech/mm_agl/src/coords.c diff --git a/mm_agl/src/coords.h b/mathmech/mm_agl/src/coords.h similarity index 100% rename from mm_agl/src/coords.h rename to mathmech/mm_agl/src/coords.h diff --git a/mm_agl/src/main.c b/mathmech/mm_agl/src/main.c similarity index 100% rename from mm_agl/src/main.c rename to mathmech/mm_agl/src/main.c diff --git a/mm_agl/src/messages.c b/mathmech/mm_agl/src/messages.c similarity index 100% rename from mm_agl/src/messages.c rename to mathmech/mm_agl/src/messages.c diff --git a/mm_agl/src/messages.h b/mathmech/mm_agl/src/messages.h similarity index 100% rename from mm_agl/src/messages.h rename to mathmech/mm_agl/src/messages.h diff --git a/mm_agl/src/print_struct.c b/mathmech/mm_agl/src/print_struct.c similarity index 100% rename from mm_agl/src/print_struct.c rename to mathmech/mm_agl/src/print_struct.c diff --git a/mm_agl/src/print_struct.h b/mathmech/mm_agl/src/print_struct.h similarity index 100% rename from mm_agl/src/print_struct.h rename to mathmech/mm_agl/src/print_struct.h diff --git a/mm_agl/src/read_agl.c b/mathmech/mm_agl/src/read_agl.c similarity index 100% rename from mm_agl/src/read_agl.c rename to mathmech/mm_agl/src/read_agl.c diff --git a/mm_agl/src/read_agl.h b/mathmech/mm_agl/src/read_agl.h similarity index 100% rename from mm_agl/src/read_agl.h rename to mathmech/mm_agl/src/read_agl.h diff --git a/mm_agl/src/select_mol.c b/mathmech/mm_agl/src/select_mol.c similarity index 100% rename from mm_agl/src/select_mol.c rename to mathmech/mm_agl/src/select_mol.c diff --git a/mm_agl/src/select_mol.h b/mathmech/mm_agl/src/select_mol.h similarity index 100% rename from mm_agl/src/select_mol.h rename to mathmech/mm_agl/src/select_mol.h diff --git a/mm_agl/src/set_center.c b/mathmech/mm_agl/src/set_center.c similarity index 100% rename from mm_agl/src/set_center.c rename to mathmech/mm_agl/src/set_center.c diff --git a/mm_agl/src/set_center.h b/mathmech/mm_agl/src/set_center.h similarity index 100% rename from mm_agl/src/set_center.h rename to mathmech/mm_agl/src/set_center.h diff --git a/mm_envir/AUTHORS b/mathmech/mm_envir/AUTHORS similarity index 100% rename from mm_envir/AUTHORS rename to mathmech/mm_envir/AUTHORS diff --git a/mm_envir/CMakeLists.txt b/mathmech/mm_envir/CMakeLists.txt similarity index 100% rename from mm_envir/CMakeLists.txt rename to mathmech/mm_envir/CMakeLists.txt diff --git a/mm_envir/COPYING b/mathmech/mm_envir/COPYING similarity index 100% rename from mm_envir/COPYING rename to mathmech/mm_envir/COPYING diff --git a/mm_envir/INSTALL b/mathmech/mm_envir/INSTALL similarity index 100% rename from mm_envir/INSTALL rename to mathmech/mm_envir/INSTALL diff --git a/mm_envir/README b/mathmech/mm_envir/README similarity index 100% rename from mm_envir/README rename to mathmech/mm_envir/README diff --git a/mm_envir/logo.png b/mathmech/mm_envir/logo.png similarity index 100% rename from mm_envir/logo.png rename to mathmech/mm_envir/logo.png diff --git a/mm_envir/mm_envir.cmake b/mathmech/mm_envir/mm_envir.cmake similarity index 100% rename from mm_envir/mm_envir.cmake rename to mathmech/mm_envir/mm_envir.cmake diff --git a/mm_envir/mm_envir.doxygen b/mathmech/mm_envir/mm_envir.doxygen similarity index 100% rename from mm_envir/mm_envir.doxygen rename to mathmech/mm_envir/mm_envir.doxygen diff --git a/mm_envir/src/CMakeLists.txt b/mathmech/mm_envir/src/CMakeLists.txt similarity index 100% rename from mm_envir/src/CMakeLists.txt rename to mathmech/mm_envir/src/CMakeLists.txt diff --git a/mm_envir/src/Makefile b/mathmech/mm_envir/src/Makefile similarity index 100% rename from mm_envir/src/Makefile rename to mathmech/mm_envir/src/Makefile diff --git a/mm_envir/src/add_main.c b/mathmech/mm_envir/src/add_main.c similarity index 100% rename from mm_envir/src/add_main.c rename to mathmech/mm_envir/src/add_main.c diff --git a/mm_envir/src/add_main.h b/mathmech/mm_envir/src/add_main.h similarity index 100% rename from mm_envir/src/add_main.h rename to mathmech/mm_envir/src/add_main.h diff --git a/mm_envir/src/coords.c b/mathmech/mm_envir/src/coords.c similarity index 100% rename from mm_envir/src/coords.c rename to mathmech/mm_envir/src/coords.c diff --git a/mm_envir/src/coords.h b/mathmech/mm_envir/src/coords.h similarity index 100% rename from mm_envir/src/coords.h rename to mathmech/mm_envir/src/coords.h diff --git a/mm_envir/src/envir_search.c b/mathmech/mm_envir/src/envir_search.c similarity index 100% rename from mm_envir/src/envir_search.c rename to mathmech/mm_envir/src/envir_search.c diff --git a/mm_envir/src/envir_search.h b/mathmech/mm_envir/src/envir_search.h similarity index 100% rename from mm_envir/src/envir_search.h rename to mathmech/mm_envir/src/envir_search.h diff --git a/mm_envir/src/main.c b/mathmech/mm_envir/src/main.c similarity index 100% rename from mm_envir/src/main.c rename to mathmech/mm_envir/src/main.c diff --git a/mm_envir/src/messages.c b/mathmech/mm_envir/src/messages.c similarity index 100% rename from mm_envir/src/messages.c rename to mathmech/mm_envir/src/messages.c diff --git a/mm_envir/src/messages.h b/mathmech/mm_envir/src/messages.h similarity index 100% rename from mm_envir/src/messages.h rename to mathmech/mm_envir/src/messages.h diff --git a/mm_envir/src/print_struct.c b/mathmech/mm_envir/src/print_struct.c similarity index 100% rename from mm_envir/src/print_struct.c rename to mathmech/mm_envir/src/print_struct.c diff --git a/mm_envir/src/print_struct.h b/mathmech/mm_envir/src/print_struct.h similarity index 100% rename from mm_envir/src/print_struct.h rename to mathmech/mm_envir/src/print_struct.h diff --git a/mm_envir/src/set_center.c b/mathmech/mm_envir/src/set_center.c similarity index 100% rename from mm_envir/src/set_center.c rename to mathmech/mm_envir/src/set_center.c diff --git a/mm_envir/src/set_center.h b/mathmech/mm_envir/src/set_center.h similarity index 100% rename from mm_envir/src/set_center.h rename to mathmech/mm_envir/src/set_center.h diff --git a/mm_radf/AUTHORS b/mathmech/mm_radf/AUTHORS similarity index 100% rename from mm_radf/AUTHORS rename to mathmech/mm_radf/AUTHORS diff --git a/mm_radf/CMakeLists.txt b/mathmech/mm_radf/CMakeLists.txt similarity index 100% rename from mm_radf/CMakeLists.txt rename to mathmech/mm_radf/CMakeLists.txt diff --git a/mm_radf/COPYING b/mathmech/mm_radf/COPYING similarity index 100% rename from mm_radf/COPYING rename to mathmech/mm_radf/COPYING diff --git a/mm_radf/INSTALL b/mathmech/mm_radf/INSTALL similarity index 100% rename from mm_radf/INSTALL rename to mathmech/mm_radf/INSTALL diff --git a/mm_radf/README b/mathmech/mm_radf/README similarity index 100% rename from mm_radf/README rename to mathmech/mm_radf/README diff --git a/mm_radf/logo.png b/mathmech/mm_radf/logo.png similarity index 100% rename from mm_radf/logo.png rename to mathmech/mm_radf/logo.png diff --git a/mm_radf/mm_radf.cmake b/mathmech/mm_radf/mm_radf.cmake similarity index 100% rename from mm_radf/mm_radf.cmake rename to mathmech/mm_radf/mm_radf.cmake diff --git a/mm_radf/mm_radf.doxygen b/mathmech/mm_radf/mm_radf.doxygen similarity index 100% rename from mm_radf/mm_radf.doxygen rename to mathmech/mm_radf/mm_radf.doxygen diff --git a/mm_radf/src/CMakeLists.txt b/mathmech/mm_radf/src/CMakeLists.txt similarity index 100% rename from mm_radf/src/CMakeLists.txt rename to mathmech/mm_radf/src/CMakeLists.txt diff --git a/mm_radf/src/Makefile b/mathmech/mm_radf/src/Makefile similarity index 100% rename from mm_radf/src/Makefile rename to mathmech/mm_radf/src/Makefile diff --git a/mm_radf/src/add_main.c b/mathmech/mm_radf/src/add_main.c similarity index 100% rename from mm_radf/src/add_main.c rename to mathmech/mm_radf/src/add_main.c diff --git a/mm_radf/src/add_main.h b/mathmech/mm_radf/src/add_main.h similarity index 100% rename from mm_radf/src/add_main.h rename to mathmech/mm_radf/src/add_main.h diff --git a/mm_radf/src/coords.c b/mathmech/mm_radf/src/coords.c similarity index 100% rename from mm_radf/src/coords.c rename to mathmech/mm_radf/src/coords.c diff --git a/mm_radf/src/coords.h b/mathmech/mm_radf/src/coords.h similarity index 100% rename from mm_radf/src/coords.h rename to mathmech/mm_radf/src/coords.h diff --git a/mm_radf/src/main.c b/mathmech/mm_radf/src/main.c similarity index 100% rename from mm_radf/src/main.c rename to mathmech/mm_radf/src/main.c diff --git a/mm_radf/src/messages.c b/mathmech/mm_radf/src/messages.c similarity index 100% rename from mm_radf/src/messages.c rename to mathmech/mm_radf/src/messages.c diff --git a/mm_radf/src/messages.h b/mathmech/mm_radf/src/messages.h similarity index 100% rename from mm_radf/src/messages.h rename to mathmech/mm_radf/src/messages.h diff --git a/mm_radf/src/radf.c b/mathmech/mm_radf/src/radf.c similarity index 100% rename from mm_radf/src/radf.c rename to mathmech/mm_radf/src/radf.c diff --git a/mm_radf/src/radf.h b/mathmech/mm_radf/src/radf.h similarity index 100% rename from mm_radf/src/radf.h rename to mathmech/mm_radf/src/radf.h diff --git a/mm_radf/src/radf_proc.c b/mathmech/mm_radf/src/radf_proc.c similarity index 100% rename from mm_radf/src/radf_proc.c rename to mathmech/mm_radf/src/radf_proc.c diff --git a/mm_radf/src/radf_proc.h b/mathmech/mm_radf/src/radf_proc.h similarity index 100% rename from mm_radf/src/radf_proc.h rename to mathmech/mm_radf/src/radf_proc.h diff --git a/mm_statgen/AUTHORS b/mathmech/mm_statgen/AUTHORS similarity index 100% rename from mm_statgen/AUTHORS rename to mathmech/mm_statgen/AUTHORS diff --git a/mm_statgen/CMakeLists.txt b/mathmech/mm_statgen/CMakeLists.txt similarity index 100% rename from mm_statgen/CMakeLists.txt rename to mathmech/mm_statgen/CMakeLists.txt diff --git a/mm_statgen/COPYING b/mathmech/mm_statgen/COPYING similarity index 100% rename from mm_statgen/COPYING rename to mathmech/mm_statgen/COPYING diff --git a/mm_statgen/INSTALL b/mathmech/mm_statgen/INSTALL similarity index 100% rename from mm_statgen/INSTALL rename to mathmech/mm_statgen/INSTALL diff --git a/mm_statgen/README b/mathmech/mm_statgen/README similarity index 100% rename from mm_statgen/README rename to mathmech/mm_statgen/README diff --git a/mm_statgen/logo.png b/mathmech/mm_statgen/logo.png similarity index 100% rename from mm_statgen/logo.png rename to mathmech/mm_statgen/logo.png diff --git a/mm_statgen/mm_statgen.cmake b/mathmech/mm_statgen/mm_statgen.cmake similarity index 100% rename from mm_statgen/mm_statgen.cmake rename to mathmech/mm_statgen/mm_statgen.cmake diff --git a/mm_statgen/mm_statgen.doxygen b/mathmech/mm_statgen/mm_statgen.doxygen similarity index 100% rename from mm_statgen/mm_statgen.doxygen rename to mathmech/mm_statgen/mm_statgen.doxygen diff --git a/mm_statgen/src/CMakeLists.txt b/mathmech/mm_statgen/src/CMakeLists.txt similarity index 100% rename from mm_statgen/src/CMakeLists.txt rename to mathmech/mm_statgen/src/CMakeLists.txt diff --git a/mm_statgen/src/Makefile b/mathmech/mm_statgen/src/Makefile similarity index 100% rename from mm_statgen/src/Makefile rename to mathmech/mm_statgen/src/Makefile diff --git a/mm_statgen/src/add_main.c b/mathmech/mm_statgen/src/add_main.c similarity index 100% rename from mm_statgen/src/add_main.c rename to mathmech/mm_statgen/src/add_main.c diff --git a/mm_statgen/src/add_main.h b/mathmech/mm_statgen/src/add_main.h similarity index 100% rename from mm_statgen/src/add_main.h rename to mathmech/mm_statgen/src/add_main.h diff --git a/mm_statgen/src/coords.c b/mathmech/mm_statgen/src/coords.c similarity index 100% rename from mm_statgen/src/coords.c rename to mathmech/mm_statgen/src/coords.c diff --git a/mm_statgen/src/coords.h b/mathmech/mm_statgen/src/coords.h similarity index 100% rename from mm_statgen/src/coords.h rename to mathmech/mm_statgen/src/coords.h diff --git a/mm_statgen/src/graph.c b/mathmech/mm_statgen/src/graph.c similarity index 100% rename from mm_statgen/src/graph.c rename to mathmech/mm_statgen/src/graph.c diff --git a/mm_statgen/src/graph.h b/mathmech/mm_statgen/src/graph.h similarity index 100% rename from mm_statgen/src/graph.h rename to mathmech/mm_statgen/src/graph.h diff --git a/mm_statgen/src/main.c b/mathmech/mm_statgen/src/main.c similarity index 100% rename from mm_statgen/src/main.c rename to mathmech/mm_statgen/src/main.c diff --git a/mm_statgen/src/messages.c b/mathmech/mm_statgen/src/messages.c similarity index 100% rename from mm_statgen/src/messages.c rename to mathmech/mm_statgen/src/messages.c diff --git a/mm_statgen/src/messages.h b/mathmech/mm_statgen/src/messages.h similarity index 100% rename from mm_statgen/src/messages.h rename to mathmech/mm_statgen/src/messages.h diff --git a/mm_statgen/src/stat_print.c b/mathmech/mm_statgen/src/stat_print.c similarity index 98% rename from mm_statgen/src/stat_print.c rename to mathmech/mm_statgen/src/stat_print.c index 4b96fd5..b69817a 100644 --- a/mm_statgen/src/stat_print.c +++ b/mathmech/mm_statgen/src/stat_print.c @@ -96,7 +96,7 @@ int printing_agl (const char *input, const char *output, const int *connect, { // number of tails if (j == 0) - if ((iso[j] == 0) || ((iso[j] <= 2) && (iso[j] == 0)) + if ((iso[j] == 0) || ((iso[j] <= 2) && (iso[j] == 0))) // not branched type_agl[2]++; // branched diff --git a/mm_statgen/src/stat_print.h b/mathmech/mm_statgen/src/stat_print.h similarity index 100% rename from mm_statgen/src/stat_print.h rename to mathmech/mm_statgen/src/stat_print.h diff --git a/mm_statgen/src/stat_select.c b/mathmech/mm_statgen/src/stat_select.c similarity index 100% rename from mm_statgen/src/stat_select.c rename to mathmech/mm_statgen/src/stat_select.c diff --git a/mm_statgen/src/stat_select.h b/mathmech/mm_statgen/src/stat_select.h similarity index 100% rename from mm_statgen/src/stat_select.h rename to mathmech/mm_statgen/src/stat_select.h diff --git a/mm_statgen/src/stat_sort.c b/mathmech/mm_statgen/src/stat_sort.c similarity index 100% rename from mm_statgen/src/stat_sort.c rename to mathmech/mm_statgen/src/stat_sort.c diff --git a/mm_statgen/src/stat_sort.h b/mathmech/mm_statgen/src/stat_sort.h similarity index 100% rename from mm_statgen/src/stat_sort.h rename to mathmech/mm_statgen/src/stat_sort.h diff --git a/mm_statgen/src/summary_stat.c b/mathmech/mm_statgen/src/summary_stat.c similarity index 100% rename from mm_statgen/src/summary_stat.c rename to mathmech/mm_statgen/src/summary_stat.c diff --git a/mm_statgen/src/summary_stat.h b/mathmech/mm_statgen/src/summary_stat.h similarity index 100% rename from mm_statgen/src/summary_stat.h rename to mathmech/mm_statgen/src/summary_stat.h diff --git a/mm_trj/AUTHORS b/mathmech/mm_trj/AUTHORS similarity index 100% rename from mm_trj/AUTHORS rename to mathmech/mm_trj/AUTHORS diff --git a/mm_trj/CMakeLists.txt b/mathmech/mm_trj/CMakeLists.txt similarity index 100% rename from mm_trj/CMakeLists.txt rename to mathmech/mm_trj/CMakeLists.txt diff --git a/mm_trj/COPYING b/mathmech/mm_trj/COPYING similarity index 100% rename from mm_trj/COPYING rename to mathmech/mm_trj/COPYING diff --git a/mm_trj/INSTALL b/mathmech/mm_trj/INSTALL similarity index 100% rename from mm_trj/INSTALL rename to mathmech/mm_trj/INSTALL diff --git a/mm_trj/README b/mathmech/mm_trj/README similarity index 100% rename from mm_trj/README rename to mathmech/mm_trj/README diff --git a/mm_trj/logo.png b/mathmech/mm_trj/logo.png similarity index 100% rename from mm_trj/logo.png rename to mathmech/mm_trj/logo.png diff --git a/mm_trj/mm_trj.cmake b/mathmech/mm_trj/mm_trj.cmake similarity index 100% rename from mm_trj/mm_trj.cmake rename to mathmech/mm_trj/mm_trj.cmake diff --git a/mm_trj/mm_trj.doxygen b/mathmech/mm_trj/mm_trj.doxygen similarity index 100% rename from mm_trj/mm_trj.doxygen rename to mathmech/mm_trj/mm_trj.doxygen diff --git a/mm_trj/src/CMakeLists.txt b/mathmech/mm_trj/src/CMakeLists.txt similarity index 100% rename from mm_trj/src/CMakeLists.txt rename to mathmech/mm_trj/src/CMakeLists.txt diff --git a/mm_trj/src/Makefile b/mathmech/mm_trj/src/Makefile similarity index 100% rename from mm_trj/src/Makefile rename to mathmech/mm_trj/src/Makefile diff --git a/mm_trj/src/add_main.c b/mathmech/mm_trj/src/add_main.c similarity index 100% rename from mm_trj/src/add_main.c rename to mathmech/mm_trj/src/add_main.c diff --git a/mm_trj/src/add_main.h b/mathmech/mm_trj/src/add_main.h similarity index 100% rename from mm_trj/src/add_main.h rename to mathmech/mm_trj/src/add_main.h diff --git a/mm_trj/src/atom_types.c b/mathmech/mm_trj/src/atom_types.c similarity index 100% rename from mm_trj/src/atom_types.c rename to mathmech/mm_trj/src/atom_types.c diff --git a/mm_trj/src/atom_types.h b/mathmech/mm_trj/src/atom_types.h similarity index 100% rename from mm_trj/src/atom_types.h rename to mathmech/mm_trj/src/atom_types.h diff --git a/mm_trj/src/main.c b/mathmech/mm_trj/src/main.c similarity index 100% rename from mm_trj/src/main.c rename to mathmech/mm_trj/src/main.c diff --git a/mm_trj/src/messages.c b/mathmech/mm_trj/src/messages.c similarity index 100% rename from mm_trj/src/messages.c rename to mathmech/mm_trj/src/messages.c diff --git a/mm_trj/src/messages.h b/mathmech/mm_trj/src/messages.h similarity index 100% rename from mm_trj/src/messages.h rename to mathmech/mm_trj/src/messages.h diff --git a/mm_trj/src/print_trj.c b/mathmech/mm_trj/src/print_trj.c similarity index 100% rename from mm_trj/src/print_trj.c rename to mathmech/mm_trj/src/print_trj.c diff --git a/mm_trj/src/print_trj.h b/mathmech/mm_trj/src/print_trj.h similarity index 100% rename from mm_trj/src/print_trj.h rename to mathmech/mm_trj/src/print_trj.h diff --git a/mm_trj/src/read_gmx.c b/mathmech/mm_trj/src/read_gmx.c similarity index 100% rename from mm_trj/src/read_gmx.c rename to mathmech/mm_trj/src/read_gmx.c diff --git a/mm_trj/src/read_gmx.h b/mathmech/mm_trj/src/read_gmx.h similarity index 100% rename from mm_trj/src/read_gmx.h rename to mathmech/mm_trj/src/read_gmx.h diff --git a/mm_trj/src/read_puma.c b/mathmech/mm_trj/src/read_puma.c similarity index 100% rename from mm_trj/src/read_puma.c rename to mathmech/mm_trj/src/read_puma.c diff --git a/mm_trj/src/read_puma.h b/mathmech/mm_trj/src/read_puma.h similarity index 100% rename from mm_trj/src/read_puma.h rename to mathmech/mm_trj/src/read_puma.h diff --git a/mm_trj2pdb/AUTHORS b/mathmech/mm_trj2pdb/AUTHORS similarity index 100% rename from mm_trj2pdb/AUTHORS rename to mathmech/mm_trj2pdb/AUTHORS diff --git a/mm_trj2pdb/CMakeLists.txt b/mathmech/mm_trj2pdb/CMakeLists.txt similarity index 100% rename from mm_trj2pdb/CMakeLists.txt rename to mathmech/mm_trj2pdb/CMakeLists.txt diff --git a/mm_trj2pdb/COPYING b/mathmech/mm_trj2pdb/COPYING similarity index 100% rename from mm_trj2pdb/COPYING rename to mathmech/mm_trj2pdb/COPYING diff --git a/mm_trj2pdb/INSTALL b/mathmech/mm_trj2pdb/INSTALL similarity index 100% rename from mm_trj2pdb/INSTALL rename to mathmech/mm_trj2pdb/INSTALL diff --git a/mm_trj2pdb/README b/mathmech/mm_trj2pdb/README similarity index 100% rename from mm_trj2pdb/README rename to mathmech/mm_trj2pdb/README diff --git a/mm_trj2pdb/logo.png b/mathmech/mm_trj2pdb/logo.png similarity index 100% rename from mm_trj2pdb/logo.png rename to mathmech/mm_trj2pdb/logo.png diff --git a/mm_trj2pdb/mm_trj2pdb.cmake b/mathmech/mm_trj2pdb/mm_trj2pdb.cmake similarity index 100% rename from mm_trj2pdb/mm_trj2pdb.cmake rename to mathmech/mm_trj2pdb/mm_trj2pdb.cmake diff --git a/mm_trj2pdb/mm_trj2pdb.doxygen b/mathmech/mm_trj2pdb/mm_trj2pdb.doxygen similarity index 100% rename from mm_trj2pdb/mm_trj2pdb.doxygen rename to mathmech/mm_trj2pdb/mm_trj2pdb.doxygen diff --git a/mm_trj2pdb/src/CMakeLists.txt b/mathmech/mm_trj2pdb/src/CMakeLists.txt similarity index 100% rename from mm_trj2pdb/src/CMakeLists.txt rename to mathmech/mm_trj2pdb/src/CMakeLists.txt diff --git a/mm_trj2pdb/src/Makefile b/mathmech/mm_trj2pdb/src/Makefile similarity index 100% rename from mm_trj2pdb/src/Makefile rename to mathmech/mm_trj2pdb/src/Makefile diff --git a/mm_trj2pdb/src/add_main.c b/mathmech/mm_trj2pdb/src/add_main.c similarity index 100% rename from mm_trj2pdb/src/add_main.c rename to mathmech/mm_trj2pdb/src/add_main.c diff --git a/mm_trj2pdb/src/add_main.h b/mathmech/mm_trj2pdb/src/add_main.h similarity index 100% rename from mm_trj2pdb/src/add_main.h rename to mathmech/mm_trj2pdb/src/add_main.h diff --git a/mm_trj2pdb/src/coords.c b/mathmech/mm_trj2pdb/src/coords.c similarity index 100% rename from mm_trj2pdb/src/coords.c rename to mathmech/mm_trj2pdb/src/coords.c diff --git a/mm_trj2pdb/src/coords.h b/mathmech/mm_trj2pdb/src/coords.h similarity index 100% rename from mm_trj2pdb/src/coords.h rename to mathmech/mm_trj2pdb/src/coords.h diff --git a/mm_trj2pdb/src/main.c b/mathmech/mm_trj2pdb/src/main.c similarity index 100% rename from mm_trj2pdb/src/main.c rename to mathmech/mm_trj2pdb/src/main.c diff --git a/mm_trj2pdb/src/messages.c b/mathmech/mm_trj2pdb/src/messages.c similarity index 100% rename from mm_trj2pdb/src/messages.c rename to mathmech/mm_trj2pdb/src/messages.c diff --git a/mm_trj2pdb/src/messages.h b/mathmech/mm_trj2pdb/src/messages.h similarity index 100% rename from mm_trj2pdb/src/messages.h rename to mathmech/mm_trj2pdb/src/messages.h diff --git a/mm_trj2pdb/src/print_struct.c b/mathmech/mm_trj2pdb/src/print_struct.c similarity index 100% rename from mm_trj2pdb/src/print_struct.c rename to mathmech/mm_trj2pdb/src/print_struct.c diff --git a/mm_trj2pdb/src/print_struct.h b/mathmech/mm_trj2pdb/src/print_struct.h similarity index 100% rename from mm_trj2pdb/src/print_struct.h rename to mathmech/mm_trj2pdb/src/print_struct.h