Pu_bugfix error in calcLub DIN, increase tolarences for Puchtler2025 and...

Pu_bugfix error in calcLub DIN, increase tolarences for Puchtler2025 and alpha-estimation, update InputData.xlsx

@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);

@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;

@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));