diff --git a/CMakeLists.txt b/CMakeLists.txt index 20c5d0d..0cf0cf4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,20 +12,20 @@ else() set(UPDATE_DISCONNECTED_IF_AVAILABLE "UPDATE_DISCONNECTED 1") endif() +set(EXTERNAL_DEPS_DIR "/home/iason/Coding/build/external dependencies") ##Create directory for the external libraries -file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build/external) -#find_package(OpenMP REQUIRED) +file(MAKE_DIRECTORY ${EXTERNAL_DEPS_DIR}) ##Polyscope -set(USE_POLYSCOPE FALSE) +set(USE_POLYSCOPE TRUE) if(${USE_POLYSCOPE}) download_project(PROJ POLYSCOPE GIT_REPOSITORY https://github.com/nmwsharp/polyscope.git GIT_TAG master - PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/build/external/ + PREFIX ${EXTERNAL_DEPS_DIR} ${UPDATE_DISCONNECTED_IF_AVAILABLE} ) -add_subdirectory(${POLYSCOPE_SOURCE_DIR}) +add_subdirectory(${POLYSCOPE_SOURCE_DIR} ${POLYSCOPE_BINARY_DIR}) add_compile_definitions(POLYSCOPE_DEFINED) endif() @@ -37,27 +37,29 @@ else() download_project(PROJ MYSOURCES GIT_REPOSITORY https://gitea-s2i2s.isti.cnr.it/manolas/MySources.git GIT_TAG master - PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/build/external/ + PREFIX ${EXTERNAL_DEPS_DIR} ${UPDATE_DISCONNECTED_IF_AVAILABLE} ) endif() add_subdirectory(${MYSOURCES_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/MySourcesBinDir) -##dlib +#dlib +set(DLIB_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/dlib_bin) +file(MAKE_DIRECTORY ${DLIB_BIN_DIR}) download_project(PROJ DLIB GIT_REPOSITORY https://github.com/davisking/dlib.git GIT_TAG master - PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/build/external/ + BINARY_DIR ${DLIB_BIN_DIR} + PREFIX ${EXTERNAL_DEPS_DIR} ${UPDATE_DISCONNECTED_IF_AVAILABLE} ) -add_subdirectory(${DLIB_SOURCE_DIR}) - +add_subdirectory(${DLIB_SOURCE_DIR} ${DLIB_BINARY_DIR}) ##vcglib devel branch download_project(PROJ vcglib_devel GIT_REPOSITORY https://github.com/IasonManolas/vcglib.git GIT_TAG devel - PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/build/external/ + PREFIX ${EXTERNAL_DEPS_DIR} ${UPDATE_DISCONNECTED_IF_AVAILABLE} ) file(GLOB EXT_SOURCES ${vcglib_devel_SOURCE_DIR}/wrap/ply/plylib.cpp) @@ -66,7 +68,7 @@ file(GLOB EXT_SOURCES ${vcglib_devel_SOURCE_DIR}/wrap/ply/plylib.cpp) download_project(PROJ threed-beam-fea GIT_REPOSITORY https://github.com/IasonManolas/threed-beam-fea.git GIT_TAG master - PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/build/external/ + PREFIX ${EXTERNAL_DEPS_DIR} ${UPDATE_DISCONNECTED_IF_AVAILABLE} ) add_subdirectory(${threed-beam-fea_SOURCE_DIR} ${threed-beam-fea_BINARY_DIR}) @@ -96,7 +98,7 @@ target_include_directories(${PROJECT_NAME} target_link_directories(${PROJECT_NAME} PRIVATE ${MYSOURCES_SOURCE_DIR}/boost_graph/libs/) if(${USE_POLYSCOPE}) - target_link_libraries(${PROJECT_NAME} polyscope Eigen3::Eigen matplot dlib::dlib ThreedBeamFEA MySources) + target_link_libraries(${PROJECT_NAME} polyscope Eigen3::Eigen dlib::dlib ThreedBeamFEA MySources) else() - target_link_libraries(${PROJECT_NAME} -static Eigen3::Eigen matplot dlib::dlib ThreedBeamFEA MySources) + target_link_libraries(${PROJECT_NAME} -static Eigen3::Eigen dlib::dlib ThreedBeamFEA MySources) endif() diff --git a/src/linearsimulationmodel.cpp b/src/linearsimulationmodel.cpp deleted file mode 100644 index 6e663c6..0000000 --- a/src/linearsimulationmodel.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "linearsimulationmodel.hpp" -#include -#include -//#include -#include -#include -#include - - - - - - - - - - - - - - diff --git a/src/main.cpp b/src/main.cpp index 1edaf5b..80f3075 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) { // Export results const bool input_resultDirectoryDefined = argc >= 5; std::string optimizationResultsDirectory = - input_resultDirectoryDefined ? argv[4] : "OptimizationResults"; + input_resultDirectoryDefined ? argv[4] : std::filesystem::current_path().append("OptimizationResults"); std::string resultsOutputDir; if (optimizationResults.numberOfSimulationCrashes != 0) { const auto crashedJobsDirPath = diff --git a/src/reducedmodeloptimizer.cpp b/src/reducedmodeloptimizer.cpp index 544f5ff..ea6a408 100644 --- a/src/reducedmodeloptimizer.cpp +++ b/src/reducedmodeloptimizer.cpp @@ -752,7 +752,7 @@ ReducedModelOptimizer::createScenarios( scenarios.resize(SimulationScenario::NumberOfSimulationScenarios); std::unordered_map> fixedVertices; std::unordered_map nodalForces; - const double forceMagnitude = 1; + const double forceMagnitude = 10; //// Axial SimulationScenario scenarioName = SimulationScenario::Axial; @@ -765,7 +765,7 @@ ReducedModelOptimizer::createScenarios( nodalForces[viPair.first] = Vector6d({forceDirection[0], forceDirection[1], forceDirection[2], 0, 0, 0}) * - forceMagnitude * 2; + forceMagnitude * 8; fixedVertices[viPair.second] = std::unordered_set{0, 1, 2, 3, 4, 5}; } @@ -799,7 +799,7 @@ ReducedModelOptimizer::createScenarios( nodalForces[viPair.first] = Vector6d({forceDirection[0], forceDirection[1], forceDirection[2], 0, 0, 0}) * - forceMagnitude * 1; + forceMagnitude * 8; fixedVertices[viPair.second] = std::unordered_set{0, 1, 2, 3, 4, 5}; }