systematic naming scheme

This commit is contained in:
Martin Diehl 2022-04-24 04:43:44 +02:00
parent b80b406ad5
commit 91b71fdff8
14 changed files with 26 additions and 26 deletions

View File

@ -9,7 +9,7 @@
#define PETSC_MINOR_MIN 12 #define PETSC_MINOR_MIN 12
#define PETSC_MINOR_MAX 17 #define PETSC_MINOR_MAX 17
module DAMASK_interface module CLI
use, intrinsic :: ISO_fortran_env use, intrinsic :: ISO_fortran_env
use PETScSys use PETScSys
@ -60,7 +60,7 @@ subroutine CLI_init
quit quit
print'(/,1x,a)', '<<<+- DAMASK_interface init -+>>>' print'(/,1x,a)', '<<<+- CLI init -+>>>'
! http://patorjk.com/software/taag/#p=display&f=Lean&t=DAMASK%203 ! http://patorjk.com/software/taag/#p=display&f=Lean&t=DAMASK%203
#ifdef DEBUG #ifdef DEBUG
@ -358,4 +358,4 @@ function makeRelativePath(a,b)
end function makeRelativePath end function makeRelativePath
end module DAMASK_interface end module CLI

View File

@ -6,7 +6,7 @@
module CPFEM2 module CPFEM2
use parallelization use parallelization
use signals use signals
use DAMASK_interface use CLI
use prec use prec
use IO use IO
use YAML_types use YAML_types

View File

@ -1,8 +1,6 @@
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH !> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH
!> @brief Reads in the material, numerics & debug configuration from their respective file !> @brief Read in the material, numerics & debug configuration from their respective file
!> @details Reads the material configuration file, where solverJobName.yaml takes
!! precedence over material.yaml.
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
module config module config
use IO use IO
@ -28,19 +26,19 @@ contains
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief Real *.yaml configuration files. !> @brief Real *.yaml configuration files.
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine config_init subroutine config_init()
print'(/,1x,a)', '<<<+- config init -+>>>'; flush(IO_STDOUT) print'(/,1x,a)', '<<<+- config init -+>>>'; flush(IO_STDOUT)
call parse_material call parse_material()
call parse_numerics call parse_numerics()
call parse_debug call parse_debug()
end subroutine config_init end subroutine config_init
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief Read material.yaml or <jobname>.yaml. !> @brief Read material.yaml.
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine parse_material() subroutine parse_material()

View File

@ -16,7 +16,7 @@ program DAMASK_grid
use prec use prec
use parallelization use parallelization
use signals use signals
use DAMASK_interface use CLI
use IO use IO
use config use config
use math use math

View File

@ -15,7 +15,7 @@ module discretization_grid
use parallelization use parallelization
use system_routines use system_routines
use VTI use VTI
use DAMASK_interface use CLI
use IO use IO
use config use config
use results use results

View File

@ -15,7 +15,7 @@ module grid_mechanical_FEM
use prec use prec
use parallelization use parallelization
use DAMASK_interface use CLI
use IO use IO
use HDF5 use HDF5
use HDF5_utilities use HDF5_utilities

View File

@ -15,7 +15,7 @@ module grid_mechanical_spectral_basic
use prec use prec
use parallelization use parallelization
use DAMASK_interface use CLI
use IO use IO
use HDF5 use HDF5
use HDF5_utilities use HDF5_utilities

View File

@ -15,7 +15,7 @@ module grid_mechanical_spectral_polarisation
use prec use prec
use parallelization use parallelization
use DAMASK_interface use CLI
use IO use IO
use HDF5 use HDF5
use HDF5_utilities use HDF5_utilities

View File

@ -16,7 +16,7 @@ module grid_thermal_spectral
use prec use prec
use parallelization use parallelization
use IO use IO
use DAMASK_interface use CLI
use HDF5_utilities use HDF5_utilities
use HDF5 use HDF5
use spectral_utilities use spectral_utilities

View File

@ -13,7 +13,7 @@ module spectral_utilities
#endif #endif
use prec use prec
use DAMASK_interface use CLI
use parallelization use parallelization
use math use math
use rotations use rotations

View File

@ -10,7 +10,7 @@ program DAMASK_mesh
#include <petsc/finclude/petscsys.h> #include <petsc/finclude/petscsys.h>
use PetscDM use PetscDM
use prec use prec
use DAMASK_interface use CLI
use parallelization use parallelization
use IO use IO
use math use math
@ -104,7 +104,7 @@ program DAMASK_mesh
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! reading basic information from load case file and allocate data structure containing load cases ! 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) do l = 1, size(fileContent)
line = fileContent(l) line = fileContent(l)
if (IO_isBlank(line)) cycle ! skip empty lines if (IO_isBlank(line)) cycle ! skip empty lines

View File

@ -15,7 +15,7 @@ module discretization_mesh
use MPI_f08 use MPI_f08
#endif #endif
use DAMASK_interface use CLI
use parallelization use parallelization
use IO use IO
use config use config
@ -101,9 +101,9 @@ subroutine discretization_mesh_init(restart)
debug_ip = config_debug%get_asInt('integrationpoint',defaultVal=1) debug_ip = config_debug%get_asInt('integrationpoint',defaultVal=1)
#if (PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR>16) #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 #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 #endif
CHKERRQ(err_PETSc) CHKERRQ(err_PETSc)
call DMGetDimension(globalMesh,dimPlex,err_PETSc) call DMGetDimension(globalMesh,dimPlex,err_PETSc)

View File

@ -20,7 +20,7 @@ module mesh_mechanical_FEM
use FEM_utilities use FEM_utilities
use discretization use discretization
use discretization_mesh use discretization_mesh
use DAMASK_interface use CLI
use config use config
use IO use IO
use FEM_quadrature use FEM_quadrature

View File

@ -6,17 +6,19 @@
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
module results module results
use prec use prec
use DAMASK_interface
use parallelization use parallelization
use IO use IO
use HDF5_utilities use HDF5_utilities
use HDF5 use HDF5
#ifdef PETSC #ifdef PETSC
use CLI
#include <petsc/finclude/petscsys.h> #include <petsc/finclude/petscsys.h>
use PETScSys use PETScSys
#if (PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR>14) && !defined(PETSC_HAVE_MPI_F90MODULE_VISIBILITY) #if (PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR>14) && !defined(PETSC_HAVE_MPI_F90MODULE_VISIBILITY)
use MPI_f08 use MPI_f08
#endif #endif
#else
use DAMASK_interface
#endif #endif
implicit none implicit none