From 91b71fdff8aa38b4669d0b5f03fb2ab18915ecdc Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 24 Apr 2022 04:43:44 +0200 Subject: [PATCH] systematic naming scheme --- src/CLI.f90 | 6 +++--- src/CPFEM2.f90 | 2 +- src/config.f90 | 14 ++++++-------- src/grid/DAMASK_grid.f90 | 2 +- src/grid/discretization_grid.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/mesh/DAMASK_mesh.f90 | 4 ++-- src/mesh/discretization_mesh.f90 | 6 +++--- src/mesh/mesh_mech_FEM.f90 | 2 +- src/results.f90 | 4 +++- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/CLI.f90 b/src/CLI.f90 index 15b83ab80..ff3d7349f 100644 --- a/src/CLI.f90 +++ b/src/CLI.f90 @@ -9,7 +9,7 @@ #define PETSC_MINOR_MIN 12 #define PETSC_MINOR_MAX 17 -module DAMASK_interface +module CLI use, intrinsic :: ISO_fortran_env use PETScSys @@ -60,7 +60,7 @@ subroutine CLI_init quit - print'(/,1x,a)', '<<<+- DAMASK_interface init -+>>>' + print'(/,1x,a)', '<<<+- CLI init -+>>>' ! http://patorjk.com/software/taag/#p=display&f=Lean&t=DAMASK%203 #ifdef DEBUG @@ -358,4 +358,4 @@ function makeRelativePath(a,b) end function makeRelativePath -end module DAMASK_interface +end module CLI diff --git a/src/CPFEM2.f90 b/src/CPFEM2.f90 index 7bf91c3a8..186441f3a 100644 --- a/src/CPFEM2.f90 +++ b/src/CPFEM2.f90 @@ -6,7 +6,7 @@ module CPFEM2 use parallelization use signals - use DAMASK_interface + use CLI use prec use IO use YAML_types diff --git a/src/config.f90 b/src/config.f90 index aaf6fee1a..767e3e6c9 100644 --- a/src/config.f90 +++ b/src/config.f90 @@ -1,8 +1,6 @@ !-------------------------------------------------------------------------------------------------- !> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH -!> @brief Reads in the material, numerics & debug configuration from their respective file -!> @details Reads the material configuration file, where solverJobName.yaml takes -!! precedence over material.yaml. +!> @brief Read in the material, numerics & debug configuration from their respective file !-------------------------------------------------------------------------------------------------- module config use IO @@ -28,19 +26,19 @@ contains !-------------------------------------------------------------------------------------------------- !> @brief Real *.yaml configuration files. !-------------------------------------------------------------------------------------------------- -subroutine config_init +subroutine config_init() print'(/,1x,a)', '<<<+- config init -+>>>'; flush(IO_STDOUT) - call parse_material - call parse_numerics - call parse_debug + call parse_material() + call parse_numerics() + call parse_debug() end subroutine config_init !-------------------------------------------------------------------------------------------------- -!> @brief Read material.yaml or .yaml. +!> @brief Read material.yaml. !-------------------------------------------------------------------------------------------------- subroutine parse_material() diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90 index f28bd324f..a290ac194 100644 --- a/src/grid/DAMASK_grid.f90 +++ b/src/grid/DAMASK_grid.f90 @@ -16,7 +16,7 @@ program DAMASK_grid use prec use parallelization use signals - use DAMASK_interface + use CLI use IO use config use math diff --git a/src/grid/discretization_grid.f90 b/src/grid/discretization_grid.f90 index ec119e11a..ddb36a246 100644 --- a/src/grid/discretization_grid.f90 +++ b/src/grid/discretization_grid.f90 @@ -15,7 +15,7 @@ module discretization_grid use parallelization use system_routines use VTI - use DAMASK_interface + use CLI use IO use config use results diff --git a/src/grid/grid_mech_FEM.f90 b/src/grid/grid_mech_FEM.f90 index cef83e4a3..53d788987 100644 --- a/src/grid/grid_mech_FEM.f90 +++ b/src/grid/grid_mech_FEM.f90 @@ -15,7 +15,7 @@ module grid_mechanical_FEM use prec use parallelization - use DAMASK_interface + use CLI use IO use HDF5 use HDF5_utilities diff --git a/src/grid/grid_mech_spectral_basic.f90 b/src/grid/grid_mech_spectral_basic.f90 index 61d17f6bd..c0b85d00e 100644 --- a/src/grid/grid_mech_spectral_basic.f90 +++ b/src/grid/grid_mech_spectral_basic.f90 @@ -15,7 +15,7 @@ module grid_mechanical_spectral_basic use prec use parallelization - use DAMASK_interface + use CLI use IO use HDF5 use HDF5_utilities diff --git a/src/grid/grid_mech_spectral_polarisation.f90 b/src/grid/grid_mech_spectral_polarisation.f90 index a75a01016..ec27c7390 100644 --- a/src/grid/grid_mech_spectral_polarisation.f90 +++ b/src/grid/grid_mech_spectral_polarisation.f90 @@ -15,7 +15,7 @@ module grid_mechanical_spectral_polarisation use prec use parallelization - use DAMASK_interface + use CLI use IO use HDF5 use HDF5_utilities diff --git a/src/grid/grid_thermal_spectral.f90 b/src/grid/grid_thermal_spectral.f90 index 18a79820e..8483fe336 100644 --- a/src/grid/grid_thermal_spectral.f90 +++ b/src/grid/grid_thermal_spectral.f90 @@ -16,7 +16,7 @@ module grid_thermal_spectral use prec use parallelization use IO - use DAMASK_interface + use CLI use HDF5_utilities use HDF5 use spectral_utilities diff --git a/src/grid/spectral_utilities.f90 b/src/grid/spectral_utilities.f90 index 4375ec860..c8321f83f 100644 --- a/src/grid/spectral_utilities.f90 +++ b/src/grid/spectral_utilities.f90 @@ -13,7 +13,7 @@ module spectral_utilities #endif use prec - use DAMASK_interface + use CLI use parallelization use math use rotations diff --git a/src/mesh/DAMASK_mesh.f90 b/src/mesh/DAMASK_mesh.f90 index 065eca1cb..85ce0e922 100644 --- a/src/mesh/DAMASK_mesh.f90 +++ b/src/mesh/DAMASK_mesh.f90 @@ -10,7 +10,7 @@ program DAMASK_mesh #include use PetscDM use prec - use DAMASK_interface + use CLI use parallelization use IO use math @@ -104,7 +104,7 @@ program DAMASK_mesh !-------------------------------------------------------------------------------------------------- ! reading basic information from load case file and allocate data structure containing load cases - fileContent = IO_readlines(trim(interface_loadFile)) + fileContent = IO_readlines(trim(CLI_loadFile)) do l = 1, size(fileContent) line = fileContent(l) if (IO_isBlank(line)) cycle ! skip empty lines diff --git a/src/mesh/discretization_mesh.f90 b/src/mesh/discretization_mesh.f90 index 70ee28343..b898c4e6b 100644 --- a/src/mesh/discretization_mesh.f90 +++ b/src/mesh/discretization_mesh.f90 @@ -15,7 +15,7 @@ module discretization_mesh use MPI_f08 #endif - use DAMASK_interface + use CLI use parallelization use IO use config @@ -101,9 +101,9 @@ subroutine discretization_mesh_init(restart) debug_ip = config_debug%get_asInt('integrationpoint',defaultVal=1) #if (PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR>16) - call DMPlexCreateFromFile(PETSC_COMM_WORLD,interface_geomFile,'n/a',PETSC_TRUE,globalMesh,err_PETSc) + call DMPlexCreateFromFile(PETSC_COMM_WORLD,CLI_geomFile,'n/a',PETSC_TRUE,globalMesh,err_PETSc) #else - call DMPlexCreateFromFile(PETSC_COMM_WORLD,interface_geomFile,PETSC_TRUE,globalMesh,err_PETSc) + call DMPlexCreateFromFile(PETSC_COMM_WORLD,CLI_geomFile,PETSC_TRUE,globalMesh,err_PETSc) #endif CHKERRQ(err_PETSc) call DMGetDimension(globalMesh,dimPlex,err_PETSc) diff --git a/src/mesh/mesh_mech_FEM.f90 b/src/mesh/mesh_mech_FEM.f90 index 8cf9dbfa1..474faa4ae 100644 --- a/src/mesh/mesh_mech_FEM.f90 +++ b/src/mesh/mesh_mech_FEM.f90 @@ -20,7 +20,7 @@ module mesh_mechanical_FEM use FEM_utilities use discretization use discretization_mesh - use DAMASK_interface + use CLI use config use IO use FEM_quadrature diff --git a/src/results.f90 b/src/results.f90 index 9fccff03e..bd7f7d34d 100644 --- a/src/results.f90 +++ b/src/results.f90 @@ -6,17 +6,19 @@ !-------------------------------------------------------------------------------------------------- module results use prec - use DAMASK_interface use parallelization use IO use HDF5_utilities use HDF5 #ifdef PETSC + use CLI #include use PETScSys #if (PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR>14) && !defined(PETSC_HAVE_MPI_F90MODULE_VISIBILITY) use MPI_f08 #endif +#else + use DAMASK_interface #endif implicit none