matching names

This commit is contained in:
Martin Diehl 2020-03-20 15:08:07 +01:00
parent 03bec0221a
commit 48c9d31720
5 changed files with 10 additions and 10 deletions

View File

@ -23,7 +23,7 @@ module CPFEM2
use crystallite use crystallite
#if defined(FEM) #if defined(FEM)
use FEM_quadrature use FEM_quadrature
use mesh use discretization_mesh
#elif defined(Grid) #elif defined(Grid)
use discretization_grid use discretization_grid
#endif #endif
@ -54,7 +54,7 @@ subroutine CPFEM_initAll
call HDF5_utilities_init call HDF5_utilities_init
call results_init call results_init
#if defined(FEM) #if defined(FEM)
call mesh_init call discretization_mesh_init
#elif defined(Grid) #elif defined(Grid)
call discretization_grid_init call discretization_grid_init
#endif #endif

View File

@ -16,7 +16,7 @@ program DAMASK_FEM
use CPFEM2 use CPFEM2
use FEsolving use FEsolving
use numerics use numerics
use mesh use discretization_mesh
use FEM_Utilities use FEM_Utilities
use mesh_mech_FEM use mesh_mech_FEM

View File

@ -17,7 +17,7 @@ module FEM_utilities
use numerics use numerics
use debug use debug
use math use math
use mesh use discretization_mesh
implicit none implicit none
private private

View File

@ -4,7 +4,7 @@
!> @author Philip Eisenlohr, 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 Franz Roters, Max-Planck-Institut für Eisenforschung GmbH
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
module mesh module discretization_mesh
#include <petsc/finclude/petscdmplex.h> #include <petsc/finclude/petscdmplex.h>
#include <petsc/finclude/petscis.h> #include <petsc/finclude/petscis.h>
#include <petsc/finclude/petscdmda.h> #include <petsc/finclude/petscdmda.h>
@ -52,7 +52,7 @@ module mesh
mesh_boundaries mesh_boundaries
public :: & public :: &
mesh_init, & discretization_mesh_init, &
mesh_FEM_build_ipVolumes, & mesh_FEM_build_ipVolumes, &
mesh_FEM_build_ipCoordinates mesh_FEM_build_ipCoordinates
@ -63,7 +63,7 @@ contains
!> @brief initializes the mesh by calling all necessary private routines the mesh module !> @brief initializes the mesh by calling all necessary private routines the mesh module
!! Order and routines strongly depend on type of solver !! 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), parameter:: FE_geomtype = [1] !< geometry type of particular element type
integer, dimension(1) :: FE_Nips !< number of IPs in a specific type of element 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]), & reshape(mesh_ipCoordinates,[3,mesh_maxNips*mesh_NcpElems]), &
mesh_node0) 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 subroutine mesh_FEM_build_ipCoordinates
end module mesh end module discretization_mesh

View File

@ -16,7 +16,7 @@ module mesh_mech_FEM
use prec use prec
use FEM_utilities use FEM_utilities
use mesh use discretization_mesh
use IO use IO
use DAMASK_interface use DAMASK_interface
use numerics use numerics