Pu_resolve merge errors

@BearImp/calcCap_puchtler2025.m

@@ -42,7 +42,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 = 12.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

@@ -79,8 +79,8 @@ elseif G.method.alphaForRaceRadius == 'estimate'
         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;