diff --git a/src/damage_nonlocal.f90 b/src/damage_nonlocal.f90 index a4ea54493..f31b10242 100644 --- a/src/damage_nonlocal.f90 +++ b/src/damage_nonlocal.f90 @@ -134,7 +134,7 @@ function damage_nonlocal_getDiffusion(ip,el) damage_nonlocal_getDiffusion = 0.0_pReal do grain = 1, homogenization_Ngrains(homog) damage_nonlocal_getDiffusion = damage_nonlocal_getDiffusion + & - crystallite_push33ToRef(grain,ip,el,lattice_DamageDiffusion(1:3,1:3,material_phaseAt(grain,el))) + crystallite_push33ToRef(grain,ip,el,lattice_D(1:3,1:3,material_phaseAt(grain,el))) enddo damage_nonlocal_getDiffusion = & @@ -157,7 +157,7 @@ real(pReal) function damage_nonlocal_getMobility(ip,el) damage_nonlocal_getMobility = 0.0_pReal do ipc = 1, homogenization_Ngrains(material_homogenizationAt(el)) - damage_nonlocal_getMobility = damage_nonlocal_getMobility + lattice_DamageMobility(material_phaseAt(ipc,el)) + damage_nonlocal_getMobility = damage_nonlocal_getMobility + lattice_M(material_phaseAt(ipc,el)) enddo damage_nonlocal_getMobility = damage_nonlocal_getMobility/& diff --git a/src/lattice.f90 b/src/lattice.f90 index d0ac07ed6..d3e800aa1 100644 --- a/src/lattice.f90 +++ b/src/lattice.f90 @@ -394,13 +394,13 @@ module lattice ! SHOULD NOT BE PART OF LATTICE BEGIN real(pReal), dimension(:), allocatable, public, protected :: & lattice_mu, lattice_nu, & - lattice_damageMobility, & - lattice_massDensity, & - lattice_specificHeat + lattice_M, & + lattice_rho, & + lattice_c_p real(pReal), dimension(:,:,:), allocatable, public, protected :: & lattice_C66, & - lattice_thermalConductivity, & - lattice_damageDiffusion + lattice_K, & + lattice_D integer(kind(lattice_UNDEFINED_ID)), dimension(:), allocatable, public, protected :: & lattice_structure ! SHOULD NOT BE PART OF LATTICE END @@ -465,11 +465,11 @@ subroutine lattice_init allocate(lattice_structure(Nphases),source = lattice_UNDEFINED_ID) allocate(lattice_C66(6,6,Nphases), source=0.0_pReal) - allocate(lattice_thermalConductivity (3,3,Nphases), source=0.0_pReal) - allocate(lattice_damageDiffusion (3,3,Nphases), source=0.0_pReal) + allocate(lattice_K (3,3,Nphases), source=0.0_pReal) + allocate(lattice_D (3,3,Nphases), source=0.0_pReal) - allocate(lattice_damageMobility,& - lattice_massDensity,lattice_specificHeat, & + allocate(lattice_M,& + lattice_rho,lattice_c_p, & lattice_mu, lattice_nu,& source=[(0.0_pReal,i=1,Nphases)]) @@ -517,22 +517,22 @@ subroutine lattice_init ! SHOULD NOT BE PART OF LATTICE BEGIN - lattice_thermalConductivity(1,1,p) = phase%get_asFloat('K_11',defaultVal=0.0_pReal) - lattice_thermalConductivity(2,2,p) = phase%get_asFloat('K_22',defaultVal=0.0_pReal) - lattice_thermalConductivity(3,3,p) = phase%get_asFloat('K_33',defaultVal=0.0_pReal) - lattice_thermalConductivity(1:3,1:3,p) = lattice_applyLatticeSymmetry33(lattice_thermalConductivity(1:3,1:3,p), & - phase%get_asString('lattice')) + lattice_K(1,1,p) = phase%get_asFloat('K_11',defaultVal=0.0_pReal) + lattice_K(2,2,p) = phase%get_asFloat('K_22',defaultVal=0.0_pReal) + lattice_K(3,3,p) = phase%get_asFloat('K_33',defaultVal=0.0_pReal) + lattice_K(1:3,1:3,p) = lattice_applyLatticeSymmetry33(lattice_K(1:3,1:3,p), & + phase%get_asString('lattice')) - lattice_specificHeat(p) = phase%get_asFloat('c_p',defaultVal=0.0_pReal) - lattice_massDensity(p) = phase%get_asFloat('rho', defaultVal=0.0_pReal) + lattice_c_p(p) = phase%get_asFloat('c_p', defaultVal=0.0_pReal) + lattice_rho(p) = phase%get_asFloat('rho', defaultVal=0.0_pReal) - lattice_DamageDiffusion(1,1,p) = phase%get_asFloat('D_11',defaultVal=0.0_pReal) - lattice_DamageDiffusion(2,2,p) = phase%get_asFloat('D_22',defaultVal=0.0_pReal) - lattice_DamageDiffusion(3,3,p) = phase%get_asFloat('D_33',defaultVal=0.0_pReal) - lattice_DamageDiffusion(1:3,1:3,p) = lattice_applyLatticeSymmetry33(lattice_DamageDiffusion(1:3,1:3,p), & - phase%get_asString('lattice')) + lattice_D(1,1,p) = phase%get_asFloat('D_11',defaultVal=0.0_pReal) + lattice_D(2,2,p) = phase%get_asFloat('D_22',defaultVal=0.0_pReal) + lattice_D(3,3,p) = phase%get_asFloat('D_33',defaultVal=0.0_pReal) + lattice_D(1:3,1:3,p) = lattice_applyLatticeSymmetry33(lattice_D(1:3,1:3,p), & + phase%get_asString('lattice')) - lattice_DamageMobility(p) = phase%get_asFloat('M',defaultVal=0.0_pReal) + lattice_M(p) = phase%get_asFloat('M',defaultVal=0.0_pReal) ! SHOULD NOT BE PART OF LATTICE END call selfTest diff --git a/src/thermal_adiabatic.f90 b/src/thermal_adiabatic.f90 index 1601a9b4f..63deb3cd5 100644 --- a/src/thermal_adiabatic.f90 +++ b/src/thermal_adiabatic.f90 @@ -169,7 +169,7 @@ function thermal_adiabatic_getSpecificHeat(ip,el) do grain = 1, homogenization_Ngrains(material_homogenizationAt(el)) thermal_adiabatic_getSpecificHeat = thermal_adiabatic_getSpecificHeat & - + lattice_specificHeat(material_phaseAt(grain,el)) + + lattice_c_p(material_phaseAt(grain,el)) enddo thermal_adiabatic_getSpecificHeat = thermal_adiabatic_getSpecificHeat & @@ -195,7 +195,7 @@ function thermal_adiabatic_getMassDensity(ip,el) do grain = 1, homogenization_Ngrains(material_homogenizationAt(el)) thermal_adiabatic_getMassDensity = thermal_adiabatic_getMassDensity & - + lattice_massDensity(material_phaseAt(grain,el)) + + lattice_rho(material_phaseAt(grain,el)) enddo thermal_adiabatic_getMassDensity = thermal_adiabatic_getMassDensity & diff --git a/src/thermal_conduction.f90 b/src/thermal_conduction.f90 index 5556a54e1..69ce8025e 100644 --- a/src/thermal_conduction.f90 +++ b/src/thermal_conduction.f90 @@ -127,7 +127,7 @@ function thermal_conduction_getConductivity(ip,el) thermal_conduction_getConductivity = 0.0_pReal do grain = 1, homogenization_Ngrains(material_homogenizationAt(el)) thermal_conduction_getConductivity = thermal_conduction_getConductivity + & - crystallite_push33ToRef(grain,ip,el,lattice_thermalConductivity(:,:,material_phaseAt(grain,el))) + crystallite_push33ToRef(grain,ip,el,lattice_K(:,:,material_phaseAt(grain,el))) enddo thermal_conduction_getConductivity = thermal_conduction_getConductivity & @@ -153,7 +153,7 @@ function thermal_conduction_getSpecificHeat(ip,el) do grain = 1, homogenization_Ngrains(material_homogenizationAt(el)) thermal_conduction_getSpecificHeat = thermal_conduction_getSpecificHeat & - + lattice_specificHeat(material_phaseAt(grain,el)) + + lattice_c_p(material_phaseAt(grain,el)) enddo thermal_conduction_getSpecificHeat = thermal_conduction_getSpecificHeat & @@ -180,7 +180,7 @@ function thermal_conduction_getMassDensity(ip,el) do grain = 1, homogenization_Ngrains(material_homogenizationAt(el)) thermal_conduction_getMassDensity = thermal_conduction_getMassDensity & - + lattice_massDensity(material_phaseAt(grain,el)) + + lattice_rho(material_phaseAt(grain,el)) enddo thermal_conduction_getMassDensity = thermal_conduction_getMassDensity &