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

Fix CustomRate segfaults and remove CustomReaction #1332

Merged
merged 7 commits into from
Jul 11, 2022

Conversation

ischoegl
Copy link
Member

@ischoegl ischoegl commented Jul 5, 2022

Changes proposed in this pull request

  • Remove CustomReaction specialization
  • Fix segfaults caused by temporary Python objects

If applicable, fill in the issue number this pull request is fixing

Closes #1282, partially addresses Cantera/enhancements#142

If applicable, provide an example illustrating new features this pull request is introducing

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

@codecov
Copy link

codecov bot commented Jul 5, 2022

Codecov Report

Merging #1332 (f30054a) into main (51494f4) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #1332      +/-   ##
==========================================
- Coverage   68.03%   68.02%   -0.01%     
==========================================
  Files         318      318              
  Lines       42008    41989      -19     
  Branches    16880    16871       -9     
==========================================
- Hits        28579    28562      -17     
+ Misses      11157    11155       -2     
  Partials     2272     2272              
Impacted Files Coverage Δ
src/kinetics/Reaction.cpp 88.01% <ø> (+0.81%) ⬆️
include/cantera/kinetics/Reaction.h 80.00% <100.00%> (-0.96%) ⬇️
src/kinetics/ReactionFactory.cpp 100.00% <100.00%> (ø)
include/cantera/kinetics/Custom.h 50.00% <0.00%> (-50.00%) ⬇️
src/kinetics/ReactionRateFactory.cpp 93.10% <0.00%> (-1.73%) ⬇️

📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more

@ischoegl ischoegl marked this pull request as ready for review July 5, 2022 17:45
@ischoegl ischoegl requested review from chinahg and a team and removed request for chinahg July 5, 2022 17:59
@ischoegl
Copy link
Member Author

@bryanwweber / @speth ... rebased and ready for a review. The commits are also included in #1333, so it will be easier to review this first.

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. I had just two very minor suggested modifications.

include/cantera/kinetics/Custom.h Outdated Show resolved Hide resolved
include/cantera/kinetics/Reaction.h Outdated Show resolved Hide resolved
@ischoegl
Copy link
Member Author

@speth ... thanks for the review! I updated both instances per recommendation.

@speth speth merged commit e3410f5 into Cantera:main Jul 11, 2022
@ischoegl ischoegl deleted the fix-custom-rate branch July 31, 2022 22:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

segfault when using CustomRate
3 participants