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

corrected wrong dimensions of aTolstate and inclusion order of files in abaqus and marc interfaces

This commit is contained in:
Luv Sharma 2014-07-03 12:52:33 +00:00
parent 499eb7cdbe
commit d5952138e3
4 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/DAMASK_abaqus_exp.f
View File

@ -82,6 +82,13 @@ end module DAMASK_interface
#include "mesh.f90" #include "mesh.f90"
#include "material.f90" #include "material.f90"
#include "lattice.f90" #include "lattice.f90"
#include "damage_none.f90"
#include "damage_gradient.f90"
#include "constitutive_damage.f90"
#include "thermal_none.f90"
#include "thermal_conduction.f90"
#include "thermal_adiabatic.f90"
#include "constitutive_thermal.f90"
#include "constitutive_none.f90" #include "constitutive_none.f90"
#include "constitutive_j2.f90" #include "constitutive_j2.f90"
#include "constitutive_phenopowerlaw.f90" #include "constitutive_phenopowerlaw.f90"
@ -95,13 +102,6 @@ end module DAMASK_interface
#include "homogenization_RGC.f90" #include "homogenization_RGC.f90"
#include "homogenization.f90" #include "homogenization.f90"
#include "CPFEM.f90" #include "CPFEM.f90"
#include "constitutive_damage.f90"
#include "damage_none.f90"
#include "damage_gradient.f90"
#include "constitutive_thermal.f90"
#include "thermal_none.f90"
#include "thermal_conduction.f90"
#include "thermal_adiabatic.f90"
subroutine vumat(nBlock, nDir, nshr, nStateV, nFieldV, nProps, lAnneal, & subroutine vumat(nBlock, nDir, nshr, nStateV, nFieldV, nProps, lAnneal, &
stepTime, totalTime, dt, cmName, coordMp, charLength, & stepTime, totalTime, dt, cmName, coordMp, charLength, &

15
code/DAMASK_abaqus_std.f
View File

@ -82,6 +82,13 @@ end module DAMASK_interface
#include "mesh.f90" #include "mesh.f90"
#include "material.f90" #include "material.f90"
#include "lattice.f90" #include "lattice.f90"
#include "damage_none.f90"
#include "damage_gradient.f90"
#include "constitutive_damage.f90"
#include "thermal_none.f90"
#include "thermal_conduction.f90"
#include "thermal_adiabatic.f90"
#include "constitutive_thermal.f90"
#include "constitutive_none.f90" #include "constitutive_none.f90"
#include "constitutive_j2.f90" #include "constitutive_j2.f90"
#include "constitutive_phenopowerlaw.f90" #include "constitutive_phenopowerlaw.f90"
@ -95,13 +102,7 @@ end module DAMASK_interface
#include "homogenization_RGC.f90" #include "homogenization_RGC.f90"
#include "homogenization.f90" #include "homogenization.f90"
#include "CPFEM.f90" #include "CPFEM.f90"
#include "constitutive_damage.f90"
#include "damage_none.f90"
#include "damage_gradient.f90"
#include "constitutive_thermal.f90"
#include "thermal_none.f90"
#include "thermal_conduction.f90"
#include "thermal_adiabatic.f90"
subroutine UMAT(STRESS,STATEV,DDSDDE,SSE,SPD,SCD,& subroutine UMAT(STRESS,STATEV,DDSDDE,SSE,SPD,SCD,&

15
code/DAMASK_marc.f90
View File

@ -111,6 +111,13 @@ end module DAMASK_interface
#include "mesh.f90" #include "mesh.f90"
#include "material.f90" #include "material.f90"
#include "lattice.f90" #include "lattice.f90"
#include "damage_none.f90"
#include "damage_gradient.f90"
#include "constitutive_damage.f90"
#include "thermal_none.f90"
#include "thermal_conduction.f90"
#include "thermal_adiabatic.f90"
#include "constitutive_thermal.f90"
#include "constitutive_none.f90" #include "constitutive_none.f90"
#include "constitutive_j2.f90" #include "constitutive_j2.f90"
#include "constitutive_phenopowerlaw.f90" #include "constitutive_phenopowerlaw.f90"
@ -124,14 +131,6 @@ end module DAMASK_interface
#include "homogenization_RGC.f90" #include "homogenization_RGC.f90"
#include "homogenization.f90" #include "homogenization.f90"
#include "CPFEM.f90" #include "CPFEM.f90"
#include "constitutive_damage.f90"
#include "damage_none.f90"
#include "damage_gradient.f90"
#include "constitutive_thermal.f90"
#include "thermal_none.f90"
#include "thermal_conduction.f90"
#include "thermal_adiabatic.f90"
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief This is the MSC.Marc user subroutine for defining material behavior !> @brief This is the MSC.Marc user subroutine for defining material behavior

3
code/crystallite.f90
View File

@ -2194,7 +2194,7 @@ subroutine crystallite_integrateStateRKCK45()
.or. .not. iand(debug_level(debug_crystallite), debug_levelSelective) /= 0_pInt)) then .or. .not. iand(debug_level(debug_crystallite), debug_levelSelective) /= 0_pInt)) then
write(6,'(a,i8,1x,i3,1x,i3,/)') '<< CRYST >> updateState at el ip g ',e,i,g write(6,'(a,i8,1x,i3,1x,i3,/)') '<< CRYST >> updateState at el ip g ',e,i,g
write(6,'(a,/,(12x,12(f12.1,1x)),/)') '<< CRYST >> absolute residuum tolerance', & write(6,'(a,/,(12x,12(f12.1,1x)),/)') '<< CRYST >> absolute residuum tolerance', &
stateResiduum(1:mySizeDotState,g,i,e) / plasticState(p)%aTolState(1:mySizePlasticDotState,cc) stateResiduum(1:mySizeDotState,g,i,e) / plasticState(p)%aTolState(1:mySizePlasticDotState)
write(6,'(a,/,(12x,12(f12.1,1x)),/)') '<< CRYST >> relative residuum tolerance', & write(6,'(a,/,(12x,12(f12.1,1x)),/)') '<< CRYST >> relative residuum tolerance', &
relStateResiduum(1:mySizeDotState,g,i,e) / rTol_crystalliteState relStateResiduum(1:mySizeDotState,g,i,e) / rTol_crystalliteState
write(6,'(a,/,(12x,12(e12.5,1x)),/)') '<< CRYST >> dotState', & write(6,'(a,/,(12x,12(e12.5,1x)),/)') '<< CRYST >> dotState', &
@ -2337,7 +2337,6 @@ subroutine crystallite_integrateStateAdaptiveEuler()
constitutive_thermal_maxSizeDotState constitutive_thermal_maxSizeDotState
implicit none implicit none
integer(pInt) :: & integer(pInt) :: &
e, & ! element index in element loop e, & ! element index in element loop
i, & ! integration point index in ip loop i, & ! integration point index in ip loop