detabbed file for better readability

This commit is contained in:
Christoph Kords 2010-02-19 13:44:38 +00:00
parent 8c5852dedf
commit aab5598d96
1 changed files with 132 additions and 137 deletions

View File

@ -347,8 +347,9 @@ subroutine crystallite_stressAndItsTangent(updateJaco)
logical, dimension(homogenization_maxNgrains,mesh_maxNips,mesh_NcpElems) :: & logical, dimension(homogenization_maxNgrains,mesh_maxNips,mesh_NcpElems) :: &
storedConvergenceFlag storedConvergenceFlag
logical, dimension(3,3) :: mask logical, dimension(3,3) :: mask
logical forceLocalStiffnessCalculation logical forceLocalStiffnessCalculation ! flag indicating that stiffness calculation is always done locally
forceLocalStiffnessCalculation = .true. ! flag indicating that stiffness calculation is always done locally forceLocalStiffnessCalculation = .true.
! ------ initialize to starting condition ------ ! ------ initialize to starting condition ------
@ -662,11 +663,8 @@ subroutine crystallite_stressAndItsTangent(updateJaco)
! call IO_warning(600,e,i,g) ! call IO_warning(600,e,i,g)
invFp = math_inv3x3(crystallite_partionedFp0(:,:,g,i,e)) invFp = math_inv3x3(crystallite_partionedFp0(:,:,g,i,e))
Fe_guess = math_mul33x33(crystallite_partionedF(:,:,g,i,e),invFp) Fe_guess = math_mul33x33(crystallite_partionedF(:,:,g,i,e),invFp)
Tstar = math_Mandel6to33( & Tstar = math_Mandel6to33( math_mul66x6( 0.5_pReal*constitutive_homogenizedC(g,i,e), &
math_mul66x6( 0.5_pReal*constitutive_homogenizedC(g,i,e), & math_Mandel33to6( math_mul33x33(transpose(Fe_guess),Fe_guess) - math_I3 ) ) )
math_Mandel33to6( math_mul33x33(transpose(Fe_guess),Fe_guess) - math_I3 ) &
) &
)
crystallite_P(:,:,g,i,e) = math_mul33x33(Fe_guess,math_mul33x33(Tstar,transpose(invFp))) crystallite_P(:,:,g,i,e) = math_mul33x33(Fe_guess,math_mul33x33(Tstar,transpose(invFp)))
endif endif
enddo enddo
@ -818,8 +816,7 @@ subroutine crystallite_stressAndItsTangent(updateJaco)
NiterationState = 0_pInt NiterationState = 0_pInt
crystallite_todo = .true. crystallite_todo = .true.
do while ( any(crystallite_todo(:,:,FEsolving_execELem(1):FEsolving_execElem(2))) & do while ( any(crystallite_todo(:,:,FEsolving_execELem(1):FEsolving_execElem(2))) .and. NiterationState < nState)
.and. NiterationState < nState)
NiterationState = NiterationState + 1_pInt NiterationState = NiterationState + 1_pInt
do ee = FEsolving_execElem(1),FEsolving_execElem(2) do ee = FEsolving_execElem(1),FEsolving_execElem(2)
@ -863,9 +860,7 @@ subroutine crystallite_stressAndItsTangent(updateJaco)
crystallite_converged(gg,ii,ee) = crystallite_stateConverged(gg,ii,ee) & crystallite_converged(gg,ii,ee) = crystallite_stateConverged(gg,ii,ee) &
.and. crystallite_temperatureConverged(gg,ii,ee) .and. crystallite_temperatureConverged(gg,ii,ee)
endif endif
enddo enddo; enddo; enddo
enddo
enddo
if (any(.not. crystallite_converged .and. .not. crystallite_localConstitution)) & ! any non-local not yet converged? if (any(.not. crystallite_converged .and. .not. crystallite_localConstitution)) & ! any non-local not yet converged?
crystallite_converged = crystallite_converged .and. crystallite_localConstitution ! all non-local not converged crystallite_converged = crystallite_converged .and. crystallite_localConstitution ! all non-local not converged