diff --git a/src/fraggle/fraggle_generate.f90 b/src/fraggle/fraggle_generate.f90 index f9edee2f8..d8dbeb0de 100644 --- a/src/fraggle/fraggle_generate.f90 +++ b/src/fraggle/fraggle_generate.f90 @@ -515,14 +515,14 @@ module subroutine fraggle_generate_vel_vec(collider, lfailure) lfailure = E_residual < 0.0_DP do concurrent(i = 1:nfrag) - fragments%vb(:,i) = fragments%vc(:,i) + impactors%vbcom(:) + collider%fragments%vb(:,i) = collider%fragments%vc(:,i) + impactors%vbcom(:) end do impactors%vbcom(:) = 0.0_DP do concurrent(i = 1:nfrag) - impactors%vbcom(:) = impactors%vbcom(:) + fragments%mass(i) * fragments%vb(:,i) + impactors%vbcom(:) = impactors%vbcom(:) + collider%fragments%mass(i) * collider%fragments%vb(:,i) end do - impactors%vbcom(:) = impactors%vbcom(:) / fragments%mtot + impactors%vbcom(:) = impactors%vbcom(:) / collider%fragments%mtot end associate return diff --git a/src/fraggle/fraggle_util.f90 b/src/fraggle/fraggle_util.f90 index a7452882b..b69a7aea3 100644 --- a/src/fraggle/fraggle_util.f90 +++ b/src/fraggle/fraggle_util.f90 @@ -188,7 +188,7 @@ module subroutine fraggle_util_set_mass_dist(self, param) fragments%density(istart:nfrag) = fragments%mtot / sum(volume(:)) fragments%radius(istart:nfrag) = (3 * fragments%mass(istart:nfrag) / (4 * PI * fragments%density(istart:nfrag)))**(1.0_DP / 3.0_DP) - do i = istart, nfrag + do concurrent(i = istart:nfrag) fragments%Ip(:, i) = Ip_avg(:) end do @@ -263,7 +263,7 @@ module subroutine fraggle_util_set_natural_scale_factors(self) impactors%Lspin(:,:) = impactors%Lspin(:,:) / collider%Lscale impactors%Lorbit(:,:) = impactors%Lorbit(:,:) / collider%Lscale - do i = 1, 2 + do concurrent(i = 1:2) impactors%rot(:,i) = impactors%Lspin(:,i) / (impactors%mass(i) * impactors%radius(i)**2 * impactors%Ip(3,i)) end do @@ -311,7 +311,7 @@ module subroutine fraggle_util_set_original_scale_factors(self) impactors%vc = impactors%vc * collider%vscale impactors%Lspin = impactors%Lspin * collider%Lscale impactors%Lorbit = impactors%Lorbit * collider%Lscale - do i = 1, 2 + do concurrent(i = 1:2) impactors%rot(:,i) = impactors%Lspin(:,i) * (impactors%mass(i) * impactors%radius(i)**2 * impactors%Ip(3,i)) end do @@ -323,7 +323,7 @@ module subroutine fraggle_util_set_original_scale_factors(self) fragments%rc(:,:) = fragments%rc(:,:) * collider%dscale fragments%vc(:,:) = fragments%vc(:,:) * collider%vscale fragments%rb(:,:) = fragments%rb(:,:) * collider%dscale - fragments%vc(:,:) = fragments%vb(:,:) * collider%vscale + fragments%vb(:,:) = fragments%vb(:,:) * collider%vscale impactors%Qloss = impactors%Qloss * collider%Escale