From 8c30cdaffd74b89b1ccb2123ed1977d40caae490 Mon Sep 17 00:00:00 2001 From: Clovis <clovis.schoeck@etudiant.univ-rennes.fr> Date: Wed, 17 Jul 2024 10:27:04 +0200 Subject: [PATCH] New versions of GKS : 1. In GKS2.cpp, parallel version of the "First order scheme", 2. Creation of the file GKSNavier.cpp, where the GKS expected to solve Navier-Stokes equations will be written --- src/scheme/CMakeLists.txt | 1 + src/scheme/GKS2.cpp | 3 +-- src/scheme/GKSNavier.cpp | 15 +++++++-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/scheme/CMakeLists.txt b/src/scheme/CMakeLists.txt index 019ba8ec4..78b460374 100644 --- a/src/scheme/CMakeLists.txt +++ b/src/scheme/CMakeLists.txt @@ -13,6 +13,7 @@ add_library( HyperelasticSolver.cpp GKS.cpp GKS2.cpp + GKSNavier.cpp ) target_link_libraries( diff --git a/src/scheme/GKS2.cpp b/src/scheme/GKS2.cpp index 54521fc80..02f61d736 100644 --- a/src/scheme/GKS2.cpp +++ b/src/scheme/GKS2.cpp @@ -1,5 +1,4 @@ - -#include <scheme/GKS.hpp> +#include <scheme/GKS2.hpp> #include <mesh/Mesh.hpp> #include <mesh/MeshData.hpp> diff --git a/src/scheme/GKSNavier.cpp b/src/scheme/GKSNavier.cpp index 92eeff2c2..9b8d4a615 100644 --- a/src/scheme/GKSNavier.cpp +++ b/src/scheme/GKSNavier.cpp @@ -1,5 +1,4 @@ - -#include <scheme/GKS.hpp> +#include <scheme/GKSNavier.hpp> #include <mesh/Mesh.hpp> #include <mesh/MeshData.hpp> @@ -243,12 +242,12 @@ class GKSNAVIER std::tuple<std::shared_ptr<const DiscreteFunctionVariant>, // rho std::shared_ptr<const DiscreteFunctionVariant>, // U std::shared_ptr<const DiscreteFunctionVariant>> // E -gks2(std::shared_ptr<const DiscreteFunctionVariant> rho_v, - std::shared_ptr<const DiscreteFunctionVariant> rho_U_v, - std::shared_ptr<const DiscreteFunctionVariant> rho_E_v, - std::shared_ptr<const DiscreteFunctionVariant> tau, - const double delta, - const double dt) +gksNavier(std::shared_ptr<const DiscreteFunctionVariant> rho_v, + std::shared_ptr<const DiscreteFunctionVariant> rho_U_v, + std::shared_ptr<const DiscreteFunctionVariant> rho_E_v, + std::shared_ptr<const DiscreteFunctionVariant> tau, + const double delta, + const double dt) { std::shared_ptr mesh_v = getCommonMesh({rho_v, rho_U_v, rho_E_v}); if (not mesh_v) { -- GitLab