From a7971aa748031519fe9226ce038ce73934ad7c21 Mon Sep 17 00:00:00 2001 From: HOCH PHILIPPE <philippe.hoch@gmail.com> Date: Sun, 18 Aug 2024 10:59:15 +0200 Subject: [PATCH] Mise a 2 tiers des quads co dim 1 --- .../RoeViscousFormEulerianCompositeSolver_v2.cpp | 16 ++++++++-------- src/scheme/RusanovEulerianCompositeSolver.cpp | 16 ++++++++-------- src/scheme/RusanovEulerianCompositeSolver_v2.cpp | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/scheme/RoeViscousFormEulerianCompositeSolver_v2.cpp b/src/scheme/RoeViscousFormEulerianCompositeSolver_v2.cpp index 2d4c3b74a..2aab892d8 100644 --- a/src/scheme/RoeViscousFormEulerianCompositeSolver_v2.cpp +++ b/src/scheme/RoeViscousFormEulerianCompositeSolver_v2.cpp @@ -1641,17 +1641,17 @@ class RoeViscousFormEulerianCompositeSolver_v2 } // dim 3 // Pour les assemblages - double theta = .5; - double eta = .2; + double theta = 2. / 3.; //.5; + double eta = 1. / 6.; //.2; if constexpr (Dimension == 2) { eta = 0; - } else { - theta = 1. / 3.; - eta = 1. / 3.; - - // theta = .5; - // eta = 0; } + // else { + // theta = 1. / 3.; + // eta = 1. / 3.; + // theta = .5; + // eta = 0; + //} // parallel_for( p_mesh->numberOfCells(), PUGS_LAMBDA(CellId j) { diff --git a/src/scheme/RusanovEulerianCompositeSolver.cpp b/src/scheme/RusanovEulerianCompositeSolver.cpp index 4192bacc4..d8db36aa2 100644 --- a/src/scheme/RusanovEulerianCompositeSolver.cpp +++ b/src/scheme/RusanovEulerianCompositeSolver.cpp @@ -1218,17 +1218,17 @@ class RusanovEulerianCompositeSolver } // dim 3 // Pour les assemblages - double theta = .5; - double eta = .2; + double theta = 2. / 3.; //.5; + double eta = 1. / 6.; //.2; if constexpr (Dimension == 2) { eta = 0; - } else { - theta = 1. / 3.; - eta = 1. / 3.; - - // theta = .5; - // eta = 0; } + // else { + // theta = 1. / 3.; + // eta = 1. / 3.; + // theta = .5; + // eta = 0; + //} // parallel_for( p_mesh->numberOfCells(), PUGS_LAMBDA(CellId j) { diff --git a/src/scheme/RusanovEulerianCompositeSolver_v2.cpp b/src/scheme/RusanovEulerianCompositeSolver_v2.cpp index 1a003ade6..d490202f5 100644 --- a/src/scheme/RusanovEulerianCompositeSolver_v2.cpp +++ b/src/scheme/RusanovEulerianCompositeSolver_v2.cpp @@ -1116,17 +1116,17 @@ class RusanovEulerianCompositeSolver_v2 } // dim 3 // Pour les assemblages - double theta = .5; - double eta = .2; + double theta = 2. / 3.; //.5; + double eta = 1. / 6.; //.2; if constexpr (Dimension == 2) { eta = 0; - } else { - theta = 1. / 3.; - eta = 1. / 3.; - - // theta = .5; - // eta = 0; } + // else{ + // theta = 1. / 3.; + // eta = 1. / 3.; + // theta = .5; + // eta = 0; + //} // parallel_for( p_mesh->numberOfCells(), PUGS_LAMBDA(CellId j) { -- GitLab