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

replaced numerics_unitlength with mesh_unitlength

This commit is contained in:
Martin Diehl 2013-05-17 16:52:19 +00:00
parent b3a90a8a3b
commit 7833f79f75
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/DAMASK_abaqus_exp.f
View File

@ -123,8 +123,6 @@ subroutine vumat(nBlock, nDir, nshr, nStateV, nFieldV, nProps, lAnneal, &
use prec, only: & use prec, only: &
pReal, & pReal, &
pInt pInt
use numerics, only: &
numerics_unitlength
use FEsolving, only: & use FEsolving, only: &
cycleCounter, & cycleCounter, &
theTime, & theTime, &
@ -141,6 +139,7 @@ subroutine vumat(nBlock, nDir, nshr, nStateV, nFieldV, nProps, lAnneal, &
debug_level, & debug_level, &
debug_abaqus debug_abaqus
use mesh, only: & use mesh, only: &
mesh_unitlength, &
mesh_FEasCP, & mesh_FEasCP, &
mesh_ipCoordinates mesh_ipCoordinates
use CPFEM, only: & use CPFEM, only: &
@ -283,7 +282,7 @@ subroutine vumat(nBlock, nDir, nshr, nStateV, nFieldV, nProps, lAnneal, &
endif endif
cp_en = mesh_FEasCP('elem',nBlock(4_pInt+n)) cp_en = mesh_FEasCP('elem',nBlock(4_pInt+n))
mesh_ipCoordinates(1:3,n,cp_en) = numerics_unitlength * coordMp(n,1:3) mesh_ipCoordinates(1:3,n,cp_en) = mesh_unitlength * coordMp(n,1:3)
call CPFEM_general(computationMode,defgrd0,defgrd1,temp,timeInc,cp_en,nBlock(2),stress,ddsdde) call CPFEM_general(computationMode,defgrd0,defgrd1,temp,timeInc,cp_en,nBlock(2),stress,ddsdde)

5
code/DAMASK_abaqus_std.f
View File

@ -122,8 +122,6 @@ subroutine UMAT(STRESS,STATEV,DDSDDE,SSE,SPD,SCD,&
use prec, only: & use prec, only: &
pReal, & pReal, &
pInt pInt
use numerics, only: &
numerics_unitlength
use FEsolving, only: & use FEsolving, only: &
cycleCounter, & cycleCounter, &
theInc, & theInc, &
@ -145,6 +143,7 @@ subroutine UMAT(STRESS,STATEV,DDSDDE,SSE,SPD,SCD,&
debug_level, & debug_level, &
debug_abaqus debug_abaqus
use mesh, only: & use mesh, only: &
mesh_unitlength, &
mesh_FEasCP, & mesh_FEasCP, &
mesh_ipCoordinates mesh_ipCoordinates
use CPFEM, only: & use CPFEM, only: &
@ -298,7 +297,7 @@ subroutine UMAT(STRESS,STATEV,DDSDDE,SSE,SPD,SCD,&
cutBack = .false. cutBack = .false.
computationMode = ior(computationMode,CPFEM_RESTOREJACOBIAN) ! restore Jacobian after cutback computationMode = ior(computationMode,CPFEM_RESTOREJACOBIAN) ! restore Jacobian after cutback
endif endif
mesh_ipCoordinates(1:3,npt,cp_en) = numerics_unitlength * COORDS mesh_ipCoordinates(1:3,npt,cp_en) = mesh_unitlength * COORDS
endif endif
theTime = time(2) ! record current starting time theTime = time(2) ! record current starting time

18
code/mesh.f90
View File

@ -3386,14 +3386,14 @@ end subroutine mesh_abaqus_map_nodes
!! Allocates global arrays 'mesh_node0' and 'mesh_node' !! Allocates global arrays 'mesh_node0' and 'mesh_node'
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine mesh_abaqus_build_nodes(myUnit) subroutine mesh_abaqus_build_nodes(myUnit)
use IO, only: &
use IO, only: IO_lc, & IO_lc, &
IO_stringValue, & IO_stringValue, &
IO_floatValue, & IO_floatValue, &
IO_stringPos, & IO_stringPos, &
IO_error, & IO_error, &
IO_countDataLines, & IO_countDataLines, &
IO_intValue IO_intValue
implicit none implicit none
integer(pInt), intent(in) :: myUnit integer(pInt), intent(in) :: myUnit
@ -3434,7 +3434,7 @@ subroutine mesh_abaqus_build_nodes(myUnit)
myPos = IO_stringPos(line,maxNchunks) myPos = IO_stringPos(line,maxNchunks)
m = mesh_FEasCP('node',IO_intValue(line,myPos,1_pInt)) m = mesh_FEasCP('node',IO_intValue(line,myPos,1_pInt))
do j=1_pInt, 3_pInt do j=1_pInt, 3_pInt
mesh_node0(j,m) = numerics_unitlength * IO_floatValue(line,myPos,j+1_pInt) mesh_node0(j,m) = mesh_unitlength * IO_floatValue(line,myPos,j+1_pInt)
enddo enddo
enddo enddo
endif endif