From 7aa47d8f5ab192b6d04c90f5eb8f868b44932d53 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 20 Mar 2020 06:58:55 +0100 Subject: [PATCH] module name follows filename --- src/CPFEM.f90 | 4 ++-- src/CPFEM2.f90 | 12 ++++++++---- src/DAMASK_marc.f90 | 4 ++-- src/grid/discretization_grid.f90 | 12 ++++++------ src/grid/grid_damage_spectral.f90 | 2 +- src/grid/grid_mech_FEM.f90 | 2 +- src/grid/grid_mech_spectral_basic.f90 | 2 +- src/grid/grid_mech_spectral_polarisation.f90 | 2 +- src/grid/grid_thermal_spectral.f90 | 2 +- src/grid/spectral_utilities.f90 | 2 +- src/marc/discretization_marc.f90 | 10 +++++----- 11 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/CPFEM.f90 b/src/CPFEM.f90 index 42d0661be..9059c2a4b 100644 --- a/src/CPFEM.f90 +++ b/src/CPFEM.f90 @@ -10,7 +10,7 @@ module CPFEM use FEsolving use math use rotations - use mesh + use discretization_marc use material use config use crystallite @@ -85,7 +85,7 @@ subroutine CPFEM_initAll(el,ip) call rotations_init call HDF5_utilities_init call results_init - call mesh_init(ip, el) + call discretization_march_init(ip, el) call lattice_init call material_init call constitutive_init diff --git a/src/CPFEM2.f90 b/src/CPFEM2.f90 index 882fe8ae3..19110592d 100644 --- a/src/CPFEM2.f90 +++ b/src/CPFEM2.f90 @@ -21,11 +21,11 @@ module CPFEM2 use homogenization use constitutive use crystallite -#ifdef FEM +#if defined(FEM) use FEM_Zoo use mesh -#else - use mesh_grid +#elif defined(Grid) + use discretization_grid #endif implicit none @@ -53,7 +53,11 @@ subroutine CPFEM_initAll call lattice_init call HDF5_utilities_init call results_init +#if defined(FEM) call mesh_init +#elif defined(Grid) + call discretization_grid_init +#endif call material_init call constitutive_init call crystallite_init @@ -68,7 +72,7 @@ end subroutine CPFEM_initAll !-------------------------------------------------------------------------------------------------- subroutine CPFEM_init - write(6,'(/,a)') ' <<<+- CPFEM init -+>>>'; flush(6) + write(6,'(/,a)') ' <<<+- CPFEM init -+>>>'; flush(6) if (interface_restartInc > 0) call crystallite_restartRead diff --git a/src/DAMASK_marc.f90 b/src/DAMASK_marc.f90 index 437615f93..fe01301c9 100644 --- a/src/DAMASK_marc.f90 +++ b/src/DAMASK_marc.f90 @@ -178,7 +178,7 @@ subroutine hypela2(d,g,e,de,s,t,dt,ngens,m,nn,kcus,matus,ndi,nshear,disp, & use numerics use FEsolving use debug - use mesh + use discretization_marc use CPFEM implicit none @@ -378,7 +378,7 @@ end subroutine hypela2 subroutine flux(f,ts,n,time) use prec use thermal_conduction - use mesh + use discretization_marc implicit none real(pReal), dimension(6), intent(in) :: & diff --git a/src/grid/discretization_grid.f90 b/src/grid/discretization_grid.f90 index 0366f2213..8413fc5e8 100644 --- a/src/grid/discretization_grid.f90 +++ b/src/grid/discretization_grid.f90 @@ -4,7 +4,7 @@ !> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH !> @brief Parse geometry file to set up discretization and geometry for nonlocal model !-------------------------------------------------------------------------------------------------- -module mesh_grid +module discretization_grid #include use PETScsys @@ -34,7 +34,7 @@ module mesh_grid size3offset !< (local) size offset in 3rd direction public :: & - mesh_init + discretization_grid_init contains @@ -42,7 +42,7 @@ contains !-------------------------------------------------------------------------------------------------- !> @brief reads the geometry file to obtain information on discretization !-------------------------------------------------------------------------------------------------- -subroutine mesh_init +subroutine discretization_grid_init include 'fftw3-mpi.f03' real(pReal), dimension(3) :: & @@ -59,7 +59,7 @@ subroutine mesh_init integer(C_INTPTR_T) :: & devNull, z, z_offset - write(6,'(/,a)') ' <<<+- mesh_grid init -+>>>'; flush(6) + write(6,'(/,a)') ' <<<+- discretization_grid init -+>>>'; flush(6) call readGeom(grid,geomSize,origin,microstructureAt,homogenizationAt) @@ -120,7 +120,7 @@ subroutine mesh_init if (debug_e < 1 .or. debug_e > product(myGrid)) call IO_error(602,ext_msg='element') ! selected element does not exist if (debug_i /= 1) call IO_error(602,ext_msg='IP') ! selected IP does not exist -end subroutine mesh_init +end subroutine discretization_grid_init !-------------------------------------------------------------------------------------------------- @@ -434,4 +434,4 @@ pure function IPneighborhood(grid) end function IPneighborhood -end module mesh_grid +end module discretization_grid diff --git a/src/grid/grid_damage_spectral.f90 b/src/grid/grid_damage_spectral.f90 index 8460ea8be..eda60d070 100644 --- a/src/grid/grid_damage_spectral.f90 +++ b/src/grid/grid_damage_spectral.f90 @@ -12,7 +12,7 @@ module grid_damage_spectral use prec use spectral_utilities - use mesh_grid + use discretization_grid use damage_nonlocal use numerics diff --git a/src/grid/grid_mech_FEM.f90 b/src/grid/grid_mech_FEM.f90 index 57a27ebe8..9cdf2f5b5 100644 --- a/src/grid/grid_mech_FEM.f90 +++ b/src/grid/grid_mech_FEM.f90 @@ -19,7 +19,7 @@ module grid_mech_FEM use numerics use homogenization use discretization - use mesh_grid + use discretization_grid use debug implicit none diff --git a/src/grid/grid_mech_spectral_basic.f90 b/src/grid/grid_mech_spectral_basic.f90 index 25ac9cb63..e04dd49f3 100644 --- a/src/grid/grid_mech_spectral_basic.f90 +++ b/src/grid/grid_mech_spectral_basic.f90 @@ -19,7 +19,7 @@ module grid_mech_spectral_basic use config use numerics use homogenization - use mesh_grid + use discretization_grid use debug implicit none diff --git a/src/grid/grid_mech_spectral_polarisation.f90 b/src/grid/grid_mech_spectral_polarisation.f90 index ab880e2a6..80ed2e485 100644 --- a/src/grid/grid_mech_spectral_polarisation.f90 +++ b/src/grid/grid_mech_spectral_polarisation.f90 @@ -20,7 +20,7 @@ module grid_mech_spectral_polarisation use config use numerics use homogenization - use mesh_grid + use discretization_grid use debug implicit none diff --git a/src/grid/grid_thermal_spectral.f90 b/src/grid/grid_thermal_spectral.f90 index 1fe6aeab0..1c8314369 100644 --- a/src/grid/grid_thermal_spectral.f90 +++ b/src/grid/grid_thermal_spectral.f90 @@ -12,7 +12,7 @@ module grid_thermal_spectral use prec use spectral_utilities - use mesh_grid + use discretization_grid use thermal_conduction use numerics use material diff --git a/src/grid/spectral_utilities.f90 b/src/grid/spectral_utilities.f90 index 1d31b23c3..55375ee32 100644 --- a/src/grid/spectral_utilities.f90 +++ b/src/grid/spectral_utilities.f90 @@ -13,7 +13,7 @@ module spectral_utilities use math use rotations use IO - use mesh_grid + use discretization_grid use numerics use debug use config diff --git a/src/marc/discretization_marc.f90 b/src/marc/discretization_marc.f90 index 42185e9d6..0221ad693 100644 --- a/src/marc/discretization_marc.f90 +++ b/src/marc/discretization_marc.f90 @@ -5,7 +5,7 @@ !> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH !> @brief Sets up the mesh for the solver MSC.Marc !-------------------------------------------------------------------------------------------------- -module mesh +module discretization_marc use IO use prec use math @@ -37,7 +37,7 @@ module mesh mesh_FEM2DAMASK_node !< DAMASK node ID for Marc node ID public :: & - mesh_init + discretization_marc_init contains @@ -45,7 +45,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(ip,el) +subroutine discretization_marc_init(ip,el) integer, intent(in) :: el, ip @@ -114,7 +114,7 @@ subroutine mesh_init(ip,el) call geometry_plastic_nonlocal_setIPareaNormal(unscaledNormals/spread(norm2(unscaledNormals,1),1,3)) call geometry_plastic_nonlocal_results -end subroutine mesh_init +end subroutine discretization_marc_init !-------------------------------------------------------------------------------------------------- @@ -1118,4 +1118,4 @@ logical function containsRange(str,chunkPos) end function containsRange -end module mesh +end module discretization_marc