systematic naming scheme
This commit is contained in:
parent
b80b406ad5
commit
91b71fdff8
|
@ -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
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
module CPFEM2
|
||||
use parallelization
|
||||
use signals
|
||||
use DAMASK_interface
|
||||
use CLI
|
||||
use prec
|
||||
use IO
|
||||
use YAML_types
|
||||
|
|
|
@ -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 <jobname>.yaml.
|
||||
!> @brief Read material.yaml.
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
subroutine parse_material()
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ program DAMASK_grid
|
|||
use prec
|
||||
use parallelization
|
||||
use signals
|
||||
use DAMASK_interface
|
||||
use CLI
|
||||
use IO
|
||||
use config
|
||||
use math
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -15,7 +15,7 @@ module grid_mechanical_FEM
|
|||
|
||||
use prec
|
||||
use parallelization
|
||||
use DAMASK_interface
|
||||
use CLI
|
||||
use IO
|
||||
use HDF5
|
||||
use HDF5_utilities
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -13,7 +13,7 @@ module spectral_utilities
|
|||
#endif
|
||||
|
||||
use prec
|
||||
use DAMASK_interface
|
||||
use CLI
|
||||
use parallelization
|
||||
use math
|
||||
use rotations
|
||||
|
|
|
@ -10,7 +10,7 @@ program DAMASK_mesh
|
|||
#include <petsc/finclude/petscsys.h>
|
||||
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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 <petsc/finclude/petscsys.h>
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue