From 59da88460eac8498f53b5822a9bb4072d9f26f8e Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 27 Feb 2013 20:41:14 +0000 Subject: [PATCH] preparation for introduction of plain mode and restructuring of calc modes for CPFEM_general --- code/IO.f90 | 7 +++++++ code/mesh.f90 | 7 +++---- code/numerics.f90 | 1 - 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/code/IO.f90 b/code/IO.f90 index 79c5eb92f..f44c4cc6c 100644 --- a/code/IO.f90 +++ b/code/IO.f90 @@ -1511,6 +1511,13 @@ subroutine IO_error(error_ID,e,i,g,ext_msg) ! homogenization errors case (500_pInt) msg = 'unknown homogenization specified' + +!-------------------------------------------------------------------------------------------------- +! user errors + case (600_pInt) + msg = 'Non-local plasticity and non-CP elements in model' + case (601_pInt) + msg = 'OpenMP threads > 1 and using non-CP elements' !------------------------------------------------------------------------------------------------- ! DAMASK_marc errors diff --git a/code/mesh.f90 b/code/mesh.f90 index c0398acab..22fbabfde 100644 --- a/code/mesh.f90 +++ b/code/mesh.f90 @@ -44,7 +44,8 @@ module mesh mesh_maxNips, & !< max number of IPs in any CP element mesh_maxNipNeighbors, & !< max number of IP neighbors in any CP element mesh_maxNsharedElems, & !< max number of CP elements sharing a node - mesh_maxNsubNodes + mesh_maxNsubNodes, & + mesh_Nelems !< total number of elements in mesh integer(pInt), dimension(:,:), allocatable, public, protected :: & mesh_element, & !< FEid, type(internal representation), material, texture, node indices @@ -71,9 +72,7 @@ module mesh mesh_ipAreaNormal !< area normal of interface to neighboring IP (initially!) logical, dimension(3), public, protected :: mesh_periodicSurface !< flag indicating periodic outer surfaces (used for fluxes) - - integer(pInt), private :: & - mesh_Nelems !< total number of elements in mesh + #ifdef Marc integer(pInt), private :: & hypoelasticTableStyle, & !< Table style (Marc only) diff --git a/code/numerics.f90 b/code/numerics.f90 index a26fcfff6..3a3aba694 100644 --- a/code/numerics.f90 +++ b/code/numerics.f90 @@ -83,7 +83,6 @@ module numerics integer(pInt), protected, public :: & DAMASK_NumThreadsInt = 0_pInt !< value stored in environment variable DAMASK_NUM_THREADS, set to zero if no OpenMP directive - !* spectral parameters: #ifdef Spectral real(pReal), protected, public :: &