From 4999aa4e14cb640a4473e0b58dfd30acc91bf0b5 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 13 Oct 2019 19:36:30 +0200 Subject: [PATCH] more cleaning --- src/DAMASK_marc.f90 | 2 +- src/mesh_marc.f90 | 30 ------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/src/DAMASK_marc.f90 b/src/DAMASK_marc.f90 index bea952fca..09a1c83c8 100644 --- a/src/DAMASK_marc.f90 +++ b/src/DAMASK_marc.f90 @@ -266,7 +266,7 @@ subroutine hypela2(d,g,e,de,s,t,dt,ngens,m,nn,kcus,matus,ndi,nshear,disp, & outdatedFFN1 = .false. cycleCounter = cycleCounter + 1 !mesh_cellnode = mesh_build_cellnodes() ! update cell node coordinates - call mesh_build_ipCoordinates() ! update ip coordinates + !call mesh_build_ipCoordinates() ! update ip coordinates endif if (outdatedByNewInc) then computationMode = ior(computationMode,CPFEM_AGERESULTS) ! calc and age results diff --git a/src/mesh_marc.f90 b/src/mesh_marc.f90 index 567bc3f81..6a7fcf71a 100644 --- a/src/mesh_marc.f90 +++ b/src/mesh_marc.f90 @@ -100,7 +100,6 @@ integer, dimension(:,:), allocatable :: & public :: & mesh_init, & mesh_build_cellnodes, & - mesh_build_ipCoordinates, & mesh_FEasCP @@ -188,7 +187,6 @@ subroutine mesh_init(ip,el) if (myDebug) write(6,'(a)') ' Built cell nodes'; flush(6) allocate(mesh_ipCoordinates(3,theMesh%elem%nIPs,theMesh%nElems),source=0.0_pReal) - call mesh_build_ipCoordinates if (myDebug) write(6,'(a)') ' Built IP coordinates'; flush(6) if (myDebug) write(6,'(a)') ' Built IP areas'; flush(6) @@ -1085,34 +1083,6 @@ subroutine IP_neighborhood2 end subroutine IP_neighborhood2 -!-------------------------------------------------------------------------------------------------- -!> @brief Calculates IP Coordinates. -! Marc however only provides nodal displacements, -! so in this case the ip coordinates are always calculated on the basis of this subroutine. -! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! FOR THE MOMENT THIS SUBROUTINE ACTUALLY CALCULATES THE CELL CENTER AND NOT THE IP COORDINATES, -! AS THE IP IS NOT (ALWAYS) LOCATED IN THE CENTER OF THE IP VOLUME. -! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!-------------------------------------------------------------------------------------------------- -subroutine mesh_build_ipCoordinates - - integer :: e,i,n - real(pReal), dimension(3) :: myCoords - - - do e = 1,theMesh%nElems - do i = 1,theMesh%elem%nIPs - myCoords = 0.0_pReal - do n = 1,theMesh%elem%nCellnodesPerCell - myCoords = myCoords + mesh_cellnode(1:3,mesh_cell2(n,i,e)) - enddo - mesh_ipCoordinates(1:3,i,e) = myCoords / real(theMesh%elem%nCellnodesPerCell,pReal) - enddo - enddo - -end subroutine mesh_build_ipCoordinates - - !-------------------------------------------------------------------------------------------------- !> @brief Gives the FE to CP ID mapping by binary search through lookup array !! valid questions (what) are 'elem', 'node'