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

Deprecate StFlow::evalResidual #1619

Merged
merged 8 commits into from
Jun 23, 2024
Merged

Deprecate StFlow::evalResidual #1619

merged 8 commits into from
Jun 23, 2024

Conversation

ischoegl
Copy link
Member

@ischoegl ischoegl commented Sep 12, 2023

Changes proposed in this pull request

This is a follow-up to #1595, as proposed here: #1595 (comment)

  • Rename StFlow to Flow1D (which is consistent with other class names used for 1D simulations)
  • Backport StFlow with legacy methods StFlow::evalResidual, etc.; issue a deprecation warning when constructor is called
  • Reorder Flow1D content and add new named sections to improve doxygen documentation
  • Add googletest for legacy StFlow in test-oneD

Other than renaming / reordering content and reintroducing legacy code for deprecation purposes, this PR does not introduce any new capabilities.

Checklist

  • The pull request includes a clear description of this code change
  • Commit messages have short titles and reference relevant issues
  • Build passes (scons build & scons test) and unit tests address code coverage
  • Style & formatting of contributed code follows contributing guidelines
  • The pull request is ready for review

@ischoegl ischoegl marked this pull request as ready for review September 12, 2023 02:35
@ischoegl
Copy link
Member Author

ischoegl commented Sep 12, 2023

@speth ... this is the PR I had mentioned earlier. The diff is a little deceiving, as git doesn't acknowledge that files were renamed/removed and only partially re-added - the detailed commit history makes this a little clearer.

@wandadars ... this PR reorders the updateXYZ methods as you had envisioned.

@codecov
Copy link

codecov bot commented Sep 12, 2023

Codecov Report

Attention: Patch coverage is 81.85291% with 190 lines in your changes missing coverage. Please review.

Project coverage is 72.80%. Comparing base (b4fa531) to head (0e7e224).
Report is 2 commits behind head on main.

Files Patch % Lines
src/oneD/Flow1D.cpp 84.86% 69 Missing and 43 partials ⚠️
src/oneD/StFlow.cpp 59.84% 43 Missing and 10 partials ⚠️
src/clib/ctonedim.cpp 52.00% 24 Missing ⚠️
src/oneD/IonFlow.cpp 85.71% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1619      +/-   ##
==========================================
- Coverage   72.84%   72.80%   -0.05%     
==========================================
  Files         379      381       +2     
  Lines       53824    54011     +187     
  Branches     9182     9207      +25     
==========================================
+ Hits        39208    39321     +113     
- Misses      11642    11706      +64     
- Partials     2974     2984      +10     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ischoegl ischoegl requested a review from a team September 20, 2023 11:50
@ischoegl
Copy link
Member Author

@speth and @wandadars : I am closing this as there is too much interference with #1622.

@ischoegl ischoegl closed this Sep 23, 2023
@speth
Copy link
Member

speth commented Sep 23, 2023

I think this is still worth pursuing in general, but waiting until some of the other changes @wandadars is working on are finished makes sense to me.

@ischoegl ischoegl reopened this Sep 23, 2023
@ischoegl ischoegl removed the request for review from a team September 23, 2023 15:15
@ischoegl ischoegl marked this pull request as draft September 23, 2023 15:15
@ischoegl
Copy link
Member Author

I believe the window of opportunity to resolve this in 3.1 is de facto closed (see also #1639).

@ischoegl ischoegl closed this Oct 26, 2023
@ischoegl
Copy link
Member Author

Reopening so this can be tracked - I'd like to revisit as long as #1622 can be resolved prior to 3.1

@ischoegl ischoegl reopened this Mar 27, 2024
@wandadars
Copy link
Contributor

I have been testing the implementation against cases that I have solved using FlameMaster. So far I have been able to run an RCM1 H2/O2 ideal gas case using the "flamelets" generated by the two-point control method. I think that's a pretty good test of the implementation, so I will be making a push to merge that branch starting this week.

@ischoegl
Copy link
Member Author

With #1622 being merged, I hope to rebase these changes to current main, so we can get those into 3.1.

@ischoegl ischoegl force-pushed the rename-StFlow branch 2 times, most recently from 4b879f2 to 128eff4 Compare June 22, 2024 09:15
@ischoegl ischoegl marked this pull request as ready for review June 22, 2024 10:36
@ischoegl
Copy link
Member Author

ischoegl commented Jun 22, 2024

Rebased.

PS: As mentioned on top, the PR is actually much smaller than indicated by the line count (renaming + back port is an unfortunate combination).

@ischoegl ischoegl requested a review from speth June 22, 2024 10:37
Copy link
Member

@speth speth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @ischoegl. This looks good to me. Just a couple of small comments.

@ischoegl ischoegl requested a review from speth June 23, 2024 07:53
@ischoegl ischoegl self-assigned this Jun 23, 2024
@speth speth merged commit ded4513 into Cantera:main Jun 23, 2024
47 of 48 checks passed
@ischoegl ischoegl deleted the rename-StFlow branch June 23, 2024 18:38
@ischoegl ischoegl restored the rename-StFlow branch June 26, 2024 06:31
@ischoegl ischoegl deleted the rename-StFlow branch August 19, 2024 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants