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

reinstating changes lost in previous commit

This commit is contained in:
Pratheek Shanthraj 2014-10-10 16:45:14 +00:00
parent 9b1e55f0e4
commit b8a45f660e
10 changed files with 52 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/constitutive.f90
View File

@ -61,9 +61,7 @@ subroutine constitutive_init
debug_constitutive, & debug_constitutive, &
debug_levelBasic debug_levelBasic
use numerics, only: & use numerics, only: &
#ifdef FEM
worldrank, & worldrank, &
#endif
numerics_integrator numerics_integrator
use IO, only: & use IO, only: &
IO_error, & IO_error, &
@ -189,16 +187,12 @@ subroutine constitutive_init
if (any(phase_thermal == LOCAL_THERMAL_adiabatic_ID)) call thermal_adiabatic_init(FILEUNIT) if (any(phase_thermal == LOCAL_THERMAL_adiabatic_ID)) call thermal_adiabatic_init(FILEUNIT)
close(FILEUNIT) close(FILEUNIT)
#ifdef FEM mainProcess: if (worldrank == 0) then
if (worldrank == 0) then write(6,'(/,a)') ' <<<+- constitutive init -+>>>'
#endif write(6,'(a)') ' $Id$'
write(6,'(/,a)') ' <<<+- constitutive init -+>>>' write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
write(6,'(a)') ' $Id$'
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90" #include "compilation_info.f90"
#ifdef FEM endif mainProcess
endif
#endif
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! write description file for constitutive phase output ! write description file for constitutive phase output

16
code/constitutive_dislokmc.f90
View File

@ -203,9 +203,7 @@ subroutine constitutive_dislokmc_init(fileUnit)
MATERIAL_partPhase MATERIAL_partPhase
use lattice use lattice
use numerics,only: & use numerics,only: &
#ifdef FEM
worldrank, & worldrank, &
#endif
numerics_integrator numerics_integrator
implicit none implicit none
@ -225,16 +223,12 @@ subroutine constitutive_dislokmc_init(fileUnit)
line = '' line = ''
real(pReal), dimension(:), allocatable :: tempPerSlip, tempPerTwin real(pReal), dimension(:), allocatable :: tempPerSlip, tempPerTwin
#ifdef FEM mainProcess: if (worldrank == 0) then
if (worldrank == 0) then write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_DISLOKMC_label//' init -+>>>'
#endif write(6,'(a)') ' $Id$'
write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_DISLOKMC_label//' init -+>>>' write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
write(6,'(a)') ' $Id$'
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90" #include "compilation_info.f90"
#ifdef FEM endif mainProcess
endif
#endif
maxNinstance = int(count(phase_plasticity == PLASTICITY_DISLOKMC_ID),pInt) maxNinstance = int(count(phase_plasticity == PLASTICITY_DISLOKMC_ID),pInt)
if (maxNinstance == 0_pInt) return if (maxNinstance == 0_pInt) return

16
code/constitutive_dislotwin.f90
View File

@ -217,9 +217,7 @@ subroutine constitutive_dislotwin_init(fileUnit)
MATERIAL_partPhase MATERIAL_partPhase
use lattice use lattice
use numerics,only: & use numerics,only: &
#ifdef FEM
worldrank, & worldrank, &
#endif
numerics_integrator numerics_integrator
implicit none implicit none
@ -239,16 +237,12 @@ subroutine constitutive_dislotwin_init(fileUnit)
line = '' line = ''
real(pReal), dimension(:), allocatable :: tempPerSlip, tempPerTwin, tempPerTrans real(pReal), dimension(:), allocatable :: tempPerSlip, tempPerTwin, tempPerTrans
#ifdef FEM mainProcess: if (worldrank == 0) then
if (worldrank == 0) then write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_DISLOTWIN_label//' init -+>>>'
#endif write(6,'(a)') ' $Id$'
write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_DISLOTWIN_label//' init -+>>>' write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
write(6,'(a)') ' $Id$'
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90" #include "compilation_info.f90"
#ifdef FEM endif mainProcess
endif
#endif
maxNinstance = int(count(phase_plasticity == PLASTICITY_DISLOTWIN_ID),pInt) maxNinstance = int(count(phase_plasticity == PLASTICITY_DISLOTWIN_ID),pInt)
if (maxNinstance == 0_pInt) return if (maxNinstance == 0_pInt) return

16
code/constitutive_j2.f90
View File

