From 9951faf97b1330b7c2c17568d1f23278b0eed0ab Mon Sep 17 00:00:00 2001 From: Hellss Date: Sun, 11 Jul 2021 14:22:11 +0300 Subject: [PATCH] #254 720 fix (#269) * #254 720 fix * #254 --- .../systems/sys_81_720_electric.lua | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/lua/metrostroi/systems/sys_81_720_electric.lua b/lua/metrostroi/systems/sys_81_720_electric.lua index 526efc5..b6a3c48 100644 --- a/lua/metrostroi/systems/sys_81_720_electric.lua +++ b/lua/metrostroi/systems/sys_81_720_electric.lua @@ -31,9 +31,6 @@ function TRAIN_SYSTEM:Initialize() self.Battery80V = 0.0 -- Resistances - self.R1 = 1e9 - self.R2 = 1e9 - self.R3 = 1e9 self.Rs1 = 1e9 self.Rs2 = 1e9 @@ -57,12 +54,6 @@ function TRAIN_SYSTEM:Initialize() self.IR1 = self.Itotal self.IR2 = self.Itotal self.IRT2 = self.Itotal - self.T1 = 25 - self.T2 = 25 - self.P1 = 0 - self.P2 = 0 - self.Overheat1 = 0 - self.Overheat2 = 0 -- Total energy used by train self.ElectricEnergyUsed = 0 -- joules @@ -370,7 +361,6 @@ end function TRAIN_SYSTEM:SolvePowerCircuits(Train,dT,iter) self.Rs1 = Train.BPTI.RVResistance self.Rs2 = Train.BPTI.RVResistance - -- Calculate total resistance of engines winding local RwAnchor = Train.Engines.Rwa*2 -- Double because each set includes two engines local RwStator = Train.Engines.Rws*2 @@ -448,18 +438,6 @@ function TRAIN_SYSTEM:SolvePowerCircuits(Train,dT,iter) self.Istator24 = -I1 end - -- Calculate power and heating - local K = 12.0*1e-5 - local H = (10.00+(15.00*Train.Engines.Speed/80.0))*1e-3 - self.P1 = (self.IR1^2)*self.R1 - self.P2 = (self.IR2^2)*self.R2 - self.T1 = (self.T1 + self.P1*K*dT - (self.T1-25)*H*dT) - self.T2 = (self.T2 + self.P2*K*dT - (self.T2-25)*H*dT) - self.Overheat1 = math.min(1-1e-12, - self.Overheat1 + math.max(0,(math.max(0,self.T1-750.0)/400.0)^2)*dT ) - self.Overheat2 = math.min(1-1e-12, - self.Overheat2 + math.max(0,(math.max(0,self.T2-750.0)/400.0)^2)*dT ) - -- Energy consumption self.ElectricEnergyUsed = self.ElectricEnergyUsed + math.max(0,self.EnergyChange)*dT self.ElectricEnergyDissipated = self.ElectricEnergyDissipated + math.max(0,-self.EnergyChange)*dT