diff --git a/@BearImp/calcCap_puchtler2025.m b/@BearImp/calcCap_puchtler2025.m index 21e4efd50cea548a314d8256cb7795510c83ec78..fca459c99733f135f3ab9ed800775846be5434f0 100644 --- a/@BearImp/calcCap_puchtler2025.m +++ b/@BearImp/calcCap_puchtler2025.m @@ -62,11 +62,11 @@ function C_out = calcCap_puchtler2025(s,R_RE,R_R,R_ZL,R_ZR,B,R_L,epsilon_r,alpha switch method.outlet case 'oil' - absTol = 25e-4; % 25e-4 *2 corresponds to 0.1 pF with a permittivity of 2.2 + absTol = 50e-4; % 50e-4 *2 corresponds to 0.2 pF with a permittivity of 2.2 C_grooveR = 2 * 8.854187e-12 * epsilon_r * integral2(fun_groove,0,phi_1,Theta_0r,Theta_1r,'AbsTol',absTol); C_grooveL = 2 * 8.854187e-12 * epsilon_r * integral2(fun_groove,0,phi_1,Theta_1l,Theta_0l,'AbsTol',absTol); case 'air' - absTol = 50e-4; % 50e-4 corresponds to 0.1 pF with a permittivity of 2.2 + absTol = 100e-4; % 100e-4 corresponds to 0.2 pF with a permittivity of 2.2 fun_grooveOut = @(phi,theta) R_RE^2./(h_0./epsilon_r + (r_groove(phi,theta)-R_RE-h_0)) .* cos(theta); C_grooveRIn = 8.854187e-12 * epsilon_r * integral2(fun_groove ,-phi_1,phi_1r,Theta_0rIn,Theta_1r ,'AbsTol',absTol); C_grooveLIn = 8.854187e-12 * epsilon_r * integral2(fun_groove ,-phi_1,phi_1l,Theta_1l ,Theta_0lIn ,'AbsTol',absTol); diff --git a/BearImpOptions.m b/BearImpOptions.m index 266255ccfe1abc91acbf275570d13b470637e4e8..cbb0f3a045b7e11800ba8755031daa0573dd426c 100644 --- a/BearImpOptions.m +++ b/BearImpOptions.m @@ -51,19 +51,19 @@ classdef BearImpOptions < handle & dynamicprops & matlab.mixin.CustomDisplay & m defaultOption.G.alphaForRaceRadius = 'estimate'; defaultOption.T = 'Vogel'; defaultOption.B = 'dynamic'; - defaultOption.H.filmThicknessFormula = 'Hamrock/Dowson'; - defaultOption.H.thermalCorrection = 'on'; + defaultOption.H.filmThicknessFormula = 'Moes'; + defaultOption.H.thermalCorrection = 'off'; defaultOption.H.starvationCorrection = 'off'; defaultOption.H.roughnessCorrection = 'off'; - defaultOption.C.unloadedRE = 'semianalytisch3D'; - defaultOption.C.outsideArea = 'semianalytisch3D'; + defaultOption.C.unloadedRE = 'Puchtler2025'; + defaultOption.C.outsideArea = 'Puchtler2025'; defaultOption.C.deformedArea= 'neglect'; - defaultOption.C.outlet = 'oil'; + defaultOption.C.outlet = 'air'; defaultOption.C.r2smallCriterion = 'r<h_0+R_RE'; defaultOption.C.k_vh_factor = 'off'; defaultOption.C.pressureDistribution = 'on'; defaultOption.C.roughnessCorrection = 'off'; - defaultOption.C.rhoRatio = 'Hartung'; + defaultOption.C.rhoRatio = 'Tait'; end end diff --git a/InputData.xlsx b/InputData.xlsx index ffa9d74bae1d44167b7b1b3b1e927dec0a032564..7ec4e845e300f7f45c330e5dff0bbe7031791434 100644 Binary files a/InputData.xlsx and b/InputData.xlsx differ