@ -94,9 +94,7 @@ subroutine constitutive_j2_init(fileUnit)
debug_constitutive, & debug_constitutive, &
debug_levelBasic debug_levelBasic
use numerics, only: & use numerics, only: &
#ifdef FEM
worldrank, & worldrank, &
#endif
numerics_integrator numerics_integrator
use math, only: & use math, only: &
math_Mandel3333to66, & math_Mandel3333to66, &
@ -155,16 +153,12 @@ subroutine constitutive_j2_init(fileUnit)
integer(HID_T) :: ID,ID2,ID4 integer(HID_T) :: ID,ID2,ID4
#endif #endif
#ifdef FEM mainProcess: if (worldrank == 0) then
if (worldrank == 0) then write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_J2_label//' init -+>>>'
#endif write(6,'(a)') ' $Id$'
write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_J2_label//' init -+>>>' write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
write(6,'(a)') ' $Id$'
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90" #include "compilation_info.f90"
#ifdef FEM endif mainProcess
endif
#endif
maxNinstance = int(count(phase_plasticity == PLASTICITY_J2_ID),pInt) maxNinstance = int(count(phase_plasticity == PLASTICITY_J2_ID),pInt)
if (maxNinstance == 0_pInt) return if (maxNinstance == 0_pInt) return

16
code/constitutive_nonlocal.f90
View File

@ -301,9 +301,7 @@ use material, only: homogenization_maxNgrains, &
material_phase material_phase
use lattice use lattice
use numerics,only: & use numerics,only: &
#ifdef FEM
worldrank, & worldrank, &
#endif
numerics_integrator numerics_integrator
@ -341,16 +339,12 @@ integer(pInt) :: phase, &
integer(pInt) :: NofMyPhase integer(pInt) :: NofMyPhase
#ifdef FEM mainProcess: if (worldrank == 0) then
if (worldrank == 0) then write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_NONLOCAL_label//' init -+>>>'
#endif write(6,'(a)') ' $Id$'
write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_NONLOCAL_label//' init -+>>>' write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
write(6,'(a)') ' $Id$'
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90" #include "compilation_info.f90"
#ifdef FEM endif mainProcess
endif
#endif
maxNinstances = int(count(phase_plasticity == PLASTICITY_NONLOCAL_ID),pInt) maxNinstances = int(count(phase_plasticity == PLASTICITY_NONLOCAL_ID),pInt)
if (maxNinstances == 0) return ! we don't have to do anything if there's no instance for this constitutive law if (maxNinstances == 0) return ! we don't have to do anything if there's no instance for this constitutive law

16
code/constitutive_phenopowerlaw.f90
View File

@ -139,9 +139,7 @@ subroutine constitutive_phenopowerlaw_init(fileUnit)
MATERIAL_partPhase MATERIAL_partPhase
use lattice use lattice
use numerics,only: & use numerics,only: &
#ifdef FEM
worldrank, & worldrank, &
#endif
numerics_integrator numerics_integrator
implicit none implicit none
@ -162,16 +160,12 @@ subroutine constitutive_phenopowerlaw_init(fileUnit)
integer(pInt) :: NofMyPhase integer(pInt) :: NofMyPhase
real(pReal), dimension(:), allocatable :: tempPerSlip real(pReal), dimension(:), allocatable :: tempPerSlip
#ifdef FEM mainProcess: if (worldrank == 0) then
if (worldrank == 0) then write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_PHENOPOWERLAW_label//' init -+>>>'
#endif write(6,'(a)') ' $Id$'
write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_PHENOPOWERLAW_label//' init -+>>>' write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
write(6,'(a)') ' $Id$'
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90" #include "compilation_info.f90"
#ifdef FEM endif mainProcess
endif
#endif
maxNinstance = int(count(phase_plasticity == PLASTICITY_PHENOPOWERLAW_ID),pInt) maxNinstance = int(count(phase_plasticity == PLASTICITY_PHENOPOWERLAW_ID),pInt)
if (maxNinstance == 0_pInt) return if (maxNinstance == 0_pInt) return

16
code/constitutive_titanmod.f90
View File

@ -220,9 +220,7 @@ subroutine constitutive_titanmod_init(fileUnit)
MATERIAL_partPhase MATERIAL_partPhase
use lattice use lattice
use numerics,only: & use numerics,only: &
#ifdef FEM
worldrank, & worldrank, &
#endif
numerics_integrator numerics_integrator
implicit none implicit none
@ -247,16 +245,12 @@ subroutine constitutive_titanmod_init(fileUnit)
tag = '', & tag = '', &
line = '' line = ''
#ifdef FEM mainProcess: if (worldrank == 0) then
if (worldrank == 0) then write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_TITANMOD_label//' init -+>>>'
#endif write(6,'(a)') ' $Id$'
write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_TITANMOD_label//' init -+>>>' write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
write(6,'(a)') ' $Id$'
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90" #include "compilation_info.f90"
#ifdef FEM endif mainProcess
endif
#endif
maxNinstance = int(count(phase_plasticity == PLASTICITY_TITANMOD_ID),pInt) maxNinstance = int(count(phase_plasticity == PLASTICITY_TITANMOD_ID),pInt)
if (maxNinstance == 0_pInt) return if (maxNinstance == 0_pInt) return

