From 4d9949547c43a917688c47cb621e4b968a9b7507 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 10 Apr 2021 20:52:46 +0200 Subject: [PATCH] more systematic name --- src/CPFEM.f90 | 2 +- src/DAMASK_Marc.f90 | 12 ++++++------ src/Marc/discretization_Marc.f90 | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/CPFEM.f90 b/src/CPFEM.f90 index 4961b99d4..60dc78d2e 100644 --- a/src/CPFEM.f90 +++ b/src/CPFEM.f90 @@ -156,7 +156,7 @@ subroutine CPFEM_general(mode, ffn, ffn1, temperature_inp, dt, elFE, ip, cauchyS ODD_JACOBIAN = 1e50_pReal !< return value for jacobian if terminallyIll - elCP = mesh_FEM2DAMASK_elem(elFE) + elCP = discretization_Marc_FEM2DAMASK_elem(elFE) ma = (elCP-1) * discretization_nIPs + ip diff --git a/src/DAMASK_Marc.f90 b/src/DAMASK_Marc.f90 index e417be2fa..a1ce8fa0d 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, & computationMode = CPFEM_RESTOREJACOBIAN elseif (lovl == 6) then ! stress requested by marc computationMode = CPFEM_CALCRESULTS - cp_en = mesh_FEM2DAMASK_elem(m(1)) + cp_en = discretization_Marc_FEM2DAMASK_elem(m(1)) if (cptim > theTime .or. inc /= theInc) then ! reached "convergence" terminallyIll = .false. cycleCounter = -1 ! first calc step increments this to cycle = 0 @@ -370,11 +370,11 @@ subroutine uedinc(inc,incsub) if (inc > inc_written) then - allocate(d_n(3,count(mesh_FEM2DAMASK_node /= -1))) - do n = lbound(mesh_FEM2DAMASK_node,1), ubound(mesh_FEM2DAMASK_node,1) - if (mesh_FEM2DAMASK_node(n) /= -1) then - call nodvar(1,n,d_n(1:3,mesh_FEM2DAMASK_node(n)),nqncomp,nqdatatype) - if(nqncomp == 2) d_n(3,mesh_FEM2DAMASK_node(n)) = 0.0_pReal + allocate(d_n(3,count(discretization_Marc_FEM2DAMASK_node /= -1))) + do n = lbound(discretization_Marc_FEM2DAMASK_node,1), ubound(discretization_Marc_FEM2DAMASK_node,1) + if (discretization_Marc_FEM2DAMASK_node(n) /= -1) then + call nodvar(1,n,d_n(1:3,discretization_Marc_FEM2DAMASK_node(n)),nqncomp,nqdatatype) + if(nqncomp == 2) d_n(3,discretization_Marc_FEM2DAMASK_node(n)) = 0.0_pReal endif enddo diff --git a/src/Marc/discretization_Marc.f90 b/src/Marc/discretization_Marc.f90 index d92623215..677cf1b52 100644 --- a/src/Marc/discretization_Marc.f90 +++ b/src/Marc/discretization_Marc.f90 @@ -24,8 +24,8 @@ module discretization_marc mesh_unitlength !< physical length of one unit in mesh MD: needs systematic_name integer, dimension(:), allocatable, public, protected :: & - mesh_FEM2DAMASK_elem, & !< DAMASK element ID for Marc element ID MD: Needs systematic name - mesh_FEM2DAMASK_node !< DAMASK node ID for Marc node ID MD: needs systematic_name + discretization_Marc_FEM2DAMASK_elem, & !< DAMASK element ID for Marc element ID + discretization_Marc_FEM2DAMASK_node !< DAMASK node ID for Marc node ID type tCellNodeDefinition @@ -127,7 +127,7 @@ subroutine discretization_marc_UpdateNodeAndIpCoords(d_n) real(pReal), dimension(:,:), allocatable :: node_cell - node_cell = buildCellNodes(discretization_NodeCoords0(1:3,1:maxval(mesh_FEM2DAMASK_node)) + d_n) + node_cell = buildCellNodes(discretization_NodeCoords0(1:3,1:maxval(discretization_Marc_FEM2DAMASK_node)) + d_n) call discretization_setNodeCoords(node_cell) call discretization_setIPcoords(buildIPcoordinates(node_cell)) @@ -219,10 +219,10 @@ subroutine inputRead(elem,node0_elem,connectivity_elem,materialAt) call inputRead_elemType(elem, & nElems,inputFile) - call inputRead_mapElems(mesh_FEM2DAMASK_elem,& + call inputRead_mapElems(discretization_Marc_FEM2DAMASK_elem,& nElems,elem%nNodes,inputFile) - call inputRead_mapNodes(mesh_FEM2DAMASK_node,& + call inputRead_mapNodes(discretization_Marc_FEM2DAMASK_node,& nNodes,inputFile) call inputRead_elemNodes(node0_elem, & @@ -532,7 +532,7 @@ subroutine inputRead_elemNodes(nodes, & if(IO_lc(IO_stringValue(fileContent(l),chunkPos,1)) == 'coordinates') then chunkPos = [4,1,10,11,30,31,50,51,70] do i=1,nNode - m = mesh_FEM2DAMASK_node(IO_intValue(fileContent(l+1+i),chunkPos,1)) + m = discretization_Marc_FEM2DAMASK_node(IO_intValue(fileContent(l+1+i),chunkPos,1)) do j = 1,3 nodes(j,m) = mesh_unitlength * IO_floatValue(fileContent(l+1+i),chunkPos,j+1) enddo @@ -653,11 +653,11 @@ function inputRead_connectivityElem(nElem,nNodes,fileContent) j = 0 do i = 1,nElem chunkPos = IO_stringPos(fileContent(l+1+i+j)) - e = mesh_FEM2DAMASK_elem(IO_intValue(fileContent(l+1+i+j),chunkPos,1)) + e = discretization_Marc_FEM2DAMASK_elem(IO_intValue(fileContent(l+1+i+j),chunkPos,1)) if (e /= 0) then ! disregard non CP elems do k = 1,chunkPos(1)-2 inputRead_connectivityElem(k,e) = & - mesh_FEM2DAMASK_node(IO_IntValue(fileContent(l+1+i+j),chunkPos,k+2)) + discretization_Marc_FEM2DAMASK_node(IO_IntValue(fileContent(l+1+i+j),chunkPos,k+2)) enddo nNodesAlreadyRead = chunkPos(1) - 2 do while(nNodesAlreadyRead < nNodes) ! read on if not all nodes in one line @@ -665,7 +665,7 @@ function inputRead_connectivityElem(nElem,nNodes,fileContent) chunkPos = IO_stringPos(fileContent(l+1+i+j)) do k = 1,chunkPos(1) inputRead_connectivityElem(nNodesAlreadyRead+k,e) = & - mesh_FEM2DAMASK_node(IO_IntValue(fileContent(l+1+i+j),chunkPos,k)) + discretization_Marc_FEM2DAMASK_node(IO_IntValue(fileContent(l+1+i+j),chunkPos,k)) enddo nNodesAlreadyRead = nNodesAlreadyRead + chunkPos(1) enddo @@ -718,7 +718,7 @@ subroutine inputRead_material(materialAt,& if (initialcondTableStyle == 2) m = m + 2 contInts = continuousIntValues(fileContent(l+k+m+1:),nElem,nameElemSet,mapElemSet,size(nameElemSet)) ! get affected elements do i = 1,contInts(1) - e = mesh_FEM2DAMASK_elem(contInts(1+i)) + e = discretization_Marc_FEM2DAMASK_elem(contInts(1+i)) materialAt(e) = myVal enddo if (initialcondTableStyle == 0) m = m + 1