223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removing some unused code and cleaning up

This commit is contained in:
Pratheek Shanthraj 2015-01-16 17:32:47 +00:00
parent 6411d36633
commit eecb78665c
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/Makefile
View File

@ -77,11 +77,6 @@ LIBRARIES +=-liomp5
endif endif
endif endif
#newstate
ifeq "$(STATE)" "NEWH"
INCLUDE_DIRS +=-DNEWSTATE
endif
ifdef STANDARD_CHECK ifdef STANDARD_CHECK
STANDARD_CHECK_ifort =$(STANDARD_CHECK) STANDARD_CHECK_ifort =$(STANDARD_CHECK)
STANDARD_CHECK_gfortran =$(STANDARD_CHECK) STANDARD_CHECK_gfortran =$(STANDARD_CHECK)

2
code/lattice.f90
View File

@ -1254,7 +1254,7 @@ subroutine lattice_init
lattice_VacancyDiffusion33(3,3,section) = IO_floatValue(line,positions,2_pInt) lattice_VacancyDiffusion33(3,3,section) = IO_floatValue(line,positions,2_pInt)
case ('vacancy_mobility') case ('vacancy_mobility')
lattice_VacancyMobility(section) = IO_floatValue(line,positions,2_pInt) 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) lattice_equilibriumVacancyConcentration(section) = IO_floatValue(line,positions,2_pInt)
end select end select
endif endif

5
code/vacancy_generation.f90
View File

@ -339,7 +339,10 @@ subroutine vacancy_generation_microstructure(Tstar_v, temperature, damage, subdt
vacancyState(phase)%state(1,constituent) = & vacancyState(phase)%state(1,constituent) = &
vacancyState(phase)%subState0(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 end subroutine vacancy_generation_microstructure