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

changed thermal and damage defaults from undefined to none

This commit is contained in:
Pratheek Shanthraj 2014-06-25 16:06:21 +00:00
parent baaf104238
commit 03d1bb6b8b
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/material.f90
View File

@ -53,14 +53,12 @@ module material
end enum end enum
#ifdef NEWSTATE #ifdef NEWSTATE
enum, bind(c) enum, bind(c)
enumerator :: DAMAGE_undefined_ID, & enumerator :: DAMAGE_none_ID, &
DAMAGE_none_ID, &
DAMAGE_local_ID, & DAMAGE_local_ID, &
DAMAGE_gradient_ID DAMAGE_gradient_ID
end enum end enum
enum, bind(c) enum, bind(c)
enumerator :: THERMAL_undefined_ID, & enumerator :: THERMAL_none_ID, &
THERMAL_none_ID, &
THERMAL_iso_ID, & THERMAL_iso_ID, &
THERMAL_conduction_ID, & THERMAL_conduction_ID, &
THERMAL_adiabatic_ID THERMAL_adiabatic_ID
@ -87,9 +85,9 @@ module material
integer(kind(PLASTICITY_undefined_ID)), dimension(:), allocatable, public, protected :: & integer(kind(PLASTICITY_undefined_ID)), dimension(:), allocatable, public, protected :: &
phase_plasticity !< plasticity of each phase phase_plasticity !< plasticity of each phase
#ifdef NEWSTATE #ifdef NEWSTATE
integer(kind(DAMAGE_undefined_ID)), dimension(:), allocatable, public, protected :: & integer(kind(DAMAGE_none_ID)), dimension(:), allocatable, public, protected :: &
phase_damage !< damage of each phase phase_damage !< damage of each phase
integer(kind(THERMAL_undefined_ID)), dimension(:), allocatable, public, protected :: & integer(kind(THERMAL_none_ID)), dimension(:), allocatable, public, protected :: &
phase_thermal !< thermal of each phase phase_thermal !< thermal of each phase
#endif #endif
integer(kind(HOMOGENIZATION_undefined_ID)), dimension(:), allocatable, public, protected :: & integer(kind(HOMOGENIZATION_undefined_ID)), dimension(:), allocatable, public, protected :: &
@ -200,11 +198,9 @@ module material
PLASTICITY_titanmod_ID, & PLASTICITY_titanmod_ID, &
PLASTICITY_nonlocal_ID, & PLASTICITY_nonlocal_ID, &
#ifdef NEWSTATE #ifdef NEWSTATE
DAMAGE_undefined_ID, &
DAMAGE_none_ID, & DAMAGE_none_ID, &
DAMAGE_local_ID, & DAMAGE_local_ID, &
DAMAGE_gradient_ID, & DAMAGE_gradient_ID, &
THERMAL_undefined_ID, &
THERMAL_none_ID, & THERMAL_none_ID, &
THERMAL_iso_ID, & THERMAL_iso_ID, &
THERMAL_conduction_ID, & THERMAL_conduction_ID, &
@ -637,9 +633,9 @@ subroutine material_parsePhase(fileUnit,myPart)
allocate(phase_plasticity(Nsections) , source=PLASTICITY_undefined_ID) allocate(phase_plasticity(Nsections) , source=PLASTICITY_undefined_ID)
allocate(phase_plasticityInstance(Nsections), source=0_pInt) allocate(phase_plasticityInstance(Nsections), source=0_pInt)
#ifdef NEWSTATE #ifdef NEWSTATE
allocate(phase_damage(Nsections) , source=DAMAGE_undefined_ID) allocate(phase_damage(Nsections) , source=DAMAGE_none_ID)
allocate(phase_damageInstance(Nsections), source=0_pInt) allocate(phase_damageInstance(Nsections), source=0_pInt)
allocate(phase_thermal(Nsections) , source=THERMAL_undefined_ID) allocate(phase_thermal(Nsections) , source=THERMAL_none_ID)
allocate(phase_thermalInstance(Nsections), source=0_pInt) allocate(phase_thermalInstance(Nsections), source=0_pInt)
#endif #endif
allocate(phase_Noutput(Nsections), source=0_pInt) allocate(phase_Noutput(Nsections), source=0_pInt)