16
code/damage_brittle.f90
View File

@ -88,9 +88,7 @@ subroutine damage_brittle_init(fileUnit)
damageState, & damageState, &
MATERIAL_partPhase MATERIAL_partPhase
use numerics,only: & use numerics,only: &
#ifdef FEM
worldrank, & worldrank, &
#endif
numerics_integrator numerics_integrator
implicit none implicit none
@ -105,16 +103,12 @@ subroutine damage_brittle_init(fileUnit)
tag = '', & tag = '', &
line = '' line = ''
#ifdef FEM mainProcess: if (worldrank == 0) then
if (worldrank == 0) then write(6,'(/,a)') ' <<<+- damage_'//LOCAL_DAMAGE_BRITTLE_label//' init -+>>>'
#endif write(6,'(a)') ' $Id: damage_brittle.f90 3210 2014-06-17 15:24:44Z MPIE\m.diehl $'
write(6,'(/,a)') ' <<<+- damage_'//LOCAL_DAMAGE_BRITTLE_label//' init -+>>>' write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
write(6,'(a)') ' $Id: damage_brittle.f90 3210 2014-06-17 15:24:44Z MPIE\m.diehl $'
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90" #include "compilation_info.f90"
#ifdef FEM endif mainProcess
endif
#endif
maxNinstance = int(count(phase_damage == LOCAL_DAMAGE_BRITTLE_ID),pInt) maxNinstance = int(count(phase_damage == LOCAL_DAMAGE_BRITTLE_ID),pInt)
if (maxNinstance == 0_pInt) return if (maxNinstance == 0_pInt) return

16
code/damage_ductile.f90
View File

@ -88,9 +88,7 @@ subroutine damage_ductile_init(fileUnit)
damageState, & damageState, &
MATERIAL_partPhase MATERIAL_partPhase
use numerics,only: & use numerics,only: &
#ifdef FEM
worldrank, & worldrank, &
#endif
numerics_integrator numerics_integrator
implicit none implicit none
@ -105,16 +103,12 @@ subroutine damage_ductile_init(fileUnit)
tag = '', & tag = '', &
line = '' line = ''
#ifdef FEM mainProcess: if (worldrank == 0) then
if (worldrank == 0) then write(6,'(/,a)') ' <<<+- damage_'//LOCAL_DAMAGE_DUCTILE_LABEL//' init -+>>>'
#endif write(6,'(a)') ' $Id: damage_ductile.f90 3210 2014-06-17 15:24:44Z MPIE\m.diehl $'
write(6,'(/,a)') ' <<<+- damage_'//LOCAL_DAMAGE_DUCTILE_LABEL//' init -+>>>' write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
write(6,'(a)') ' $Id: damage_ductile.f90 3210 2014-06-17 15:24:44Z MPIE\m.diehl $'
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90" #include "compilation_info.f90"
#ifdef FEM endif mainProcess
endif
#endif
maxNinstance = int(count(phase_damage == LOCAL_DAMAGE_DUCTILE_ID),pInt) maxNinstance = int(count(phase_damage == LOCAL_DAMAGE_DUCTILE_ID),pInt)
if (maxNinstance == 0_pInt) return if (maxNinstance == 0_pInt) return

10
code/damage_gurson.f90
View File

@ -88,6 +88,7 @@ subroutine damage_gurson_init(fileUnit)
damageState, & damageState, &
MATERIAL_partPhase MATERIAL_partPhase
use numerics,only: & use numerics,only: &
worldrank, &
numerics_integrator numerics_integrator
implicit none implicit none
@ -101,10 +102,13 @@ subroutine damage_gurson_init(fileUnit)
character(len=65536) :: & character(len=65536) :: &
tag = '', & tag = '', &
line = '' line = ''
write(6,'(/,a)') ' <<<+- damage_'//LOCAL_DAMAGE_gurson_LABEL//' init -+>>>'
write(6,'(a)') ' $Id: damage_gurson.f90 3210 2014-06-17 15:24:44Z MPIE\m.diehl $' mainProcess: if (worldrank == 0) then
write(6,'(a15,a)') ' Current time: ',IO_timeStamp() write(6,'(/,a)') ' <<<+- damage_'//LOCAL_DAMAGE_gurson_LABEL//' init -+>>>'
write(6,'(a)') ' $Id: damage_gurson.f90 3210 2014-06-17 15:24:44Z MPIE\m.diehl $'
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90" #include "compilation_info.f90"
endif mainProcess
maxNinstance = int(count(phase_damage == LOCAL_DAMAGE_gurson_ID),pInt) maxNinstance = int(count(phase_damage == LOCAL_DAMAGE_gurson_ID),pInt)
if (maxNinstance == 0_pInt) return if (maxNinstance == 0_pInt) return