Skip to content

Commit e721e90

Browse files
author
Ilya Mandel
committed
Small tweaks
1 parent 3661fa9 commit e721e90

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

src/BaseStar.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3176,16 +3176,17 @@ double BaseStar::CalculateRotationalVelocity(double p_MZAMS) {
31763176
case ROTATIONAL_VELOCITY_DISTRIBUTION::VLTFLAMES: // VLTFLAMES
31773177

31783178
// Rotational velocity based on VLT-FLAMES survey.
3179-
// For O-stars use results of Ramirez-Agudelo et al. (2013) https://arxiv.org/abs/1309.2929 (single stars)
3179+
// For O-stars (taken to be above 16 Msol), use results
3180+
// of Ramirez-Agudelo et al. (2013) https://arxiv.org/abs/1309.2929 (single stars)
31803181
// and Ramirez-Agudelo et al. (2015) https://arxiv.org/abs/1507.02286 (spectroscopic binaries)
3181-
// For B-stars use results of Dufton et al. (2013) https://arxiv.org/abs/1212.2424
3182-
// For lower mass stars, I don't know what updated results there are so default back to
3183-
// Hurley et al. 2000 distribution for now
3182+
// For B-stars (taken to be between 2 and 16 Msol) use results
3183+
// of Dufton et al. (2013) https://arxiv.org/abs/1212.2424
3184+
// For lower mass stars, default back to Hurley et al. 2000 distribution for now
31843185

3185-
if (utils::Compare(p_MZAMS, 16.0) >= 0) { // JR: what does 16.0 represent? Not another mass threshold that should be in constants.h ...? /*ilya*/
3186+
if (utils::Compare(p_MZAMS, 16.0) >= 0) {
31863187
vRot = CalculateOStarRotationalVelocity_Static(0.0, 800.0);
31873188
}
3188-
else if (utils::Compare(p_MZAMS, 2.0) >= 0) { // JR: what does 2.0 represent? Not another mass threshold that should be in constants.h ...? **Ilya**
3189+
else if (utils::Compare(p_MZAMS, 2.0) >= 0) {
31893190
vRot = utils::InverseSampleFromTabulatedCDF(RAND->Random(), BStarRotationalVelocityCDFTable);
31903191
}
31913192
else {

src/HeHG.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ double HeHG::CalculateRemnantRadius() const {
270270
*
271271
* This implementation adapted from the STARTRACK implementation (STARTRACK courtesy Chris Belczynski)
272272
*
273-
* This function good for HeHG and HeGB stars (for Helium stars: always use Natasha's fit)
273+
* This function is for HeHG and HeGB stars (for Helium stars: always use Natasha Ivanova's fit)
274274
*
275275
*
276276
* double CalculateLambdaNanjingStarTrack(const double p_Mass, const double p_Metallicity)
@@ -282,11 +282,11 @@ double HeHG::CalculateRemnantRadius() const {
282282
*/
283283
double HeHG::CalculateLambdaNanjingStarTrack(const double p_Mass, const double p_Metallicity) const {
284284

285-
double rMin = 0.25; // minimum considered radius: Natasha JR: should this be in constants.h? Maybe not... Who is Natasha? **Ilya**
286-
double rMax = 120.0; // maximum considered radius: Natasha JR: should this be in constants.h? Maybe not... Who is Natasha? **Ilya**
285+
double rMin = 0.25; // minimum considered radius: Natasha
286+
double rMax = 120.0; // maximum considered radius: Natasha
287287

288-
double rMinLambda = 0.3 * PPOW(rMin, -0.8); // JR: todo: should this be in constants.h? JR: should this be in constants.h? Maybe not... **Ilya**
289-
double rMaxLambda = 0.3 * PPOW(rMax, -0.8); // JR: todo: should this be in constants.h? JR: should this be in constants.h? Maybe not... **Ilya**
288+
double rMinLambda = 0.3 * PPOW(rMin, -0.8);
289+
double rMaxLambda = 0.3 * PPOW(rMax, -0.8);
290290

291291
return m_Radius < rMin ? rMinLambda : (m_Radius > rMax ? rMaxLambda : 0.3 * PPOW(m_Radius, -0.8));
292292
}

src/changelog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1671,7 +1671,7 @@
16711671
// - Main sequence core mass prescription ZERO renamed to HURLEY; deprecated ZERO
16721672
// 03.26.02 IM - October 26, 2025 - Enhancements
16731673
// - Added option -USSN-kicks-overwrite-mandel-muller ; if set to true, use user-defined USSN kicks (as a fixed value) in lieu of the Mandel & Muller kick prescription for USSNe
1674-
// - replaced --scale-CHE-mass-loss-with-surface-helium-abundance with the more general --scale-mass-loss-with-surface-helium-abundance
1674+
// - Replaced --scale-CHE-mass-loss-with-surface-helium-abundance with the more general --scale-mass-loss-with-surface-helium-abundance
16751675
//
16761676
// Version string format is MM.mm.rr, where
16771677
//

0 commit comments

Comments
 (0)