Skip to content

Standardize code#1565

Merged
speth merged 4 commits intoCantera:mainfrom
ischoegl:standardize-code
Aug 3, 2023
Merged

Standardize code#1565
speth merged 4 commits intoCantera:mainfrom
ischoegl:standardize-code

Conversation

@ischoegl
Copy link
Copy Markdown
Member

@ischoegl ischoegl commented Aug 2, 2023 •
edited
Loading

Changes proposed in this pull request

  • Replace redundant compositionMap by Composition
  • Eliminate unused grouplist_t and MaxExp
  • Replace std::set by set

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

Partially addresses Cantera/enhancements#181

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
Copy Markdown

codecov bot commented Aug 2, 2023 •
edited
Loading

Codecov Report

Merging #1565 (2f8ed63) into main (4dd28c4) will increase coverage by 0.01%.
The diff coverage is 85.71%.

❗ Current head 2f8ed63 differs from pull request most recent head a7e0e46. Consider uploading reports for the commit a7e0e46 to get more accurate results

@@            Coverage Diff             @@
##             main    #1565      +/-   ##
==========================================
+ Coverage   70.47%   70.48%   +0.01%     
==========================================
  Files         379      379              
  Lines       59093    59093              
  Branches    21230    21230              
==========================================
+ Hits        41643    41653      +10     
+ Misses      14369    14360       -9     
+ Partials     3081     3080       -1
Files Changed Coverage Δ
include/cantera/base/AnyMap.h 80.00% <ø> (ø)
include/cantera/base/Array.h 82.75% <ø> (ø)
include/cantera/base/global.h 81.81% <ø> (ø)
include/cantera/base/utilities.h 96.66% <ø> (ø)
include/cantera/equil/MultiPhase.h 100.00% <ø> (ø)
include/cantera/equil/MultiPhaseEquil.h 90.47% <ø> (ø)
include/cantera/kinetics/BlowersMaselRate.h 97.50% <ø> (ø)
include/cantera/kinetics/Kinetics.h 32.66% <ø> (ø)
include/cantera/kinetics/ReactionPath.h 67.44% <ø> (ø)
include/cantera/kinetics/StoichManager.h 95.46% <ø> (ø)
... and 32 more

... and 3 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@ischoegl
Copy link
Copy Markdown
Member Author

ischoegl commented Aug 2, 2023 •
edited
Loading

Applied the items from Cantera/enhancements#181 that are easiest (mostly removing the redundant compositionMap typedef). I can add more, but won't unless prompted.

@ischoegl ischoegl marked this pull request as ready for review August 2, 2023 19:56
@ischoegl ischoegl requested a review from a team August 2, 2023 19:56
@ischoegl ischoegl mentioned this pull request Aug 2, 2023
Closed
10 tasks
@ischoegl
Copy link
Copy Markdown
Member Author

ischoegl commented Aug 3, 2023

Rebased and ready for review. Doxygen bits moved to #1567.

@ischoegl ischoegl mentioned this pull request Aug 3, 2023
Closed
15 tasks
speth
speth approved these changes Aug 3, 2023
View reviewed changes
Copy link
Copy Markdown
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.

For the remaining items in Cantera/enhancements#181, I'd suggest bundling them into a single PR. I don't think splitting this across several PRs is particularly helpful to the review process.

@speth speth merged commit 6ba497c into Cantera:main Aug 3, 2023
@ischoegl ischoegl deleted the standardize-code branch August 3, 2023 19:56
@ischoegl ischoegl mentioned this pull request Aug 6, 2023
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@speth speth speth approved these changes

Assignees

No one assigned

Labels

None yet

Projects

No open projects
Cantera 3.0 Release Planning
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ischoegl @speth