Skip to content

Commit 7065f01

Browse files
authored
Merge branch 'main' into dev/harmonic-balance
2 parents 2bb5cea + 9e4f8cd commit 7065f01

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

ross/rotor_assembly.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
from ross.disk_element import DiskElement
3333
from ross.faults import Crack, MisalignmentFlex, MisalignmentRigid, Rubbing
3434
from ross.materials import Material, steel
35+
from ross.model_reduction import ModelReduction
3536
from ross.point_mass import PointMass
3637
from ross.results import (
3738
CampbellResults,
@@ -41,12 +42,13 @@
4142
FrequencyResponseResults,
4243
Level1Results,
4344
ModalResults,
45+
SensitivityResults,
4446
StaticResults,
4547
SummaryResults,
4648
TimeResponseResults,
4749
UCSResults,
48-
SensitivityResults,
4950
)
51+
from ross.seals.labyrinth_seal import LabyrinthSeal
5052
from ross.shaft_element import ShaftElement
5153
from ross.units import Q_, check_units
5254
from ross.utils import (
@@ -57,9 +59,6 @@
5759
newmark,
5860
remove_dofs,
5961
)
60-
from ross.seals.labyrinth_seal import LabyrinthSeal
61-
62-
from ross.model_reduction import ModelReduction
6362

6463
from ross.harmonic_balance import HarmonicBalance
6564

@@ -1652,9 +1651,9 @@ def transfer_matrix(self, speed=None, frequency=None, modes=None):
16521651
I = np.eye(self.M().shape[0])
16531652

16541653
lu, piv = lu_factor(
1655-
-(frequency**2) * self.M(frequency=frequency)
1656-
+ 1j * frequency * (self.C(frequency=frequency) + frequency * self.G())
1657-
+ self.K(frequency=frequency)
1654+
-(frequency**2) * self.M(frequency=speed)
1655+
+ 1j * frequency * (self.C(frequency=speed) + speed * self.G())
1656+
+ self.K(frequency=speed)
16581657
)
16591658
H = lu_solve((lu, piv), I)
16601659

0 commit comments

Comments
 (0)