From 5d21ef5a843cd64713748e099956b1a229e3d6c3 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Mon, 19 May 2014 16:43:32 +0000 Subject: [PATCH] fixed selective debugging logic flaw in crystallite_stressAndItsTangent --- code/crystallite.f90 | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/code/crystallite.f90 b/code/crystallite.f90 index b64b97129..03d64da6b 100644 --- a/code/crystallite.f90 +++ b/code/crystallite.f90 @@ -601,27 +601,19 @@ subroutine crystallite_stressAndItsTangent(updateJaco,rate_sensitivity) real(pReal) :: counter - if (iand(debug_level(debug_crystallite),debug_levelBasic) /= 0_pInt & - .and. ((e == debug_e .and. i == debug_i .and. g == debug_g) & - .or. .not. iand(debug_level(debug_crystallite), debug_levelSelective) /= 0_pInt)) then + if (iand(debug_level(debug_crystallite),debug_levelSelective) /= 0_pInt & + .and. FEsolving_execElem(1) <= debug_e & + .and. debug_e <= FEsolving_execElem(2)) then !$OMP CRITICAL (write2out) - write(6,'(/a,i8,1x,i8)') '<< CRYST >> element range ', FEsolving_execElem(1),FEsolving_execElem(2) - !$OMP END CRITICAL (write2out) - endif - - if (iand(debug_level(debug_crystallite),debug_levelExtensive) /= 0_pInt & - .and. ((e == debug_e .and. i == debug_i .and. g == debug_g) & - .or. .not. iand(debug_level(debug_crystallite), debug_levelSelective) /= 0_pInt)) then - !$OMP CRITICAL (write2out) - write(6,'(/,a,i8,1x,i2,1x,i3)') '<< CRYST >> values at el ip g ', e, i, g + write(6,'(/,a,i8,1x,i2,1x,i3)') '<< CRYST >> values at el ip g ', debug_e, debug_i, debug_g write(6,'(a,/,3(12x,3(f14.9,1x)/))') '<< CRYST >> F0 ', & - math_transpose33(crystallite_partionedF0(1:3,1:3,g,i,e)) + math_transpose33(crystallite_partionedF0(1:3,1:3,debug_g,debug_i,debug_e)) write(6,'(a,/,3(12x,3(f14.9,1x)/))') '<< CRYST >> Fp0', & - math_transpose33(crystallite_partionedFp0(1:3,1:3,g,i,e)) + math_transpose33(crystallite_partionedFp0(1:3,1:3,debug_g,debug_i,debug_e)) write(6,'(a,/,3(12x,3(f14.9,1x)/))') '<< CRYST >> Lp0', & - math_transpose33(crystallite_partionedLp0(1:3,1:3,g,i,e)) + math_transpose33(crystallite_partionedLp0(1:3,1:3,debug_g,debug_i,debug_e)) write(6,'(a,/,3(12x,3(f14.9,1x)/))') '<< CRYST >> F ', & - math_transpose33(crystallite_partionedF(1:3,1:3,g,i,e)) + math_transpose33(crystallite_partionedF(1:3,1:3,debug_g,debug_i,debug_e)) !$OMP END CRITICAL (write2out) endif