From 7833f79f751f2b20b90ba155f72cd135e27b4a5a Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 17 May 2013 16:52:19 +0000 Subject: [PATCH] replaced numerics_unitlength with mesh_unitlength --- code/DAMASK_abaqus_exp.f | 5 ++--- code/DAMASK_abaqus_std.f | 5 ++--- code/mesh.f90 | 18 +++++++++--------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/code/DAMASK_abaqus_exp.f b/code/DAMASK_abaqus_exp.f index 911c9cca7..51abdd538 100644 --- a/code/DAMASK_abaqus_exp.f +++ b/code/DAMASK_abaqus_exp.f @@ -123,8 +123,6 @@ subroutine vumat(nBlock, nDir, nshr, nStateV, nFieldV, nProps, lAnneal, & use prec, only: & pReal, & pInt - use numerics, only: & - numerics_unitlength use FEsolving, only: & cycleCounter, & theTime, & @@ -141,6 +139,7 @@ subroutine vumat(nBlock, nDir, nshr, nStateV, nFieldV, nProps, lAnneal, & debug_level, & debug_abaqus use mesh, only: & + mesh_unitlength, & mesh_FEasCP, & mesh_ipCoordinates use CPFEM, only: & @@ -283,7 +282,7 @@ subroutine vumat(nBlock, nDir, nshr, nStateV, nFieldV, nProps, lAnneal, & endif 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) diff --git a/code/DAMASK_abaqus_std.f b/code/DAMASK_abaqus_std.f index 87a5fe3d1..371e7a73d 100644 --- a/code/DAMASK_abaqus_std.f +++ b/code/DAMASK_abaqus_std.f @@ -122,8 +122,6 @@ subroutine UMAT(STRESS,STATEV,DDSDDE,SSE,SPD,SCD,& use prec, only: & pReal, & pInt - use numerics, only: & - numerics_unitlength use FEsolving, only: & cycleCounter, & theInc, & @@ -145,6 +143,7 @@ subroutine UMAT(STRESS,STATEV,DDSDDE,SSE,SPD,SCD,& debug_level, & debug_abaqus use mesh, only: & + mesh_unitlength, & mesh_FEasCP, & mesh_ipCoordinates use CPFEM, only: & @@ -298,7 +297,7 @@ subroutine UMAT(STRESS,STATEV,DDSDDE,SSE,SPD,SCD,& cutBack = .false. computationMode = ior(computationMode,CPFEM_RESTOREJACOBIAN) ! restore Jacobian after cutback endif - mesh_ipCoordinates(1:3,npt,cp_en) = numerics_unitlength * COORDS + mesh_ipCoordinates(1:3,npt,cp_en) = mesh_unitlength * COORDS endif theTime = time(2) ! record current starting time diff --git a/code/mesh.f90 b/code/mesh.f90 index 193ad904a..b1a3047b4 100644 --- a/code/mesh.f90 +++ b/code/mesh.f90 @@ -3386,14 +3386,14 @@ end subroutine mesh_abaqus_map_nodes !! Allocates global arrays 'mesh_node0' and 'mesh_node' !-------------------------------------------------------------------------------------------------- subroutine mesh_abaqus_build_nodes(myUnit) - - use IO, only: IO_lc, & - IO_stringValue, & - IO_floatValue, & - IO_stringPos, & - IO_error, & - IO_countDataLines, & - IO_intValue + use IO, only: & + IO_lc, & + IO_stringValue, & + IO_floatValue, & + IO_stringPos, & + IO_error, & + IO_countDataLines, & + IO_intValue implicit none integer(pInt), intent(in) :: myUnit @@ -3434,7 +3434,7 @@ subroutine mesh_abaqus_build_nodes(myUnit) myPos = IO_stringPos(line,maxNchunks) m = mesh_FEasCP('node',IO_intValue(line,myPos,1_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 endif