Fix sphere smoothing

Author: wilfonba

src/pre_process/m_patches.fpp

@@ -1605,34 +1605,32 @@ contains
                         cart_z = z_cc(k)
                     end if
 
-                    if ((x_cc(i) - x_centroid)**2 &
-                        + (cart_y - y_centroid)**2 &
-                        + (cart_z - z_centroid)**2 <= radius**2) &
-                        then
-
-                        if (present(ib)) then
-                            ! Updating the patch identities bookkeeping variable
-                            patch_id_fp(i, j, k) = patch_id
-                        else
-                            if (patch_icpp(patch_id)%alter_patch(patch_id_fp(i, j, k)) .or. &
-                                patch_id_fp(i, j, k) == smooth_patch_id) then
+                    if (.not. present(ib) .and. patch_icpp(patch_id)%smoothen) then
+                        eta = tanh(smooth_coeff/min(dx, dy)* &
+                                   (sqrt((x_cc(i) - x_centroid)**2 &
+                                         + (cart_y - y_centroid)**2 &
+                                         + (cart_z - z_centroid)**2) &
+                                    - radius))*(-0.5_wp) + 0.5_wp
+                    end if
 
-                                call s_assign_patch_primitive_variables(patch_id, i, j, k, &
-                                                                        eta, q_prim_vf, patch_id_fp)
+                    if (present(ib) .and. ((x_cc(i) - x_centroid)**2 + (cart_y - y_centroid)**2 &
+                                            + (cart_z - z_centroid)**2 <= radius**2)) then
+                        patch_id_fp(i, j, 0) = patch_id
+                    else
+                        if (((x_cc(i) - x_centroid)**2 + (cart_y - y_centroid)**2 &
+                             + (cart_z - z_centroid)**2  <= radius**2 &
+                             .and. &
+                             patch_icpp(patch_id)%alter_patch(patch_id_fp(i, j, k))) &
+                            .or. &
+                            (.not. present(ib) .and. patch_id_fp(i, j, k) == smooth_patch_id)) &
+                            then
 
-                                @:analytical()
-                            end if
+                            call s_assign_patch_primitive_variables(patch_id, i, j, k, &
+                                                                    eta, q_prim_vf, patch_id_fp)
 
-                            if (patch_icpp(patch_id)%smoothen) then
-                                eta = tanh(smooth_coeff/min(dx, dy, dz)* &
-                                           (sqrt((x_cc(i) - x_centroid)**2 &
-                                                 + (cart_y - y_centroid)**2 &
-                                                 + (cart_z - z_centroid)**2) &
-                                            - radius))*(-0.5_wp) + 0.5_wp
-                            end if
+                            @:analytical()
                         end if
                     end if
-
                 end do
             end do
         end do