-
Notifications
You must be signed in to change notification settings - Fork 1k
Make the NEMO total-energy under-relaxation check reachable #2884
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
bellonarts
wants to merge
3
commits into
su2code:develop
Choose a base branch
from
babybluechips:fix_nemo_energy_underrelaxation
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /*! | ||
| * \file CNEMOEulerSolver_tests.cpp | ||
| * \brief Unit tests for the NEMO Euler solver. | ||
| * \version 8.5.0 "Harrier" | ||
| * | ||
| * SU2 Project Website: https://su2code.github.io | ||
| * | ||
| * The SU2 Project is maintained by the SU2 Foundation | ||
| * (http://su2foundation.org) | ||
| * | ||
| * Copyright 2012-2026, SU2 Contributors (cf. AUTHORS.md) | ||
| * | ||
| * SU2 is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2.1 of the License, or (at your option) any later version. | ||
| * | ||
| * SU2 is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with SU2. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| #include "catch.hpp" | ||
| #include "../../../SU2_CFD/include/solvers/CNEMOEulerSolver.hpp" | ||
|
|
||
| TEST_CASE("NEMO under-relaxation limits species and total-energy updates", "[NEMO][Solver]") { | ||
| const unsigned short nSpecies = 2; | ||
| const unsigned short nVar = 6; | ||
| /*--- Two species, two momentum components, total energy, and vibrational energy. ---*/ | ||
| const su2double solution[nVar] = {0.75, 0.25, 1.0, 1.0, 10.0, 2.0}; | ||
| const su2double allowableRatio = 0.2; | ||
|
|
||
| const struct { | ||
| const char* name; | ||
| su2double update[nVar]; | ||
| su2double expected; | ||
| } cases[] = { | ||
| {"zero update", {0.0, 0.0, 0.0, 0.0, 0.0, 0.0}, 1.0}, | ||
| {"small energy update", {0.0, 0.0, 0.0, 0.0, 1.0, 0.0}, 1.0}, | ||
| {"positive energy excess", {0.0, 0.0, 0.0, 0.0, 8.0, 0.0}, 0.25}, | ||
| {"negative energy excess", {0.0, 0.0, 0.0, 0.0, -8.0, 0.0}, 0.25}, | ||
| {"opposing species updates", {0.4, -0.4, 0.0, 0.0, 0.0, 0.0}, 0.25}, | ||
| {"species sets the tighter limit", {0.8, -0.8, 0.0, 0.0, 8.0, 0.0}, 0.125}, | ||
| {"energy sets the tighter limit", {0.2, -0.2, 0.0, 0.0, 8.0, 0.0}, 0.25}, | ||
| {"momentum and vibrational energy are not limited", {0.0, 0.0, 100.0, -100.0, 0.0, 100.0}, 1.0}, | ||
| {"tiny factor cancels the update", {0.0, 0.0, 0.0, 0.0, 1e12, 0.0}, 0.0}, | ||
| }; | ||
|
|
||
| for (const auto& test : cases) { | ||
| CAPTURE(test.name); | ||
| const su2double factor = | ||
| CNEMOEulerSolver::ComputeUnderRelaxationFactor(nSpecies, nVar, solution, test.update, allowableRatio); | ||
| CHECK(factor == Approx(test.expected).margin(1e-12)); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree, bootstraping the entire solver to test just this is too heavy handed, you want to have a unit test, make the logic in the loop a small re-usable function and feed it some manufactured data.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got it, I moved the limiter logic into a small function and tested it directly with manufactured data.