Skip to content

Commit 392f3a9

Browse files
committed
Merge branch '425-consistency-between-thermal-and-damage-spectral-solver-in-formresidual' into 'development'
thermal and damage formResidual r follow the same convention Closes #425 See merge request damask/DAMASK!954
2 parents a17d6d0 + 722d3d6 commit 392f3a9

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/grid/grid_damage_spectral.f90

+1-2
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,7 @@ subroutine formResidual(residual_subdomain,x_scal,r,dummy,err_PETSc)
359359
+ mu_ref*phi(i,j,k)
360360
end do; end do; end do
361361

362-
r = max(min(utilities_GreenConvolution(r, K_ref, mu_ref, Delta_t_),phi_lastInc),num%phi_min) &
363-
- phi
362+
r = phi - max(min(utilities_GreenConvolution(r, K_ref, mu_ref, Delta_t_),phi_lastInc),num%phi_min)
364363
end associate
365364
err_PETSc = 0
366365

0 commit comments

Comments
 (0)