From 9ec7c08bb62fe9748faacb4810671f1bd21450d1 Mon Sep 17 00:00:00 2001 From: Luv Sharma Date: Wed, 7 Oct 2015 13:07:21 +0000 Subject: [PATCH] gfortran was complaining abound mismatch --- code/spectral_damage.f90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/spectral_damage.f90 b/code/spectral_damage.f90 index a358250ef..06a0b7f8a 100644 --- a/code/spectral_damage.f90 +++ b/code/spectral_damage.f90 @@ -328,8 +328,10 @@ subroutine spectral_damage_formResidual(in,x_scal,f_scal,dummy,ierr) call utilities_FFTscalarForward() call utilities_fourierGreenConvolution(D_ref, mobility_ref, params%timeinc) call utilities_FFTscalarBackward() - where(scalarField_real > damage_lastInc) scalarField_real = damage_lastInc - where(scalarField_real < residualStiffness) scalarField_real = residualStiffness + where(scalarField_real(1:grid(1),1:grid(2),1:grid3) > damage_lastInc) & + scalarField_real(1:grid(1),1:grid(2),1:grid3) = damage_lastInc + where(scalarField_real(1:grid(1),1:grid(2),1:grid3) < residualStiffness) & + scalarField_real(1:grid(1),1:grid(2),1:grid3) = residualStiffness !-------------------------------------------------------------------------------------------------- ! constructing residual