Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BearImp public
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Monitor
Service Desk
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pmd_eTribosystems
BearImp public
Commits
350c07ab
Commit
350c07ab
authored
3 years ago
by
sp89hili
Browse files
Options
Downloads
Plain Diff
Merge branch 'Pu_correctViscosityCalculation ' into 'master'
parents
c30b43d3
02190c27
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
@BearImp/calcLub.m
+20
-10
20 additions, 10 deletions
@BearImp/calcLub.m
@BearImp/plot.m
+3
-1
3 additions, 1 deletion
@BearImp/plot.m
InputData.xlsx
+0
-0
0 additions, 0 deletions
InputData.xlsx
possibleMethods.m
+3
-4
3 additions, 4 deletions
possibleMethods.m
with
26 additions
and
15 deletions
@BearImp/calcLub.m
+
20
−
10
View file @
350c07ab
...
...
@@ -10,18 +10,28 @@ assert(obj.up2date.S,'Schmierstoff nicht gesetzt')
S
=
obj
.
S
;
T_Oil
=
obj
.
T_Oil
;
T
=
struct
;
T
.
method
=
possibleMethods
.
addDefault
(
obj
.
method
)
.
T
;
%% Berechnung
T
.
rho_40
=
S
.
rho_15
.*
(
1
-
S
.
alpha_rho
.*
25
);
T
.
rho_100
=
S
.
rho_15
.*
(
1
-
S
.
alpha_rho
.*
85
);
T
.
eta_040
=
T
.
rho_40
.*
S
.
nu_40
;
T
.
eta_0100
=
T
.
rho_100
.*
S
.
nu_100
;
T
.
rho
=
@
(
theta
)
S
.
rho_15
.*
(
1
-
S
.
alpha_rho
.*
(
theta
-
15
));
T
.
eta_040
=
T
.
rho
(
40
)
.*
S
.
nu_40
;
T
.
eta_0100
=
T
.
rho
(
100
)
.*
S
.
nu_100
;
T
.
alpha_etaT
=
log
(
T
.
eta_040
/
T
.
eta_0100
)/
60
;
switch
T
.
method
case
'linear'
T
.
alpha_eta
=
(
T
.
eta_0100
-
T
.
eta_040
)/
60
;
T
.
eta_00
=
T
.
eta_040
-
T
.
alpha_eta
.*
40
;
T
.
alpha_nu
=
(
S
.
nu_100
-
S
.
nu_40
)/
60
;
T
.
nu_0
=
S
.
nu_40
-
T
.
alpha_nu
.*
40
;
T
.
eta_0
=
T
.
eta_00
+
T
.
alpha_eta
.*
T_Oil
;
T
.
nu_38
=
T
.
nu_0
+
T
.
alpha_nu
.*
38
;
T
.
alpha_etaT
=
log
(
T
.
eta_040
/
T
.
eta_0100
)/
60
;
case
'Vogel'
assert
(
~
any
(
isnan
([
S
.
B
S
.
C
S
.
K
])),
'Vogel-Parameters not given for the selected lubricant. Choose method.T =
''
linear
''
'
)
T
.
eta_0
=
S
.
K
.*
exp
(
S
.
B
.
/
(
T_Oil
+
S
.
C
));
eta_38
=
S
.
K
.*
exp
(
S
.
B
.
/
(
40
+
S
.
C
));
T
.
nu_38
=
eta_38
.
/
T
.
rho
(
38
);
end
%% Attribute ändern
obj
.
T
=
T
;
...
...
This diff is collapsed.
Click to expand it.
@BearImp/plot.m
+
3
−
1
View file @
350c07ab
...
...
@@ -23,8 +23,10 @@ function plot(obj,name,options)
if
numel
(
obj
)
>
1
for
ii
=
1
:
numel
(
obj
)
% TODO: not working with matrices
obj
(
ii
)
.
plot
(
name
);
obj
(
ii
)
.
plot
(
name
,
'plotStyle'
,
options
.
plotStyle
,
'create'
,
options
.
create
);
hold
on
end
hold
off
return
end
...
...
This diff is collapsed.
Click to expand it.
InputData.xlsx
-1.94 KiB (-7%)
View file @
350c07ab
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
Click to expand it.
possibleMethods.m
+
3
−
4
View file @
350c07ab
classdef
possibleMethods
% Gibt Auskunft über mögliche Berechnungsmethoden der einzelnen
% Berechnungsabschnitte (T, R, G, B, H,
Z
) und enthält eine Funktion zum
% Berechnungsabschnitte (T, R, G, B, H,
C
) und enthält eine Funktion zum
% überprüfen des Methodenstructs
% pmd Berechnungstool Lagerimpedanz
% Version: 2.0.0
% Stand: 02.01.2022
% Autor: Steffen Puchtler, Julius van der Kuip
methods
(
Static
)
% Diese Klasse enthält ausschließlich statische Methoden, sodass kein Objekt initialisiert werden muss
function
s
=
T
s
=
{};
s
=
{
'linear'
,
'Vogel'
};
end
function
s
=
R
s
=
{};
...
...
@@ -31,6 +29,7 @@ classdef possibleMethods
function
s
=
Default
% Gibt ein Rechenmethoden-Struct mit den Default-Methoden aus
s
.
T
=
'Vogel'
;
s
.
B
=
'static'
;
s
.
H
=
'Hamrock/Dowson'
;
s
.
C
.
unloadedRE
=
'semianalytisch3D'
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment