small polishing

Author: MarDiehl

PRIVATE

@@ -139,7 +139,7 @@ program DAMASK_mesh
         if (boundary == 0) &                                                                        ! label not defined in mesh file
           call IO_error(812_pI16, 'label', trim(bc_label_name), 'not defined', emph = [2])
         if (read_BC_entries(boundary)) &                                                            ! duplicated label/tag
-          call IO_error(812_pI16, 'duplicated entries: label', trim(bc_label_name), "and tag", &
+          call IO_error(812_pI16, 'duplicated entries: label', trim(bc_label_name), 'and tag', &
                         mesh_boundariesIS(boundary), emph = [2,4])
         read_BC_entries(boundary) = .true.
         loadCases(l)%mechBC(boundary)%use_label = .true.
@@ -154,8 +154,7 @@ program DAMASK_mesh
         read_BC_entries(boundary) = .true.
         loadCases(l)%mechBC(boundary)%use_label = .false.
       else
-        call IO_error(837_pI16, 'entry'//IO_intAsStr(m)//': at least one of   &
-                      & "tag/label"   required')
+        call IO_error(812_pI16, 'neither "label" nor "tag" given for boundary condition', m, emph=[2])
       end if
       mech_u => mech_BC%get_list('dot_u')
       do component = 1, dimPlex
@@ -186,11 +185,9 @@ program DAMASK_mesh
   skip_T2 = skip_T1+1+floor(log10(real(maxval(mesh_boundariesIS))))+1+1+1                           ! T1+"("+NumDigits(floor()+1)+")"+blank
   checkLoadcases: do l = 1, size(load_steps)
     if (loadCases(l)%N < 1) &
-      call IO_error(813_pI16, 'loadcase', IO_intAsStr(l)//':', 'N', &
-                    'must be positive', emph = [3])
+      call IO_error(813_pI16, 'loadcase', l, 'has non-positive number of steps ("N")', emph = [2])
     if (loadCases(l)%f_out < 1) &
-      call IO_error(813_pI16, 'loadcase', IO_intAsStr(l)//':', 'f_out', &
-                    'must be positive', emph = [3])
+      call IO_error(813_pI16, 'loadcase', l, 'has non-positive output frequency ("f_out")', emph = [2])
 
     print'(/,1x,a,1x,i0)', 'load case:', l
     if (.not. loadCases(l)%estimate_rate) print'(2x,a)', 'drop guessing along trajectory'
@@ -208,7 +205,7 @@ program DAMASK_mesh
         if (loadCases(l)%mechBC(boundary)%active(component)) &
           print'(4x,a,T'//IO_intAsStr(skip_T1)//',a,i0,a,'// &
                 'T'//IO_intAsStr(skip_T2)//',a,1x,i1,1x,a,1x,f12.7)', &
-            trim(bc_label_name), "(", mesh_boundariesIS(boundary), ")", &
+            trim(bc_label_name), '(', mesh_boundariesIS(boundary), ')', &
             'Component', component, &
             'Value', loadCases(l)%mechBC(boundary)%dot_u(component)
       end do

src/mesh/DAMASK_mesh.f90

@@ -81,8 +81,8 @@ subroutine FEM_utilities_init(num_mesh)
   character(len=:), allocatable :: &
     PETSc_options
   integer :: &
-    p_s, &                                                                                          ! order of shape functions
-    p_i                                                                                             ! integration order (quadrature rule)
+    p_s, &                                                                                          !< order of shape functions
+    p_i                                                                                             !< integration order (quadrature rule)
   PetscErrorCode :: err_PETSc
 
 

src/mesh/FEM_utilities.f90

@@ -2,7 +2,7 @@
 !> @author Pratheek Shanthraj, Max-Planck-Institut für Eisenforschung GmbH
 !> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH
 !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH
-!> @author Franz Roters, Max-Planck-Institut für Eisenforschung GmbH
+!> @author Javier Velo, KU Leuven
 !--------------------------------------------------------------------------------------------------
 module discretization_mesh
 #include <petsc/finclude/petscdmplex.h>
@@ -71,14 +71,13 @@ module discretization_mesh
     PETSC_BC_TYPE_CELL   = 1, &
     PETSC_BC_TYPE_FACE   = 2, &
     PETSC_BC_TYPE_EDGE   = 3, &
-    PETSC_BC_TYPE_VERTEX = 4, &
-    N_PETSC_BC_TYPES     = 4
+    PETSC_BC_TYPE_VERTEX = 4
 
-  integer, dimension(N_PETSC_BC_TYPES), parameter, public :: &
+  integer, dimension(*), parameter, public :: &
     PETSC_BC_TYPES = [PETSC_BC_TYPE_CELL, PETSC_BC_TYPE_FACE, &
                       PETSC_BC_TYPE_EDGE, PETSC_BC_TYPE_VERTEX]
 
-  character(len=*), dimension(N_PETSC_BC_TYPES), parameter, public :: &
+  character(len=*), dimension(size(PETSC_BC_TYPES)), parameter, public :: &
     PETSC_GENERIC_LABELS = ['Cell Sets  ', 'Face Sets  ', 'Edge Sets  ', 'Vertex Sets']             ! PETSc generic labels
 
   DM, public :: geomMesh
@@ -152,8 +151,7 @@ subroutine discretization_mesh_init()
 
   character(pSTRLEN) :: &
     bc_label                                                                                        ! label (string, defined in mesh file)
-  character(len=*), dimension(4), parameter :: &
-    PETSC_GENERIC_LABELS = ['Cell Sets  ', 'Face Sets  ', 'Edge Sets  ', 'Vertex Sets']             ! PETSc generic labels
+
 
   print'(/,1x,a)',   '<<<+-  discretization_mesh init  -+>>>'
 
@@ -188,7 +186,7 @@ subroutine discretization_mesh_init()
   if (.not. isSimplex) p_i = p_i + 1_pPETSCINT                                                      ! adjust for quad/hex (non-simplex)
 #endif
 
-#if (PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR>=24)
+#if (PETSC_VERSION_MINOR>=24)
 ! check invalid mesh (mixed or unsupported elements)
   call DMGetLabelIdIS(globalMesh, 'celltype', celltype_IS, err_PETSc)
   call ISGetSize(celltype_IS, nPolytopes, err_PETSc)
@@ -432,7 +430,7 @@ function build_coordinates_IP(dimPlex,qPoints) result(x_p)
   real(pREAL), dimension(:,:,:), allocatable :: x_p
 
 
-#if (PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR>=24)
+#if (PETSC_VERSION_MINOR>=24)
   PetscReal, pointer, dimension(:) :: pV0, pCellJ, pInvcellJ, pDetJ
 #else
   PetscReal, pointer, dimension(:) :: pV0, pCellJ, pInvcellJ