From 5814e07021a04d5161898588c4258b2d6f75a450 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 23 Sep 2018 16:55:03 +0200 Subject: [PATCH] simplified --- src/mesh.f90 | 4 ---- src/meshFEM.f90 | 20 +++++--------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/mesh.f90 b/src/mesh.f90 index b353f759e..753fe705c 100644 --- a/src/mesh.f90 +++ b/src/mesh.f90 @@ -3250,10 +3250,6 @@ subroutine mesh_tell_statistics write(6,*) mesh_Nelems, ' : total number of elements in mesh' write(6,*) mesh_NcpElems, ' : total number of CP elements in mesh' write(6,*) mesh_Nnodes, ' : total number of nodes in mesh' - write(6,*) mesh_maxNnodes, ' : max number of nodes in any CP element' - write(6,*) mesh_maxNips, ' : max number of IPs in any CP element' - write(6,*) mesh_maxNipNeighbors, ' : max number of IP neighbors in any CP element' - write(6,*) mesh_maxNsharedElems, ' : max number of CP elements sharing a node' write(6,'(/,a,/)') ' Input Parser: HOMOGENIZATION/MICROSTRUCTURE' write(6,*) mesh_maxValStateVar(1), ' : maximum homogenization index' write(6,*) mesh_maxValStateVar(2), ' : maximum microstructure index' diff --git a/src/meshFEM.f90 b/src/meshFEM.f90 index 22568c99d..6abfb83d4 100644 --- a/src/meshFEM.f90 +++ b/src/meshFEM.f90 @@ -59,27 +59,17 @@ use PETScis integer(pInt), dimension(:), allocatable, public, protected :: & mesh_boundaries - - integer(pInt), parameter, public :: & - FE_Nelemtypes = 1_pInt, & - FE_Ngeomtypes = 1_pInt, & - FE_Ncelltypes = 1_pInt, & - FE_maxNnodes = 1_pInt, & - FE_maxNips = 14_pInt - integer(pInt), dimension(FE_Nelemtypes), parameter, public :: FE_geomtype = & !< geometry type of particular element type + integer(pInt), dimension(1_pInt), parameter, public :: FE_geomtype = & !< geometry type of particular element type int([1],pInt) - integer(pInt), dimension(FE_Ngeomtypes), parameter, public :: FE_celltype = & !< cell type that is used by each geometry type + integer(pInt), dimension(1_pInt), parameter, public :: FE_celltype = & !< cell type that is used by each geometry type int([1],pInt) - integer(pInt), dimension(FE_Nelemtypes), parameter, public :: FE_Nnodes = & !< number of nodes that constitute a specific type of element - int([0],pInt) - - integer(pInt), dimension(FE_Ngeomtypes), public :: FE_Nips = & !< number of IPs in a specific type of element + integer(pInt), dimension(1_pInt), public :: FE_Nips = & !< number of IPs in a specific type of element int([0],pInt) - integer(pInt), dimension(FE_Ncelltypes), parameter, public :: FE_NipNeighbors = & !< number of ip neighbors / cell faces in a specific cell type + integer(pInt), dimension(1_pInt), parameter, public :: FE_NipNeighbors = & !< number of ip neighbors / cell faces in a specific cell type int([6],pInt) @@ -222,7 +212,7 @@ subroutine mesh_init(ip,el) call mesh_FEM_build_ipCoordinates(dimPlex,FEM_Zoo_QuadraturePoints(dimPlex,integrationOrder)%p) call mesh_FEM_build_ipVolumes(dimPlex) - allocate (mesh_element (4_pInt+FE_nodes(1_pInt),mesh_NcpElems)); mesh_element = 0_pInt + allocate (mesh_element (4_pInt,mesh_NcpElems)); mesh_element = 0_pInt do j = 1, mesh_NcpElems mesh_element( 1,j) = j mesh_element( 2,j) = mesh_elemType ! elem type