From eecb78665cc5479080565c40b0fbd2634312d780 Mon Sep 17 00:00:00 2001
From: Pratheek Shanthraj
Date: Fri, 16 Jan 2015 17:32:47 +0000
Subject: [PATCH] removing some unused code and cleaning up
---
code/Makefile | 5 -----
code/lattice.f90 | 2 +-
code/vacancy_generation.f90 | 5 ++++-
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/code/Makefile b/code/Makefile
index bdace0ca0..21f5057ca 100644
--- a/code/Makefile
+++ b/code/Makefile
@@ -77,11 +77,6 @@ LIBRARIES +=-liomp5
endif
endif
-#newstate
-ifeq "$(STATE)" "NEWH"
-INCLUDE_DIRS +=-DNEWSTATE
-endif
-
ifdef STANDARD_CHECK
STANDARD_CHECK_ifort =$(STANDARD_CHECK)
STANDARD_CHECK_gfortran =$(STANDARD_CHECK)
diff --git a/code/lattice.f90 b/code/lattice.f90
index dbf0f9823..acf9df0f5 100644
--- a/code/lattice.f90
+++ b/code/lattice.f90
@@ -1254,7 +1254,7 @@ subroutine lattice_init
lattice_VacancyDiffusion33(3,3,section) = IO_floatValue(line,positions,2_pInt)
case ('vacancy_mobility')
lattice_VacancyMobility(section) = IO_floatValue(line,positions,2_pInt)
- case ('equilibrium_vacancy_concentration')
+ case ('vacancy_eqcv')
lattice_equilibriumVacancyConcentration(section) = IO_floatValue(line,positions,2_pInt)
end select
endif
diff --git a/code/vacancy_generation.f90 b/code/vacancy_generation.f90
index f65e693df..8b8d35429 100644
--- a/code/vacancy_generation.f90
+++ b/code/vacancy_generation.f90
@@ -339,7 +339,10 @@ subroutine vacancy_generation_microstructure(Tstar_v, temperature, damage, subdt
vacancyState(phase)%state(1,constituent) = &
vacancyState(phase)%subState0(1,constituent) + &
- subdt*vacancy_generation_freq(instance)*exp(-energyBarrier/(kB*Temperature))
+ subdt* &
+ damage*damage* &
+ vacancy_generation_freq(instance)* &
+ exp(-stressBarrier/(vacancy_generation_kBCoeff(instance)*temperature))
end subroutine vacancy_generation_microstructure