Skip to content

Commit 0f62dff

Browse files
Added individual velocity components as LogTypedefs so they can be printed in the output
1 parent 30ff94c commit 0f62dff

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

src/BaseStar.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,9 @@ COMPAS_VARIABLE BaseStar::StellarPropertyValue(const T_ANY_PROPERTY p_Property)
372372
case ANY_STAR_PROPERTY::RZAMS: value = RZAMS(); break;
373373
case ANY_STAR_PROPERTY::SN_TYPE: value = SN_Type(); break;
374374
case ANY_STAR_PROPERTY::SPEED: value = Speed(); break;
375+
case ANY_STAR_PROPERTY::SPEED_X: value = SpeedX(); break;
376+
case ANY_STAR_PROPERTY::SPEED_Y: value = SpeedY(); break;
377+
case ANY_STAR_PROPERTY::SPEED_Z: value = SpeedZ(); break;
375378
case ANY_STAR_PROPERTY::STELLAR_TYPE: value = StellarType(); break;
376379
case ANY_STAR_PROPERTY::STELLAR_TYPE_NAME: value = STELLAR_TYPE_LABEL.at(StellarType()); break;
377380
case ANY_STAR_PROPERTY::STELLAR_TYPE_PREV: value = StellarTypePrev(); break;

src/BaseStar.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,9 @@ class BaseStar {
170170
SN_EVENT SN_Type() const { return utils::SNEventType(m_SupernovaDetails.events.current); }
171171
double SN_KickMagnitudeRandom() const { return m_SupernovaDetails.kickMagnitudeRandom; }
172172
double Speed() const { return m_ComponentVelocity.Magnitude(); }
173+
double SpeedX() const { return m_ComponentVelocity.xValue(); }
174+
double SpeedY() const { return m_ComponentVelocity.yValue(); }
175+
double SpeedZ() const { return m_ComponentVelocity.zValue(); }
173176
COMPAS_VARIABLE StellarPropertyValue(const T_ANY_PROPERTY p_Property) const;
174177
double Tau() const { return m_Tau; }
175178
double Temperature() const { return m_Temperature; }

src/LogTypedefs.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,9 @@ enum class STRING_QUALIFIER: int { NONE, FIXED_LENGTH, VARIABLE_LENGTH };
255255
RZAMS, \
256256
SN_TYPE, \
257257
SPEED, \
258+
SPEED_X, \
259+
SPEED_Y, \
260+
SPEED_Z, \
258261
STELLAR_TYPE, \
259262
STELLAR_TYPE_NAME, \
260263
STELLAR_TYPE_PREV, \
@@ -405,6 +408,9 @@ const COMPASUnorderedMap<STAR_PROPERTY, std::string> STAR_PROPERTY_LABEL = {
405408
{ STAR_PROPERTY::RZAMS, "RZAMS" },
406409
{ STAR_PROPERTY::SN_TYPE, "SN_TYPE" },
407410
{ STAR_PROPERTY::SPEED, "SPEED" },
411+
{ STAR_PROPERTY::SPEED_X, "SPEED_X" },
412+
{ STAR_PROPERTY::SPEED_Y, "SPEED_Y" },
413+
{ STAR_PROPERTY::SPEED_Z, "SPEED_Z" },
408414
{ STAR_PROPERTY::STELLAR_TYPE, "STELLAR_TYPE" },
409415
{ STAR_PROPERTY::STELLAR_TYPE_NAME, "STELLAR_TYPE_NAME" },
410416
{ STAR_PROPERTY::STELLAR_TYPE_PREV, "STELLAR_TYPE_PREV" },
@@ -1387,6 +1393,9 @@ const std::map<ANY_STAR_PROPERTY, PROPERTY_DETAILS> ANY_STAR_PROPERTY_DETAIL = {
13871393
{ ANY_STAR_PROPERTY::RZAMS, { TYPENAME::DOUBLE, "Radius@ZAMS", "Rsol", 24, 15}},
13881394
{ ANY_STAR_PROPERTY::SN_TYPE, { TYPENAME::SN_EVENT, "SN_Type", "-", 4, 1 }},
13891395
{ ANY_STAR_PROPERTY::SPEED, { TYPENAME::DOUBLE, "ComponentSpeed", "kms^-1", 24, 15}},
1396+
{ ANY_STAR_PROPERTY::SPEED_X, { TYPENAME::DOUBLE, "ComponentSpeedX", "kms^-1", 24, 15}},
1397+
{ ANY_STAR_PROPERTY::SPEED_Y, { TYPENAME::DOUBLE, "ComponentSpeedY", "kms^-1", 24, 15}},
1398+
{ ANY_STAR_PROPERTY::SPEED_Z, { TYPENAME::DOUBLE, "ComponentSpeedZ", "kms^-1", 24, 15}},
13901399
{ ANY_STAR_PROPERTY::STELLAR_TYPE, { TYPENAME::STELLAR_TYPE, "Stellar_Type", "-", 4, 1 }},
13911400
{ ANY_STAR_PROPERTY::STELLAR_TYPE_NAME, { TYPENAME::STRING, "Stellar_Type", "-", 42, 1 }},
13921401
{ ANY_STAR_PROPERTY::STELLAR_TYPE_PREV, { TYPENAME::STELLAR_TYPE, "Stellar_Type_Prev", "-", 4, 1 }},

0 commit comments

Comments
 (0)