Skip to content

Commit a74da54

Browse files
authored
Merge pull request #1370 from TeamCOMPAS/minor_fixes
Minor fixes
2 parents 6624624 + 7322bd8 commit a74da54

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

src/BaseStar.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3191,7 +3191,7 @@ double BaseStar::CalculateOmegaBreak() const {
31913191
*
31923192
* @param [IN] p_MZAMS Zero age main sequence mass in Msol
31933193
* @param [IN] p_Metallicity Metallicity of the star
3194-
* @return Initial angular frequency in rad*yr^-1
3194+
* @return Minimum angular frequency in rad*yr^-1
31953195
*/
31963196
double BaseStar::CalculateOmegaCHE(const double p_MZAMS, const double p_Metallicity) const {
31973197
#define massCutoffs(x) m_MassCutoffs[static_cast<int>(MASS_CUTOFF::x)] // for convenience and readability - undefined at end of function

src/MainSequence.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class MainSequence: virtual public BaseStar {
9393
double CalculateRadiusAtPhaseEnd(const double p_Mass, const double p_RZAMS) const;
9494
double CalculateRadiusAtPhaseEnd() const { return CalculateRadiusAtPhaseEnd(m_Mass, m_RZAMS); } // Use class member variables
9595
double CalculateRadiusOnPhase() const { return CalculateRadiusOnPhase(m_Mass, m_Age, m_RZAMS0); } // Use class member variables
96-
double CalculateRadiusOnPhase(const double p_Mass, const double p_Luminosity) const { std::cout << "MS::CalculateRadiusOnPhase(LUM) called\n"; return Radius(); } // Not a meaningful function for MS stars
96+
double CalculateRadiusOnPhase(const double p_Mass, const double p_Luminosity) const { return Radius(); } // Not a meaningful function for MS stars
9797
double CalculateRadiusTransitionToHG(const double p_Mass, const double p_Age, double const p_RZAMS) const;
9898

9999
double CalculateTauAtPhaseEnd() const { return 1.0; } // tau = 1.0 at end of MS

src/changelog.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1523,6 +1523,9 @@
15231523
// - Added OMEGA and OMEGA_BREAK to SSE detailed output (to address #243)
15241524
// 03.17.01 VK - Apr 7, 2025 - Defect Repair:
15251525
// - Fix for issue #1365 - Converted user-specified initial rotational frequency from cycles/yr to rad/yr.
1526-
const std::string VERSION_STRING = "03.17.01";
1526+
// 03.17.02 JR - Apr 11, 2025 - Defect Repair:
1527+
// - Remove extraneous debug print statement in MainSequence.h (inavertently added by me in v03.17.00)
1528+
// - fix description of return value for BaseStar::CalculateOmegaCHE()
1529+
const std::string VERSION_STRING = "03.17.02";
15271530

15281531
# endif // __changelog_h__

0 commit comments

Comments
 (0)