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.

Sign up for GitHub

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

Jump to bottom

Make use of 'override' specifier #1589

Merged
merged 14 commits into from Aug 15, 2023
Merged

Make use of 'override' specifier #1589

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
45aa62e
Define conservative limits for LatticeSolidPhase minTemp/maxTemp
speth Aug 13, 2023
a444538
[Thermo] Triage incorrect method overrides in LatticeSolidPhase
speth Aug 13, 2023
1cb8187
Use override on ThermoPhase classes
speth Aug 13, 2023
1fe622f
Use override on SpeciesThermoInterpType and PDSS derived classes
speth Aug 14, 2023
6744cb0
Use override on tpx::Substance classes
speth Aug 14, 2023
eaaa995
Use override on ReactionRate and ReactionDate classes
speth Aug 14, 2023
e2e3a92
Use override on remaining Kinetics classes
speth Aug 14, 2023
b1fd94d
Use override on transport classes
speth Aug 14, 2023
19d73a4
Use override on ZeroD classes
speth Aug 14, 2023
d144724
Use override on 1D classes
speth Aug 14, 2023
6568bd3
Use override on various utility classes
speth Aug 14, 2023
98a4555
Use override in C++ samples and tests
speth Aug 15, 2023
a10336b
[CI] Check for proper use of 'override'
speth Aug 15, 2023
e7862d2
[Test] Fix unused variable warning
speth Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 6 additions & 13 deletions include/cantera/thermo/LatticeSolidPhase.h
View file
Open in desktop
Expand Up @@ -284,20 +284,13 @@ class LatticeSolidPhase : public ThermoPhase
*
* @param x On return, x contains the mole fractions. Must have a length
* greater than or equal to the number of species.
*
* @todo This method shadows but does not override Phase::getMoleFractions(). The
* LatticeSolidPhase class should be revised to avoid needing to override the
* methods for getting composition. See
* https://github.com/Cantera/cantera/issues/1310 for additional information.
*/
virtual void getMoleFractions(double* const x) const;

virtual double moleFraction(const int k) const {
throw NotImplementedError("LatticeSolidPhase::moleFraction");
}

virtual void getMassFractions(double* const y) const {
throw NotImplementedError("LatticeSolidPhase::getMassFractions");
}

virtual double massFraction(const int k) const {
throw NotImplementedError("LatticeSolidPhase::massFraction");
}
ischoegl marked this conversation as resolved.
Show resolved Hide resolved
void getMoleFractions(double* const x) const;

virtual void setMassFractions(const double* const y) {
throw NotImplementedError("LatticeSolidPhase::setMassFractions");
Expand Down