From 4e213514bd40a8a1698d4693d0208877cd9708f2 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 16 Oct 2019 13:04:20 +0200 Subject: [PATCH] cleaning --- src/mesh_FEM.f90 | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/src/mesh_FEM.f90 b/src/mesh_FEM.f90 index 8c0b69ca3..4b4ff18aa 100644 --- a/src/mesh_FEM.f90 +++ b/src/mesh_FEM.f90 @@ -28,8 +28,7 @@ module mesh integer, public, protected :: & mesh_Nboundaries, & mesh_NcpElems, & !< total number of CP elements in mesh - mesh_NcpElemsGlobal, & - mesh_Nnodes !< total number of nodes in mesh + mesh_NcpElemsGlobal !!!! BEGIN DEPRECATED !!!!! integer, public, protected :: & @@ -69,8 +68,7 @@ module mesh public :: & mesh_init, & mesh_FEM_build_ipVolumes, & - mesh_FEM_build_ipCoordinates, & - mesh_cellCenterCoordinates + mesh_FEM_build_ipCoordinates contains @@ -107,7 +105,8 @@ subroutine mesh_init integer, parameter :: FILEUNIT = 222 integer :: j integer, allocatable, dimension(:) :: chunkPos - integer :: dimPlex + integer :: dimPlex, & + mesh_Nnodes !< total number of nodes in mesh integer, parameter :: & mesh_ElemType=1 !< Element type of the mesh (only support homogeneous meshes) character(len=512) :: & @@ -228,26 +227,8 @@ subroutine mesh_init end subroutine mesh_init -!-------------------------------------------------------------------------------------------------- -!> @brief Calculates cell center coordinates. -!-------------------------------------------------------------------------------------------------- -pure function mesh_cellCenterCoordinates(ip,el) - - integer, intent(in) :: el, & !< element number - ip !< integration point number - real(pReal), dimension(3) :: mesh_cellCenterCoordinates !< x,y,z coordinates of the cell center of the requested IP cell - -end function mesh_cellCenterCoordinates - - !-------------------------------------------------------------------------------------------------- !> @brief Calculates IP volume. Allocates global array 'mesh_ipVolume' -!> @details The IP volume is calculated differently depending on the cell type. -!> 2D cells assume an element depth of one in order to calculate the volume. -!> For the hexahedral cell we subdivide the cell into subvolumes of pyramidal -!> shape with a cell face as basis and the central ip at the tip. This subvolume is -!> calculated as an average of four tetrahedals with three corners on the cell face -!> and one corner at the central ip. !-------------------------------------------------------------------------------------------------- subroutine mesh_FEM_build_ipVolumes(dimPlex)