From ce3be666e8b6cadd31b20d2629654b27d9029e1a Mon Sep 17 00:00:00 2001
From: Pratheek Shanthraj
Date: Fri, 26 Sep 2014 18:49:40 +0000
Subject: [PATCH] redoing previous changes that were lost in commit 3502 please
please please make sure you merge your changes to an updated version of the
code before committing them
---
code/lattice.f90 | 52 +++++++++++++++---------------------------------
1 file changed, 16 insertions(+), 36 deletions(-)
diff --git a/code/lattice.f90 b/code/lattice.f90
index 22641d442..aba0365ea 100644
--- a/code/lattice.f90
+++ b/code/lattice.f90
@@ -747,8 +747,7 @@ module lattice
real(pReal), dimension(:,:,:), allocatable, public, protected :: &
lattice_thermalConductivity33, &
lattice_thermalExpansion33, &
- lattice_damageDiffusion33, &
- lattice_surfaceEnergy33
+ lattice_damageDiffusion33
real(pReal), dimension(:), allocatable, public, protected :: &
lattice_damageMobility, &
lattice_massDensity, &
@@ -1010,7 +1009,6 @@ subroutine lattice_init
allocate(lattice_damageMobility ( Nphases), source=0.0_pReal)
allocate(lattice_massDensity ( Nphases), source=0.0_pReal)
allocate(lattice_specificHeat ( Nphases), source=0.0_pReal)
- allocate(lattice_surfaceEnergy33 (3,3,Nphases), source=0.0_pReal)
allocate(lattice_referenceTemperature (Nphases), source=0.0_pReal)
allocate(lattice_mu(Nphases), source=0.0_pReal)
@@ -1116,11 +1114,11 @@ subroutine lattice_init
aM(section) = IO_floatValue(line,positions,2_pInt)
case ('cm', 'c_m', 'c_martensite')
cM(section) = IO_floatValue(line,positions,2_pInt)
- case ('k11')
+ case ('thermal_conductivity11')
lattice_thermalConductivity33(1,1,section) = IO_floatValue(line,positions,2_pInt)
- case ('k22')
+ case ('thermal_conductivity22')
lattice_thermalConductivity33(2,2,section) = IO_floatValue(line,positions,2_pInt)
- case ('k33')
+ case ('thermal_conductivity33')
lattice_thermalConductivity33(3,3,section) = IO_floatValue(line,positions,2_pInt)
case ('thermal_expansion11')
lattice_thermalExpansion33(1,1,section) = IO_floatValue(line,positions,2_pInt)
@@ -1128,38 +1126,20 @@ subroutine lattice_init
lattice_thermalExpansion33(2,2,section) = IO_floatValue(line,positions,2_pInt)
case ('thermal_expansion33')
lattice_thermalExpansion33(3,3,section) = IO_floatValue(line,positions,2_pInt)
- case ('g11')
- lattice_surfaceEnergy33(1,1,section) = IO_floatValue(line,positions,2_pInt)
- case ('g22')
- lattice_surfaceEnergy33(2,2,section) = IO_floatValue(line,positions,2_pInt)
- case ('g33')
- lattice_surfaceEnergy33(3,3,section) = IO_floatValue(line,positions,2_pInt)
- case ('reference_temperature')
- lattice_referenceTemperature(section) = IO_floatValue(line,positions,2_pInt)
- case ('k_d11')
- lattice_DamageDiffusion33(1,1,section) = IO_floatValue(line,positions,2_pInt)
- case ('k_d12')
- lattice_DamageDiffusion33(1,2,section) = IO_floatValue(line,positions,2_pInt)
- case ('k_d13')
- lattice_DamageDiffusion33(1,3,section) = IO_floatValue(line,positions,2_pInt)
- case ('k_d21')
- lattice_DamageDiffusion33(2,1,section) = IO_floatValue(line,positions,2_pInt)
- case ('k_d22')
- lattice_DamageDiffusion33(2,3,section) = IO_floatValue(line,positions,2_pInt)
- case ('k_d23')
- lattice_DamageDiffusion33(2,3,section) = IO_floatValue(line,positions,2_pInt)
- case ('k_d31')
- lattice_DamageDiffusion33(3,1,section) = IO_floatValue(line,positions,2_pInt)
- case ('k_d32')
- lattice_DamageDiffusion33(3,2,section) = IO_floatValue(line,positions,2_pInt)
- case ('k_d33')
- lattice_DamageDiffusion33(3,3,section) = IO_floatValue(line,positions,2_pInt)
- case ('damage_mobility')
- lattice_DamageMobility(section) = IO_floatValue(line,positions,2_pInt)
case ('specific_heat')
lattice_specificHeat(section) = IO_floatValue(line,positions,2_pInt)
case ('mass_density')
lattice_massDensity(section) = IO_floatValue(line,positions,2_pInt)
+ case ('reference_temperature')
+ lattice_referenceTemperature(section) = IO_floatValue(line,positions,2_pInt)
+ case ('damage_diffusion11')
+ lattice_DamageDiffusion33(1,1,section) = IO_floatValue(line,positions,2_pInt)
+ case ('damage_diffusion22')
+ lattice_DamageDiffusion33(2,2,section) = IO_floatValue(line,positions,2_pInt)
+ case ('damage_diffusion33')
+ lattice_DamageDiffusion33(3,3,section) = IO_floatValue(line,positions,2_pInt)
+ case ('damage_mobility')
+ lattice_DamageMobility(section) = IO_floatValue(line,positions,2_pInt)
end select
endif
enddo
@@ -1247,8 +1227,8 @@ subroutine lattice_initializeStructure(myPhase,CoverA,aA,aM,cM)
lattice_thermalConductivity33(1:3,1:3,myPhase))
lattice_thermalExpansion33(1:3,1:3,myPhase) = lattice_symmetrize33(lattice_structure(myPhase),&
lattice_thermalExpansion33(1:3,1:3,myPhase))
- lattice_surfaceEnergy33(1:3,1:3,myPhase) = lattice_symmetrize33(lattice_structure(myPhase),&
- lattice_surfaceEnergy33(1:3,1:3,myPhase))
+ lattice_DamageDiffusion33(1:3,1:3,myPhase) = lattice_symmetrize33(lattice_structure(myPhase),&
+ lattice_DamageDiffusion33(1:3,1:3,myPhase))
select case(lattice_structure(myPhase))
!--------------------------------------------------------------------------------------------------