Skip to content
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

Upstream non-Phase Change additions from #179 #223

Merged
merged 4 commits into from
Nov 11, 2023

Conversation

henryleberre
Copy link
Member

@henryleberre henryleberre commented Nov 5, 2023

Upstream non-Phase Change additions from #179.

@sbryngelson
Copy link
Member

thanks for doing this @henryleberre -- this will be convenient.

@sbryngelson
Copy link
Member

@henryleberre, I need clarification on part of this PR. You added the test cases corresponding to phase change, but the phase change feature has not been added to MFC yet (the PR is still awaiting revision). Is this intentional? It seems more natural to add those test cases when the phase change features are added.

@henryleberre
Copy link
Member Author

This is the case some overzealous grep'ing on my end - let me fix that now!

@henryleberre
Copy link
Member Author

@sbryngelson I removed the phase-change tests.

@sbryngelson
Copy link
Member

@henryleberre they still appear to be there? There are also diffs to non-phase-change test case goldenfiles that seem erroneous.

@henryleberre
Copy link
Member Author

@sbryngelson, apologies.. I have no idea what happened there. I just ran - again:

~/MFC-JRChreim $ git reset --soft HEAD~1
~/MFC-JRChreim $ git restore --staged $(git status | grep README | awk '{print $3}' | sed s/README\.md//g | tr '\n' ' ')
~/MFC-JRChreim $ git commit -m 'Internal energy calculation bugfix' --author="JRChreim <jrchreim@outlook.com>"

The tests whose golden files were modified are these:

~/MFC-JRChreim $ ./mfc.sh test -l | grep 'model_eqns=3'
  2F35A1FE   1D -> 1 Fluid(s) -> riemann_solver=2 -> model_eqns=3
  FD891191   1D -> 2 Fluid(s) -> riemann_solver=2 -> model_eqns=3
  043B535A   2D -> 1 Fluid(s) -> riemann_solver=2 -> model_eqns=3
  4F2F4ACE   2D -> 2 Fluid(s) -> riemann_solver=2 -> model_eqns=3
  B89B8C70   2D -> Axisymmetric -> model_eqns=3
  6241177B   3D -> 1 Fluid(s) -> riemann_solver=2 -> model_eqns=3
  F0E6771E   3D -> 2 Fluid(s) -> riemann_solver=2 -> model_eqns=3

These were meant to be updated by @JRChreim, fixing the internal energy calculation for model_eqns=3.

@sbryngelson sbryngelson merged commit dddba82 into MFlowCode:master Nov 11, 2023
15 checks passed
@sbryngelson sbryngelson deleted the upstream-fixes branch November 11, 2023 06:08
JRChreim added a commit to JRChreim/MFC-JRChreim that referenced this pull request Dec 21, 2023
Co-authored-by: JRChreim <jrchreim@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants