diff --git a/src/CPFEM2.f90 b/src/CPFEM2.f90 index 5aff1a099..357bcce9f 100644 --- a/src/CPFEM2.f90 +++ b/src/CPFEM2.f90 @@ -23,7 +23,7 @@ module CPFEM2 use crystallite #if defined(FEM) use FEM_quadrature - use mesh + use discretization_mesh #elif defined(Grid) use discretization_grid #endif @@ -54,7 +54,7 @@ subroutine CPFEM_initAll call HDF5_utilities_init call results_init #if defined(FEM) - call mesh_init + call discretization_mesh_init #elif defined(Grid) call discretization_grid_init #endif diff --git a/src/mesh/DAMASK_mesh.f90 b/src/mesh/DAMASK_mesh.f90 index 7785750af..3c9613d73 100644 --- a/src/mesh/DAMASK_mesh.f90 +++ b/src/mesh/DAMASK_mesh.f90 @@ -16,7 +16,7 @@ program DAMASK_FEM use CPFEM2 use FEsolving use numerics - use mesh + use discretization_mesh use FEM_Utilities use mesh_mech_FEM diff --git a/src/mesh/FEM_utilities.f90 b/src/mesh/FEM_utilities.f90 index 54d0097ee..512d741bf 100644 --- a/src/mesh/FEM_utilities.f90 +++ b/src/mesh/FEM_utilities.f90 @@ -17,7 +17,7 @@ module FEM_utilities use numerics use debug use math - use mesh + use discretization_mesh implicit none private diff --git a/src/mesh/discretization_mesh.f90 b/src/mesh/discretization_mesh.f90 index 7c0b4bbaf..072f3b4ec 100644 --- a/src/mesh/discretization_mesh.f90 +++ b/src/mesh/discretization_mesh.f90 @@ -4,7 +4,7 @@ !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH !> @author Franz Roters, Max-Planck-Institut für Eisenforschung GmbH !-------------------------------------------------------------------------------------------------- -module mesh +module discretization_mesh #include #include #include @@ -52,7 +52,7 @@ module mesh mesh_boundaries public :: & - mesh_init, & + discretization_mesh_init, & mesh_FEM_build_ipVolumes, & mesh_FEM_build_ipCoordinates @@ -63,7 +63,7 @@ contains !> @brief initializes the mesh by calling all necessary private routines the mesh module !! Order and routines strongly depend on type of solver !-------------------------------------------------------------------------------------------------- -subroutine mesh_init +subroutine discretization_mesh_init integer, dimension(1), parameter:: FE_geomtype = [1] !< geometry type of particular element type integer, dimension(1) :: FE_Nips !< number of IPs in a specific type of element @@ -182,7 +182,7 @@ subroutine mesh_init reshape(mesh_ipCoordinates,[3,mesh_maxNips*mesh_NcpElems]), & mesh_node0) -end subroutine mesh_init +end subroutine discretization_mesh_init !-------------------------------------------------------------------------------------------------- @@ -248,4 +248,4 @@ subroutine mesh_FEM_build_ipCoordinates(dimPlex,qPoints) end subroutine mesh_FEM_build_ipCoordinates -end module mesh +end module discretization_mesh diff --git a/src/mesh/mesh_mech_FEM.f90 b/src/mesh/mesh_mech_FEM.f90 index fb90f20e5..8206f4174 100644 --- a/src/mesh/mesh_mech_FEM.f90 +++ b/src/mesh/mesh_mech_FEM.f90 @@ -16,7 +16,7 @@ module mesh_mech_FEM use prec use FEM_utilities - use mesh + use discretization_mesh use IO use DAMASK_interface use numerics