material_phase is deprecated
This commit is contained in:
parent
a8ed982706
commit
937a84231f
|
@ -125,11 +125,6 @@ subroutine CPFEM_init
|
||||||
! flush(6)
|
! flush(6)
|
||||||
! endif
|
! endif
|
||||||
|
|
||||||
|
|
||||||
! call IO_read_intFile(777,'recordedPhase'//trim(rankStr),modelName,size(material_phase))
|
|
||||||
! read (777,rec=1) material_phase
|
|
||||||
! close (777)
|
|
||||||
|
|
||||||
! call IO_read_realFile(777,'convergedF'//trim(rankStr),modelName,size(crystallite_F0))
|
! call IO_read_realFile(777,'convergedF'//trim(rankStr),modelName,size(crystallite_F0))
|
||||||
! read (777,rec=1) crystallite_F0
|
! read (777,rec=1) crystallite_F0
|
||||||
! close (777)
|
! close (777)
|
||||||
|
@ -280,10 +275,6 @@ subroutine CPFEM_general(mode, parallelExecution, ffn, ffn1, temperature_inp, dt
|
||||||
! write(6,'(a)') '<< CPFEM >> writing state variables of last converged step to binary files'
|
! write(6,'(a)') '<< CPFEM >> writing state variables of last converged step to binary files'
|
||||||
!
|
!
|
||||||
|
|
||||||
! call IO_write_jobRealFile(777,'recordedPhase'//trim(rankStr),size(material_phase))
|
|
||||||
! write (777,rec=1) material_phase
|
|
||||||
! close (777)
|
|
||||||
|
|
||||||
! call IO_write_jobRealFile(777,'convergedF'//trim(rankStr),size(crystallite_F0))
|
! call IO_write_jobRealFile(777,'convergedF'//trim(rankStr),size(crystallite_F0))
|
||||||
! write (777,rec=1) crystallite_F0
|
! write (777,rec=1) crystallite_F0
|
||||||
! close (777)
|
! close (777)
|
||||||
|
|
|
@ -114,7 +114,7 @@ subroutine constitutive_init
|
||||||
! write description file for constitutive output
|
! write description file for constitutive output
|
||||||
call IO_write_jobFile(FILEUNIT,'outputConstitutive')
|
call IO_write_jobFile(FILEUNIT,'outputConstitutive')
|
||||||
PhaseLoop: do ph = 1,material_Nphase
|
PhaseLoop: do ph = 1,material_Nphase
|
||||||
activePhase: if (any(material_phase == ph)) then
|
activePhase: if (any(material_phaseAt == ph)) then
|
||||||
ins = phase_plasticityInstance(ph)
|
ins = phase_plasticityInstance(ph)
|
||||||
knownPlasticity = .true. ! assume valid
|
knownPlasticity = .true. ! assume valid
|
||||||
plasticityType: select case(phase_plasticity(ph))
|
plasticityType: select case(phase_plasticity(ph))
|
||||||
|
@ -255,7 +255,7 @@ function constitutive_homogenizedC(ipc,ip,el)
|
||||||
case (PLASTICITY_DISLOTWIN_ID) plasticityType
|
case (PLASTICITY_DISLOTWIN_ID) plasticityType
|
||||||
constitutive_homogenizedC = plastic_dislotwin_homogenizedC(ipc,ip,el)
|
constitutive_homogenizedC = plastic_dislotwin_homogenizedC(ipc,ip,el)
|
||||||
case default plasticityType
|
case default plasticityType
|
||||||
constitutive_homogenizedC = lattice_C66(1:6,1:6,material_phase (ipc,ip,el))
|
constitutive_homogenizedC = lattice_C66(1:6,1:6,material_phaseAt(ipc,el))
|
||||||
end select plasticityType
|
end select plasticityType
|
||||||
|
|
||||||
end function constitutive_homogenizedC
|
end function constitutive_homogenizedC
|
||||||
|
|
|
@ -194,7 +194,7 @@ function damage_nonlocal_getDiffusion33(ip,el)
|
||||||
damage_nonlocal_getDiffusion33 = 0.0_pReal
|
damage_nonlocal_getDiffusion33 = 0.0_pReal
|
||||||
do grain = 1, homogenization_Ngrains(homog)
|
do grain = 1, homogenization_Ngrains(homog)
|
||||||
damage_nonlocal_getDiffusion33 = damage_nonlocal_getDiffusion33 + &
|
damage_nonlocal_getDiffusion33 = damage_nonlocal_getDiffusion33 + &
|
||||||
crystallite_push33ToRef(grain,ip,el,lattice_DamageDiffusion33(1:3,1:3,material_phase(grain,ip,el)))
|
crystallite_push33ToRef(grain,ip,el,lattice_DamageDiffusion33(1:3,1:3,material_phaseAt(grain,el)))
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
damage_nonlocal_getDiffusion33 = &
|
damage_nonlocal_getDiffusion33 = &
|
||||||
|
@ -217,7 +217,7 @@ real(pReal) function damage_nonlocal_getMobility(ip,el)
|
||||||
damage_nonlocal_getMobility = 0.0_pReal
|
damage_nonlocal_getMobility = 0.0_pReal
|
||||||
|
|
||||||
do ipc = 1, homogenization_Ngrains(material_homogenizationAt(el))
|
do ipc = 1, homogenization_Ngrains(material_homogenizationAt(el))
|
||||||
damage_nonlocal_getMobility = damage_nonlocal_getMobility + lattice_DamageMobility(material_phase(ipc,ip,el))
|
damage_nonlocal_getMobility = damage_nonlocal_getMobility + lattice_DamageMobility(material_phaseAt(ipc,el))
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
damage_nonlocal_getMobility = damage_nonlocal_getMobility/&
|
damage_nonlocal_getMobility = damage_nonlocal_getMobility/&
|
||||||
|
|
|
@ -621,8 +621,8 @@ subroutine materialpoint_postResults
|
||||||
|
|
||||||
grainLooping :do g = 1,myNgrains
|
grainLooping :do g = 1,myNgrains
|
||||||
theSize = 1 + crystallite_sizePostResults(myCrystallite) + &
|
theSize = 1 + crystallite_sizePostResults(myCrystallite) + &
|
||||||
1 + plasticState (material_phase(g,i,e))%sizePostResults + & !ToDo
|
1 + plasticState (material_phaseAt(g,e))%sizePostResults + & !ToDo
|
||||||
sum(sourceState(material_phase(g,i,e))%p(:)%sizePostResults)
|
sum(sourceState(material_phaseAt(g,e))%p(:)%sizePostResults)
|
||||||
materialpoint_results(thePos+1:thePos+theSize,i,e) = crystallite_postResults(g,i,e) ! tell crystallite results
|
materialpoint_results(thePos+1:thePos+theSize,i,e) = crystallite_postResults(g,i,e) ! tell crystallite results
|
||||||
thePos = thePos + theSize
|
thePos = thePos + theSize
|
||||||
enddo grainLooping
|
enddo grainLooping
|
||||||
|
|
|
@ -215,7 +215,7 @@ function thermal_adiabatic_getSpecificHeat(ip,el)
|
||||||
|
|
||||||
do grain = 1, homogenization_Ngrains(material_homogenizationAt(el))
|
do grain = 1, homogenization_Ngrains(material_homogenizationAt(el))
|
||||||
thermal_adiabatic_getSpecificHeat = thermal_adiabatic_getSpecificHeat + &
|
thermal_adiabatic_getSpecificHeat = thermal_adiabatic_getSpecificHeat + &
|
||||||
lattice_specificHeat(material_phase(grain,ip,el))
|
lattice_specificHeat(material_phaseAt(grain,el))
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
thermal_adiabatic_getSpecificHeat = &
|
thermal_adiabatic_getSpecificHeat = &
|
||||||
|
@ -242,7 +242,7 @@ function thermal_adiabatic_getMassDensity(ip,el)
|
||||||
|
|
||||||
do grain = 1, homogenization_Ngrains(material_homogenizationAt(el))
|
do grain = 1, homogenization_Ngrains(material_homogenizationAt(el))
|
||||||
thermal_adiabatic_getMassDensity = thermal_adiabatic_getMassDensity + &
|
thermal_adiabatic_getMassDensity = thermal_adiabatic_getMassDensity + &
|
||||||
lattice_massDensity(material_phase(grain,ip,el))
|
lattice_massDensity(material_phaseAt(grain,el))
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
thermal_adiabatic_getMassDensity = &
|
thermal_adiabatic_getMassDensity = &
|
||||||
|
|
|
@ -179,7 +179,7 @@ function thermal_conduction_getConductivity33(ip,el)
|
||||||
thermal_conduction_getConductivity33 = 0.0_pReal
|
thermal_conduction_getConductivity33 = 0.0_pReal
|
||||||
do grain = 1, homogenization_Ngrains(material_homogenizationAt(el))
|
do grain = 1, homogenization_Ngrains(material_homogenizationAt(el))
|
||||||
thermal_conduction_getConductivity33 = thermal_conduction_getConductivity33 + &
|
thermal_conduction_getConductivity33 = thermal_conduction_getConductivity33 + &
|
||||||
crystallite_push33ToRef(grain,ip,el,lattice_thermalConductivity33(:,:,material_phase(grain,ip,el)))
|
crystallite_push33ToRef(grain,ip,el,lattice_thermalConductivity33(:,:,material_phaseAt(grain,el)))
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
thermal_conduction_getConductivity33 = &
|
thermal_conduction_getConductivity33 = &
|
||||||
|
@ -206,7 +206,7 @@ function thermal_conduction_getSpecificHeat(ip,el)
|
||||||
|
|
||||||
do grain = 1, homogenization_Ngrains(material_homogenizationAt(el))
|
do grain = 1, homogenization_Ngrains(material_homogenizationAt(el))
|
||||||
thermal_conduction_getSpecificHeat = thermal_conduction_getSpecificHeat + &
|
thermal_conduction_getSpecificHeat = thermal_conduction_getSpecificHeat + &
|
||||||
lattice_specificHeat(material_phase(grain,ip,el))
|
lattice_specificHeat(material_phaseAt(grain,el))
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
thermal_conduction_getSpecificHeat = &
|
thermal_conduction_getSpecificHeat = &
|
||||||
|
@ -232,7 +232,7 @@ function thermal_conduction_getMassDensity(ip,el)
|
||||||
|
|
||||||
do grain = 1, homogenization_Ngrains(material_homogenizationAt(el))
|
do grain = 1, homogenization_Ngrains(material_homogenizationAt(el))
|
||||||
thermal_conduction_getMassDensity = thermal_conduction_getMassDensity &
|
thermal_conduction_getMassDensity = thermal_conduction_getMassDensity &
|
||||||
+ lattice_massDensity(material_phase(grain,ip,el))
|
+ lattice_massDensity(material_phaseAt(grain,el))
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
thermal_conduction_getMassDensity = &
|
thermal_conduction_getMassDensity = &
|
||||||
|
|
Loading…
Reference in New Issue