@@ -1352,7 +1352,7 @@ def u_dot(self, t, u, post_processing=False):
13521352 )
13531353 # c = -self.rocket.distance_rocket_nozzle
13541354 c = (
1355- - (self .rocket .motor_position - self .rocket .center_of_dry_mass_position )
1355+ - (self .rocket .nozzle_position - self .rocket .center_of_dry_mass_position )
13561356 * self .rocket ._csys
13571357 )
13581358 a = b * Mt / M
@@ -1607,7 +1607,7 @@ def u_dot_generalized(self, t, u, post_processing=False):
16071607 r_CM_ddot = Vector ([0 , 0 , r_CM_z .differentiate (t , order = 2 )])
16081608 ## Nozzle gyration tensor
16091609 r_NOZ = (
1610- - (self .rocket .motor_position - self .rocket .center_of_dry_mass_position )
1610+ - (self .rocket .nozzle_position - self .rocket .center_of_dry_mass_position )
16111611 * self .rocket ._csys
16121612 )
16131613 S_noz_33 = 0.5 * self .rocket .motor .nozzle_radius ** 2
@@ -2388,7 +2388,7 @@ def aerodynamic_spin_moment(self):
23882388 def rotational_energy (self ):
23892389 # b = -self.rocket.distanceRocketPropellant
23902390 b = (
2391- - (self .rocket .motor_position - self .rocket .center_of_dry_mass_position )
2391+ - (self .rocket .nozzle_position - self .rocket .center_of_dry_mass_position )
23922392 * self .rocket ._csys
23932393 )
23942394 mu = self .rocket .reduced_mass
@@ -2546,7 +2546,7 @@ def effective_1rl(self):
25462546 to the upper rail button. It assumes the nozzle to be aligned with
25472547 the beginning of the rail."""
25482548 nozzle = (
2549- self .rocket .motor_position - self .rocket .center_of_dry_mass_position
2549+ self .rocket .nozzle_position - self .rocket .center_of_dry_mass_position
25502550 ) * self .rocket ._csys # Kinda works for single nozzle
25512551 try :
25522552 rail_buttons = self .rocket .rail_buttons [0 ]
@@ -2564,7 +2564,7 @@ def effective_2rl(self):
25642564 to the lower rail button. It assumes the nozzle to be aligned with
25652565 the beginning of the rail."""
25662566 nozzle = (
2567- self .rocket .motor_position - self .rocket .center_of_dry_mass_position
2567+ self .rocket .nozzle_position - self .rocket .center_of_dry_mass_position
25682568 ) * self .rocket ._csys
25692569 try :
25702570 rail_buttons = self .rocket .rail_buttons [0 ]
0 commit comments