From 6275ce46cec91b9584a5ad25075dbe194dbf8d42 Mon Sep 17 00:00:00 2001 From: Paul Schmidt Date: Tue, 25 Nov 2025 22:04:15 +0100 Subject: [PATCH] changed main.cpp and made container for it --- CMakeLists.txt | 21 ++++++++++++++++++++ Dockerfile | 24 +++++++++++++++++++++++ main.cpp | 52 +++++++++++++++++++++++++------------------------- 3 files changed, 71 insertions(+), 26 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 Dockerfile diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..1c14597 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 3.16) +project(cmake-exercise) + +set(CMAKE_CXX_STANDARD 17) + +find_package(Boost REQUIRED COMPONENTS filesystem) +find_package(deal.II 9.0 REQUIRED) +find_package(yaml-cpp REQUIRED) + +add_executable(main + main.cpp + flatset/flatset.cpp + filesystem/filesystem.cpp + fem/fem.cpp + yamlParser/yamlParser.cpp +) + +target_include_directories(main PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(main Boost::filesystem yaml-cpp) + +DEAL_II_SETUP_TARGET(main) \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..3e76ca4 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,24 @@ +FROM ubuntu:24.04 + +RUN apt-get update && apt-get install -y \ + build-essential \ + cmake \ + unzip \ + wget \ + vim \ + libboost-all-dev \ + libdeal.ii-dev \ + && rm -rf /var/lib/apt/lists/* + +RUN wget https://github.com/jbeder/yaml-cpp/archive/refs/tags/yaml-cpp-0.6.3.tar.gz && \ + tar -xzf yaml-cpp-0.6.3.tar.gz && \ + cd yaml-cpp-yaml-cpp-0.6.3 && \ + mkdir build && cd build && \ + cmake .. && make && make install && \ + cd ../.. && rm -rf yaml-cpp-* + +ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH + +WORKDIR /cmake-exercise +COPY . . +CMD ["/bin/bash"] \ No newline at end of file diff --git a/main.cpp b/main.cpp index 7588360..ba913dc 100644 --- a/main.cpp +++ b/main.cpp @@ -1,39 +1,39 @@ -//#include "fem/fem.hpp" -//#include "flatset/flatset.hpp" -//#include "filesystem/filesystem.hpp" -//#include "yamlParser/yamlParser.hpp" +#include "fem/fem.hpp" +#include "flatset/flatset.hpp" +#include "filesystem/filesystem.hpp" +#include "yamlParser/yamlParser.hpp" #include int main(int argc, char *argv[]) { std::cout << "Let's fight with CMake, Docker, and some dependencies!" << std::endl << std::endl; - //std::cout << "Solve Poisson problem with FEM using deal.II" << std::endl; - //Fem fem; - //fem.run(); - //std::cout << std::endl; + std::cout << "Solve Poisson problem with FEM using deal.II" << std::endl; + Fem fem; + fem.run(); + std::cout << std::endl; - //std::cout << "Modify a flat set using boost container" << std::endl; - //modifyAndPrintSets(); - //std::cout << std::endl; + std::cout << "Modify a flat set using boost container" << std::endl; + modifyAndPrintSets(); + std::cout << std::endl; - //std::cout << "Inspect the current directory using boost filesystem" << std::endl; - //inspectDirectory(); - //std::cout << std::endl; + std::cout << "Inspect the current directory using boost filesystem" << std::endl; + inspectDirectory(); + std::cout << std::endl; - //if ( argc == 2 ) - //{ - // const std::string yamlFile( argv[1] ); - // std::cout << "Parse some yaml file with yaml-cpp" << std::endl; - // std::cout << " " << yamlFile << std::endl; - // parseConfig( yamlFile ); - //} - //else - //{ - // std::cout << "To parse a yaml file please specify file on command line" << std::endl; - // std::cout << " ./main YAMLFILE" << std::endl; - //} + if ( argc == 2 ) + { + const std::string yamlFile( argv[1] ); + std::cout << "Parse some yaml file with yaml-cpp" << std::endl; + std::cout << " " << yamlFile << std::endl; + parseConfig( yamlFile ); + } + else + { + std::cout << "To parse a yaml file please specify file on command line" << std::endl; + std::cout << " ./main YAMLFILE" << std::endl; + } return 0; }