eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 10:29:19 +02:00
Code Issues 123 Wiki Activity

Additional parameters for cooling fans

Browse Source
This commit is contained in:
Królik Uszasty
2021-01-03 19:46:04 +01:00
committed by tmj-fstate
parent 8dd1ca19d4
commit f32b1efb18
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
McZapkie/MOVER.h
View File

@@ -821,8 +821,11 @@ private:
struct cooling_fan : public basic_device { struct cooling_fan : public basic_device {
// config // config
float speed { 0.f }; // cooling fan rpm; either fraction of parent rpm, or absolute value if negative float speed { 0.f }; // cooling fan rpm; either fraction of parent rpm, or absolute value if negative
float sustain_time { 0.f }; // time of sustaining work of cooling fans after stop
float min_start_velocity { -1.f }; // minimal velocity of vehicle, when cooling fans activate
// ld outputs // ld outputs
float revolutions { 0.f }; // current fan rpm float revolutions { 0.f }; // current fan rpm
float stop_timer { 0.f }; // current time, when shut off condition is active
}; };
// basic approximation of a fuel pump // basic approximation of a fuel pump

25
McZapkie/Mover.cpp
View File

@@ -1997,7 +1997,26 @@ void TMoverParameters::OilPumpCheck( double const Timestep ) {
void TMoverParameters::MotorBlowersCheck( double const Timestep ) { void TMoverParameters::MotorBlowersCheck( double const Timestep ) {
// activation check // activation check
for( auto &blower : MotorBlowers ) { for( auto &blower : MotorBlowers ) {
auto disable = blower.is_disabled;
if (blower.min_start_velocity >= 0)
{
if ( Vel < 0.5 && Im < 0.5 )
{
blower.stop_timer += Timestep;
if (blower.stop_timer > blower.sustain_time)
{
disable = true;
}
}
else if (Vel >= blower.min_start_velocity && Im > 0.5)
{
blower.stop_timer = 0;
}
else
{
disable |= !blower.is_active;
}
}
blower.is_active = ( blower.is_active = (
// TODO: bind properly power source when ld is in place // TODO: bind properly power source when ld is in place
( blower.start_type == start_t::battery ? Power24vIsAvailable : ( blower.start_type == start_t::battery ? Power24vIsAvailable :
@@ -2005,7 +2024,7 @@ void TMoverParameters::MotorBlowersCheck( double const Timestep ) {
Mains ) // power source Mains ) // power source
// breaker condition disabled until it's implemented in the class data // breaker condition disabled until it's implemented in the class data
// && ( true == blower.breaker ) // && ( true == blower.breaker )
&& ( false == blower.is_disabled ) && ( false == disable)
&& ( ( true == blower.is_active ) && ( ( true == blower.is_active )
|| ( blower.start_type == start_t::manual ? || ( blower.start_type == start_t::manual ?
blower.is_enabled : blower.is_enabled :
@@ -10743,6 +10762,8 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) {
// traction motors // traction motors
extract_value( MotorBlowers[ end::front ].speed, "MotorBlowersSpeed", Input, "" ); extract_value( MotorBlowers[ end::front ].speed, "MotorBlowersSpeed", Input, "" );
extract_value( MotorBlowers[ end::front ].sustain_time, "MotorBlowersSustainTime", Input, "" );
extract_value( MotorBlowers[ end::front ].min_start_velocity, "MotorBlowersStartVelocity", Input, "" );
MotorBlowers[ end::rear ] = MotorBlowers[ end::front ]; MotorBlowers[ end::rear ] = MotorBlowers[ end::front ];
// pressure switch // pressure switch
extract_value( HasControlPressureSwitch, "PressureSwitch", Input, ( TrainType != dt_EZT ? "yes" : "no" ) ); extract_value( HasControlPressureSwitch, "PressureSwitch", Input, ( TrainType != dt_EZT ? "yes" : "no" ) );