diff --git a/code/config/material.config b/code/config/material.config index bd325ae37..30aacda24 100644 --- a/code/config/material.config +++ b/code/config/material.config @@ -252,7 +252,7 @@ solidSolutionStrength 10e6 # obstacle strength in Pa solidSolutionEnergy 1e-19 # activation energy for solid solution in J peierlsStressEdge 0.1e6 # Peierls stress for edges in Pa (per slip family) peierlsStressScrew 0.1e6 # Peierls stress for screws in Pa (per slip family) -peierlsEnergyEgde 1e-20 # activation energy for Peierls barrier for edges in J (per slip family) +peierlsEnergyEdge 1e-20 # activation energy for Peierls barrier for edges in J (per slip family) peierlsEnergyScrew 1e-20 # activation energy for Peierls barrier for screws in J (per slip family) viscosity 100 # viscosity fr dislocation glide in Pa s p 1 # exponent for thermal barrier profile diff --git a/code/constitutive_nonlocal.f90 b/code/constitutive_nonlocal.f90 index 47c780f3c..d56406c20 100644 --- a/code/constitutive_nonlocal.f90 +++ b/code/constitutive_nonlocal.f90 @@ -401,16 +401,16 @@ do constitutive_nonlocal_aTolRho(i) = IO_floatValue(line,positions,2) case ('interaction_slipslip') forall (it = 1:lattice_maxNinteraction) constitutive_nonlocal_interactionSlipSlip(it,i) = IO_floatValue(line,positions,1+it) - case('peierlstressedge') + case('peierlsstressedge') forall (f = 1:lattice_maxNslipFamily) & constitutive_nonlocal_peierlsStressPerSlipFamily(f,1,i) = IO_floatValue(line,positions,1+f) - case('peierlstressscrew') + case('peierlsstressscrew') forall (f = 1:lattice_maxNslipFamily) & constitutive_nonlocal_peierlsStressPerSlipFamily(f,2,i) = IO_floatValue(line,positions,1+f) - case('peierlenergyedge') + case('peierlsenergyedge') forall (f = 1:lattice_maxNslipFamily) & constitutive_nonlocal_peierlsEnergyPerSlipFamily(f,1,i) = IO_floatValue(line,positions,1+f) - case('peierlenergyscrew') + case('peierlsenergyscrew') forall (f = 1:lattice_maxNslipFamily) & constitutive_nonlocal_peierlsEnergyPerSlipFamily(f,2,i) = IO_floatValue(line,positions,1+f) case('solidsolutionstrength') @@ -634,8 +634,8 @@ do i = 1,maxNinstance 'fluxdensity_screw_neg_x', & 'fluxdensity_screw_neg_y', & 'fluxdensity_screw_neg_z', & - 'maximumDipoleHeight_edge', & - 'maximumDipoleHeight_screw', & + 'maximumdipoleheight_edge', & + 'maximumdipoleheight_screw', & 'accumulatedshear' ) mySize = constitutive_nonlocal_totalNslip(i) case('dislocationstress')