fixed two severe bugs in new state, now a little bit faster (399 vs. 378 sec) and more memory efficicient (251312 vs. 236832 kbytes) for Phenopowerlaw 16x16x16 example (short load only)
This commit is contained in:
parent
6da07dd437
commit
5bd80123b4
|
@ -425,6 +425,7 @@ subroutine crystallite_init(temperature)
|
||||||
enddo
|
enddo
|
||||||
enddo
|
enddo
|
||||||
!$OMP END PARALLEL DO
|
!$OMP END PARALLEL DO
|
||||||
|
|
||||||
call crystallite_stressAndItsTangent(.true.,.false.) ! request elastic answers
|
call crystallite_stressAndItsTangent(.true.,.false.) ! request elastic answers
|
||||||
crystallite_fallbackdPdF = crystallite_dPdF ! use initial elastic stiffness as fallback
|
crystallite_fallbackdPdF = crystallite_dPdF ! use initial elastic stiffness as fallback
|
||||||
|
|
||||||
|
@ -2260,7 +2261,7 @@ subroutine crystallite_integrateStateRKCK45()
|
||||||
! --- nonlocal convergence check ---
|
! --- nonlocal convergence check ---
|
||||||
|
|
||||||
if (iand(debug_level(debug_crystallite), debug_levelExtensive) /= 0_pInt) &
|
if (iand(debug_level(debug_crystallite), debug_levelExtensive) /= 0_pInt) &
|
||||||
write(6,'(a,i8,a,i2,/)') '<< CRYST >> ', count(crystallite_converged(:,:,:)), ' grains converged' ! if not requesting Integration of just a single IP
|
write(6,'(a,i8,a,i2,/)') '<< CRYST >> ', count(crystallite_converged(:,:,:)), ' grains converged' ! if not requesting Integration of just a single IP
|
||||||
if ((.not. singleRun) .and. any(.not. crystallite_converged .and. .not. crystallite_localPlasticity)) & ! any non-local not yet converged (or broken)...
|
if ((.not. singleRun) .and. any(.not. crystallite_converged .and. .not. crystallite_localPlasticity)) & ! any non-local not yet converged (or broken)...
|
||||||
crystallite_converged = crystallite_converged .and. crystallite_localPlasticity ! ...restart all non-local as not converged
|
crystallite_converged = crystallite_converged .and. crystallite_localPlasticity ! ...restart all non-local as not converged
|
||||||
|
|
||||||
|
@ -2685,8 +2686,7 @@ subroutine crystallite_integrateStateEuler()
|
||||||
constitutive_state, &
|
constitutive_state, &
|
||||||
constitutive_sizeDotState, &
|
constitutive_sizeDotState, &
|
||||||
constitutive_maxSizeDotState, &
|
constitutive_maxSizeDotState, &
|
||||||
constitutive_dotState, &
|
constitutive_dotState
|
||||||
constitutive_aTolState
|
|
||||||
#else
|
#else
|
||||||
mappingConstitutive
|
mappingConstitutive
|
||||||
#endif
|
#endif
|
||||||
|
@ -2715,6 +2715,7 @@ eIter = FEsolving_execElem(1:2)
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
singleRun = (eIter(1) == eIter(2) .and. iIter(1,eIter(1)) == iIter(2,eIter(2)))
|
singleRun = (eIter(1) == eIter(2) .and. iIter(1,eIter(1)) == iIter(2,eIter(2)))
|
||||||
|
|
||||||
if (numerics_integrationMode == 1_pInt) then
|
if (numerics_integrationMode == 1_pInt) then
|
||||||
!$OMP PARALLEL
|
!$OMP PARALLEL
|
||||||
|
|
||||||
|
@ -3178,14 +3179,13 @@ real(pReal), dimension(constitutive_maxSizeDotState) :: &
|
||||||
- stateResiduum(1:mySizeDotState) ! need to copy to local variable, since we cant flush a pointer in openmp
|
- stateResiduum(1:mySizeDotState) ! need to copy to local variable, since we cant flush a pointer in openmp
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
mySizeDotState = plasticState(mappingConstitutive(2,g,i,e))%sizeDotState
|
|
||||||
dot_prod12 = dot_product( plasticState(mappingConstitutive(2,g,i,e))%dotState(:,mappingConstitutive(1,g,i,e)) &
|
dot_prod12 = dot_product( plasticState(mappingConstitutive(2,g,i,e))%dotState(:,mappingConstitutive(1,g,i,e)) &
|
||||||
- plasticState(mappingConstitutive(2,g,i,e))%previousDotState(:,mappingConstitutive(1,g,i,e)), &
|
- plasticState(mappingConstitutive(2,g,i,e))%previousDotState(:,mappingConstitutive(1,g,i,e)), &
|
||||||
plasticState(mappingConstitutive(2,g,i,e))%previousDotState(:,mappingConstitutive(1,g,i,e)) &
|
plasticState(mappingConstitutive(2,g,i,e))%previousDotState(:,mappingConstitutive(1,g,i,e)) &
|
||||||
- plasticState(mappingConstitutive(2,g,i,e))%previousDotState2(:,mappingConstitutive(1,g,i,e)))
|
- plasticState(mappingConstitutive(2,g,i,e))%previousDotState2(:,mappingConstitutive(1,g,i,e)))
|
||||||
|
|
||||||
dot_prod22 = dot_product( plasticState(mappingConstitutive(2,g,i,e))%dotState(:,mappingConstitutive(1,g,i,e)) &
|
dot_prod22 = dot_product( &
|
||||||
|
plasticState(mappingConstitutive(2,g,i,e))%previousDotState(:,mappingConstitutive(1,g,i,e)) &
|
||||||
- plasticState(mappingConstitutive(2,g,i,e))%previousDotState2(:,mappingConstitutive(1,g,i,e)), &
|
- plasticState(mappingConstitutive(2,g,i,e))%previousDotState2(:,mappingConstitutive(1,g,i,e)), &
|
||||||
plasticState(mappingConstitutive(2,g,i,e))%previousDotState(:,mappingConstitutive(1,g,i,e)) &
|
plasticState(mappingConstitutive(2,g,i,e))%previousDotState(:,mappingConstitutive(1,g,i,e)) &
|
||||||
- plasticState(mappingConstitutive(2,g,i,e))%previousDotState2(:,mappingConstitutive(1,g,i,e)))
|
- plasticState(mappingConstitutive(2,g,i,e))%previousDotState2(:,mappingConstitutive(1,g,i,e)))
|
||||||
|
@ -3211,7 +3211,7 @@ real(pReal), dimension(constitutive_maxSizeDotState) :: &
|
||||||
subState0(1:mySizeDotState,mappingConstitutive(1,g,i,e)) &
|
subState0(1:mySizeDotState,mappingConstitutive(1,g,i,e)) &
|
||||||
-(plasticState(mappingConstitutive(2,g,i,e))% &
|
-(plasticState(mappingConstitutive(2,g,i,e))% &
|
||||||
dotState(1:mySizeDotState,mappingConstitutive(1,g,i,e)) * &
|
dotState(1:mySizeDotState,mappingConstitutive(1,g,i,e)) * &
|
||||||
statedamper &
|
statedamper &
|
||||||
+ plasticState(mappingConstitutive(2,g,i,e))% &
|
+ plasticState(mappingConstitutive(2,g,i,e))% &
|
||||||
previousDotState(1:mySizeDotState,mappingConstitutive(1,g,i,e)) &
|
previousDotState(1:mySizeDotState,mappingConstitutive(1,g,i,e)) &
|
||||||
* (1.0_pReal - statedamper)) * crystallite_subdt(g,i,e)
|
* (1.0_pReal - statedamper)) * crystallite_subdt(g,i,e)
|
||||||
|
@ -3273,7 +3273,7 @@ real(pReal), dimension(constitutive_maxSizeDotState) :: &
|
||||||
!$OMP END CRITICAL (distributionState)
|
!$OMP END CRITICAL (distributionState)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
plasticState(mappingConstitutive(2,g,i,e))%dotState(1:mySizeDotState,mappingConstitutive(1,g,i,e))= &
|
plasticState(mappingConstitutive(2,g,i,e))%state(1:mySizeDotState,mappingConstitutive(1,g,i,e))= &
|
||||||
tempState(1:mySizeDotState) ! copy local backup to global pointer
|
tempState(1:mySizeDotState) ! copy local backup to global pointer
|
||||||
#endif
|
#endif
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue