reinstating changes lost in previous commit
This commit is contained in:
parent
9b1e55f0e4
commit
b8a45f660e
|
@ -61,9 +61,7 @@ subroutine constitutive_init
|
|||
debug_constitutive, &
|
||||
debug_levelBasic
|
||||
use numerics, only: &
|
||||
#ifdef FEM
|
||||
worldrank, &
|
||||
#endif
|
||||
numerics_integrator
|
||||
use IO, only: &
|
||||
IO_error, &
|
||||
|
@ -189,16 +187,12 @@ subroutine constitutive_init
|
|||
if (any(phase_thermal == LOCAL_THERMAL_adiabatic_ID)) call thermal_adiabatic_init(FILEUNIT)
|
||||
close(FILEUNIT)
|
||||
|
||||
#ifdef FEM
|
||||
if (worldrank == 0) then
|
||||
#endif
|
||||
mainProcess: if (worldrank == 0) then
|
||||
write(6,'(/,a)') ' <<<+- constitutive init -+>>>'
|
||||
write(6,'(a)') ' $Id$'
|
||||
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
|
||||
#include "compilation_info.f90"
|
||||
#ifdef FEM
|
||||
endif
|
||||
#endif
|
||||
endif mainProcess
|
||||
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
! write description file for constitutive phase output
|
||||
|
|
|
@ -203,9 +203,7 @@ subroutine constitutive_dislokmc_init(fileUnit)
|
|||
MATERIAL_partPhase
|
||||
use lattice
|
||||
use numerics,only: &
|
||||
#ifdef FEM
|
||||
worldrank, &
|
||||
#endif
|
||||
numerics_integrator
|
||||
|
||||
implicit none
|
||||
|
@ -225,16 +223,12 @@ subroutine constitutive_dislokmc_init(fileUnit)
|
|||
line = ''
|
||||
real(pReal), dimension(:), allocatable :: tempPerSlip, tempPerTwin
|
||||
|
||||
#ifdef FEM
|
||||
if (worldrank == 0) then
|
||||
#endif
|
||||
mainProcess: if (worldrank == 0) then
|
||||
write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_DISLOKMC_label//' init -+>>>'
|
||||
write(6,'(a)') ' $Id$'
|
||||
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
|
||||
#include "compilation_info.f90"
|
||||
#ifdef FEM
|
||||
endif
|
||||
#endif
|
||||
endif mainProcess
|
||||
|
||||
maxNinstance = int(count(phase_plasticity == PLASTICITY_DISLOKMC_ID),pInt)
|
||||
if (maxNinstance == 0_pInt) return
|
||||
|
|
|
@ -217,9 +217,7 @@ subroutine constitutive_dislotwin_init(fileUnit)
|
|||
MATERIAL_partPhase
|
||||
use lattice
|
||||
use numerics,only: &
|
||||
#ifdef FEM
|
||||
worldrank, &
|
||||
#endif
|
||||
numerics_integrator
|
||||
|
||||
implicit none
|
||||
|
@ -239,16 +237,12 @@ subroutine constitutive_dislotwin_init(fileUnit)
|
|||
line = ''
|
||||
real(pReal), dimension(:), allocatable :: tempPerSlip, tempPerTwin, tempPerTrans
|
||||
|
||||
#ifdef FEM
|
||||
if (worldrank == 0) then
|
||||
#endif
|
||||
mainProcess: if (worldrank == 0) then
|
||||
write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_DISLOTWIN_label//' init -+>>>'
|
||||
write(6,'(a)') ' $Id$'
|
||||
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
|
||||
#include "compilation_info.f90"
|
||||
#ifdef FEM
|
||||
endif
|
||||
#endif
|
||||
endif mainProcess
|
||||
|
||||
maxNinstance = int(count(phase_plasticity == PLASTICITY_DISLOTWIN_ID),pInt)
|
||||
if (maxNinstance == 0_pInt) return
|
||||
|
|
|
@ -94,9 +94,7 @@ subroutine constitutive_j2_init(fileUnit)
|
|||
debug_constitutive, &
|
||||
debug_levelBasic
|
||||
use numerics, only: &
|
||||
#ifdef FEM
|
||||
worldrank, &
|
||||
#endif
|
||||
numerics_integrator
|
||||
use math, only: &
|
||||
math_Mandel3333to66, &
|
||||
|
@ -155,16 +153,12 @@ subroutine constitutive_j2_init(fileUnit)
|
|||
integer(HID_T) :: ID,ID2,ID4
|
||||
#endif
|
||||
|
||||
#ifdef FEM
|
||||
if (worldrank == 0) then
|
||||
#endif
|
||||
mainProcess: if (worldrank == 0) then
|
||||
write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_J2_label//' init -+>>>'
|
||||
write(6,'(a)') ' $Id$'
|
||||
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
|
||||
#include "compilation_info.f90"
|
||||
#ifdef FEM
|
||||
endif
|
||||
#endif
|
||||
endif mainProcess
|
||||
|
||||
maxNinstance = int(count(phase_plasticity == PLASTICITY_J2_ID),pInt)
|
||||
if (maxNinstance == 0_pInt) return
|
||||
|
|
|
@ -301,9 +301,7 @@ use material, only: homogenization_maxNgrains, &
|
|||
material_phase
|
||||
use lattice
|
||||
use numerics,only: &
|
||||
#ifdef FEM
|
||||
worldrank, &
|
||||
#endif
|
||||
numerics_integrator
|
||||
|
||||
|
||||
|
@ -341,16 +339,12 @@ integer(pInt) :: phase, &
|
|||
|
||||
integer(pInt) :: NofMyPhase
|
||||
|
||||
#ifdef FEM
|
||||
if (worldrank == 0) then
|
||||
#endif
|
||||
mainProcess: if (worldrank == 0) then
|
||||
write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_NONLOCAL_label//' init -+>>>'
|
||||
write(6,'(a)') ' $Id$'
|
||||
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
|
||||
#include "compilation_info.f90"
|
||||
#ifdef FEM
|
||||
endif
|
||||
#endif
|
||||
endif mainProcess
|
||||
|
||||
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
|
||||
|
|
|
@ -139,9 +139,7 @@ subroutine constitutive_phenopowerlaw_init(fileUnit)
|
|||
MATERIAL_partPhase
|
||||
use lattice
|
||||
use numerics,only: &
|
||||
#ifdef FEM
|
||||
worldrank, &
|
||||
#endif
|
||||
numerics_integrator
|
||||
|
||||
implicit none
|
||||
|
@ -162,16 +160,12 @@ subroutine constitutive_phenopowerlaw_init(fileUnit)
|
|||
integer(pInt) :: NofMyPhase
|
||||
real(pReal), dimension(:), allocatable :: tempPerSlip
|
||||
|
||||
#ifdef FEM
|
||||
if (worldrank == 0) then
|
||||
#endif
|
||||
mainProcess: if (worldrank == 0) then
|
||||
write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_PHENOPOWERLAW_label//' init -+>>>'
|
||||
write(6,'(a)') ' $Id$'
|
||||
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
|
||||
#include "compilation_info.f90"
|
||||
#ifdef FEM
|
||||
endif
|
||||
#endif
|
||||
endif mainProcess
|
||||
|
||||
maxNinstance = int(count(phase_plasticity == PLASTICITY_PHENOPOWERLAW_ID),pInt)
|
||||
if (maxNinstance == 0_pInt) return
|
||||
|
|
|
@ -220,9 +220,7 @@ subroutine constitutive_titanmod_init(fileUnit)
|
|||
MATERIAL_partPhase
|
||||
use lattice
|
||||
use numerics,only: &
|
||||
#ifdef FEM
|
||||
worldrank, &
|
||||
#endif
|
||||
numerics_integrator
|
||||
|
||||
implicit none
|
||||
|
@ -247,16 +245,12 @@ subroutine constitutive_titanmod_init(fileUnit)
|
|||
tag = '', &
|
||||
line = ''
|
||||
|
||||
#ifdef FEM
|
||||
if (worldrank == 0) then
|
||||
#endif
|
||||
mainProcess: if (worldrank == 0) then
|
||||
write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_TITANMOD_label//' init -+>>>'
|
||||
write(6,'(a)') ' $Id$'
|
||||
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
|
||||
#include "compilation_info.f90"
|
||||
#ifdef FEM
|
||||
endif
|
||||
#endif
|
||||
endif mainProcess
|
||||
|
||||
maxNinstance = int(count(phase_plasticity == PLASTICITY_TITANMOD_ID),pInt)
|
||||
if (maxNinstance == 0_pInt) return
|
||||
|
|
|
@ -88,9 +88,7 @@ subroutine damage_brittle_init(fileUnit)
|
|||
damageState, &
|
||||
MATERIAL_partPhase
|
||||
use numerics,only: &
|
||||
#ifdef FEM
|
||||
worldrank, &
|
||||
#endif
|
||||
numerics_integrator
|
||||
|
||||
implicit none
|
||||
|
@ -105,16 +103,12 @@ subroutine damage_brittle_init(fileUnit)
|
|||
tag = '', &
|
||||
line = ''
|
||||
|
||||
#ifdef FEM
|
||||
if (worldrank == 0) then
|
||||
#endif
|
||||
mainProcess: if (worldrank == 0) then
|
||||
write(6,'(/,a)') ' <<<+- damage_'//LOCAL_DAMAGE_BRITTLE_label//' init -+>>>'
|
||||
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"
|
||||
#ifdef FEM
|
||||
endif
|
||||
#endif
|
||||
endif mainProcess
|
||||
|
||||
maxNinstance = int(count(phase_damage == LOCAL_DAMAGE_BRITTLE_ID),pInt)
|
||||
if (maxNinstance == 0_pInt) return
|
||||
|
|
|
@ -88,9 +88,7 @@ subroutine damage_ductile_init(fileUnit)
|
|||
damageState, &
|
||||
MATERIAL_partPhase
|
||||
use numerics,only: &
|
||||
#ifdef FEM
|
||||
worldrank, &
|
||||
#endif
|
||||
numerics_integrator
|
||||
|
||||
implicit none
|
||||
|
@ -105,16 +103,12 @@ subroutine damage_ductile_init(fileUnit)
|
|||
tag = '', &
|
||||
line = ''
|
||||
|
||||
#ifdef FEM
|
||||
if (worldrank == 0) then
|
||||
#endif
|
||||
mainProcess: if (worldrank == 0) then
|
||||
write(6,'(/,a)') ' <<<+- damage_'//LOCAL_DAMAGE_DUCTILE_LABEL//' init -+>>>'
|
||||
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"
|
||||
#ifdef FEM
|
||||
endif
|
||||
#endif
|
||||
endif mainProcess
|
||||
|
||||
maxNinstance = int(count(phase_damage == LOCAL_DAMAGE_DUCTILE_ID),pInt)
|
||||
if (maxNinstance == 0_pInt) return
|
||||
|
|
|
@ -88,6 +88,7 @@ subroutine damage_gurson_init(fileUnit)
|
|||
damageState, &
|
||||
MATERIAL_partPhase
|
||||
use numerics,only: &
|
||||
worldrank, &
|
||||
numerics_integrator
|
||||
|
||||
implicit none
|
||||
|
@ -101,10 +102,13 @@ subroutine damage_gurson_init(fileUnit)
|
|||
character(len=65536) :: &
|
||||
tag = '', &
|
||||
line = ''
|
||||
|
||||
mainProcess: if (worldrank == 0) then
|
||||
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"
|
||||
endif mainProcess
|
||||
|
||||
maxNinstance = int(count(phase_damage == LOCAL_DAMAGE_gurson_ID),pInt)
|
||||
if (maxNinstance == 0_pInt) return
|
||||
|
|
Loading…
Reference in New Issue