Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev sync ucs map #931

Merged
merged 32 commits into from
Apr 11, 2024
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
059e8e0
Including gyroscopic effects in the UCS analysis
fernandarossi Nov 25, 2022
bab2764
Fixing error in comparison between two elements
fernandarossi Nov 25, 2022
afb8bea
Code formatted with black
fernandarossi Nov 28, 2022
a1e75ca
Add test to run_ucs synchronous
raphaeltimbo Nov 29, 2022
4d366b1
Merge branch 'ross-rotordynamics:master' into dev-sync_ucs_map
fernandarossi Jan 10, 2023
c6eb943
Correction of the UCS map
fernandarossi Jan 10, 2023
a242072
Updated code
fernandarossi Jan 11, 2023
c11ef05
Merge branch 'ross-rotordynamics:master' into dev-sync_ucs_map
fernandarossi Jan 31, 2023
a074b7e
UCS tests modified
fernandarossi Feb 6, 2023
b4c3166
Merge branch 'petrobras:master' into dev-sync_ucs_map
fernandarossi Mar 15, 2023
70c50dd
UCS tests update
fernandarossi Mar 15, 2023
1bcb8f9
Merge branch 'dev-sync_ucs_map' of github.com:fernandarossi/ross into…
fernandarossi Mar 15, 2023
2bac55d
UCS tests update
fernandarossi Mar 15, 2023
3fcd2da
Merge branch 'petrobras:master' into dev-sync_ucs_map
fernandarossi Mar 25, 2023
5b22e74
Code structure change
fernandarossi Mar 25, 2023
8933562
Disk element update
fernandarossi Mar 27, 2023
0a11c0c
Disk element update
fernandarossi Mar 28, 2023
bbef430
Merge branch 'petrobras:master' into dev-sync_ucs_map
fernandarossi May 2, 2023
e002574
Merge branch 'dev-sync_ucs_map' of github.com:fernandarossi/ross into…
fernandarossi May 15, 2023
0fbdf39
Branch restored
fernandarossi May 15, 2023
e4f0438
Corrections
fernandarossi May 15, 2023
799ab32
Merge branch 'petrobras:main' into dev-sync_ucs_map
fernandarossi May 31, 2023
b6bc2b6
Merge branch 'main' into dev-sync_ucs_map
Jul 3, 2023
ebdf759
Merge branch 'petrobras:main' into dev-sync_ucs_map
fernandarossi Jul 4, 2023
9a5bb5f
Merge branch 'petrobras:main' into dev-sync_ucs_map
fernandarossi Jul 15, 2023
5715135
Merge branch 'petrobras:main' into dev-sync_ucs_map
fernandarossi Sep 2, 2023
a5b4812
Merge branch 'petrobras:main' into dev-sync_ucs_map
fernandarossi Dec 11, 2023
f2a7376
Merge branch 'main' into dev-sync_ucs_map
Dec 21, 2023
32cffc7
Merge branch 'main' into dev-sync_ucs_map
Mar 14, 2024
8b76b9b
Test ucs rotor 9 fixed
fernandarossi Mar 21, 2024
a25381e
Merge branch 'main' into dev-sync_ucs_map
Apr 4, 2024
e69d577
Merge branch 'main' into dev-sync_ucs_map
Apr 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions ross/disk_element.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,21 @@ def __eq__(self, other):
True
"""
false_number = 0
for i in self.__dict__:
try:
self.__dict__[i] == other.__dict__[i]
except:
false_number += 1
if other.__class__.__name__ == "DiskElement":
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @fernandarossi, your lastest commit tests just failed, and I think the reason beghind is this line.

Since you are only comparing with the DiskElement, when building the DiskElement6DoF class it will go directly to the else statement, hence returning False. A possible solution would be:

if "DiskElement" in other.__class__.__name__:

for i in self.__dict__:
try:
if np.allclose(self.__dict__[i], other.__dict__[i]):
pass
else:
false_number += 1

except TypeError:
if self.__dict__[i] == other.__dict__[i]:
pass
else:
false_number += 1
else:
false_number += 1

if false_number == 0:
return True
Expand Down