diff --git a/@BearImp/calcCap_puchtler2025.m b/@BearImp/calcCap_puchtler2025.m index 65ab72ce719468064c5d3227e29e9ca98a17b321..68a167f98d8a49ef8db20b179ada9dffb71e1a72 100644 --- a/@BearImp/calcCap_puchtler2025.m +++ b/@BearImp/calcCap_puchtler2025.m @@ -40,7 +40,7 @@ function C_out = calcCap_puchtler2025(s,R_RE,R_R,R_ZL,R_ZR,B,R_L,epsilon_r,alpha fun_groove = @(phi,theta) R_RE^2./(r_groove(phi,theta)-R_RE) .* cos(theta); fun_rimR = @(phi,theta) R_RE^2./(r_rimR (phi,theta)-R_RE) .* cos(theta); fun_rimL = @(phi,theta) R_RE^2./(r_rimL (phi,theta)-R_RE) .* cos(theta); - absTol = 2.5e-4; % 2.5e-4 * 2 corresponds to 0.01 pF with a permittivity of 2.2 + absTol = 25e-4; % 2.5e-4 * 2 corresponds to 0.01 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); diff --git a/@BearImp/calcGeo.m b/@BearImp/calcGeo.m index eeb45cef9e33505e90d3adb9b62e9100ef1603ab..2034a93178273159a13d6bdf7463798782e5d239 100644 --- a/@BearImp/calcGeo.m +++ b/@BearImp/calcGeo.m @@ -76,11 +76,11 @@ elseif G.method.alphaForRaceRadius == 'estimate' cosAlphaRatioTerm = (cos(G.alpha_0)/cos(alpha) - 1); alpha_next = alpha + ( F_a/(L.Z*L.D_RE^2*G.k_ax_est) - sin(alpha)*cosAlphaRatioTerm^1.5 ) / ... Harris.2001 (7.34), p. 247 ( cos(alpha)*cosAlphaRatioTerm^1.5 + 1.5*tan(alpha)^2*cosAlphaRatioTerm^0.5*cos(G.alpha_0) ); - if abs(alpha-alpha_next) <= 10*eps(alpha) + if abs(alpha-alpha_next) <= 100*eps(alpha) break elseif numberOfIterations >= 1000 - warning('Estimation of mounted contact angle did not converge') - break + error('Estimation of mounted contact angle did not converge') + %break else alpha = alpha_next; numberOfIterations = numberOfIterations + 1; diff --git a/@BearImp/calcLub.m b/@BearImp/calcLub.m index 9e25619949469239e80ef499298188ae8ef58651..663df16eb2ad4711c7fe946e3f48b41b4b4c9eae 100644 --- a/@BearImp/calcLub.m +++ b/@BearImp/calcLub.m @@ -37,7 +37,7 @@ switch T.method m = (W_40-W_100)/(log10(100+273.15)-log10(40+273.15)); % DIN 51563 (3) W_x = @(theta) m*(log10(40+273.15) - log10(theta+273.15)) + W_40; % DIN 51563 (4) T.nu = @(theta) (10.^(10.^W_x(theta)) - 0.8)*1e-6; - T.eta = @(theta) T.rho(theta).*nu(theta); + T.eta = @(theta) T.rho(theta).*T.nu(theta); 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 = @(theta) S.K .* exp(S.B ./ (theta + S.C)); diff --git a/InputData.xlsx b/InputData.xlsx index 08e6ac3ea019368fc5993b662dab839618ea8974..ffa9d74bae1d44167b7b1b3b1e927dec0a032564 100644 Binary files a/InputData.xlsx and b/InputData.xlsx differ