Merge branch 'fortran-style-adjustments' into 'development'
Fortran style adjustments See merge request damask/DAMASK!682
This commit is contained in:
commit
a4e2702afb
|
@ -72,26 +72,26 @@ contains
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief Initialize all modules.
|
!> @brief Initialize all modules.
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine materialpoint_initAll
|
subroutine materialpoint_initAll()
|
||||||
|
|
||||||
call DAMASK_interface_init
|
call DAMASK_interface_init()
|
||||||
call prec_init
|
call prec_init()
|
||||||
call IO_init
|
call IO_init()
|
||||||
call YAML_types_init
|
call YAML_types_init()
|
||||||
call YAML_parse_init
|
call YAML_parse_init()
|
||||||
call HDF5_utilities_init
|
call HDF5_utilities_init()
|
||||||
call results_init(.false.)
|
call results_init(.false.)
|
||||||
call config_init
|
call config_init()
|
||||||
call math_init
|
call math_init()
|
||||||
call rotations_init
|
call rotations_init()
|
||||||
call polynomials_init
|
call polynomials_init()
|
||||||
call lattice_init
|
call lattice_init()
|
||||||
call discretization_Marc_init
|
call discretization_Marc_init()
|
||||||
call material_init(.false.)
|
call material_init(.false.)
|
||||||
call phase_init
|
call phase_init()
|
||||||
call homogenization_init
|
call homogenization_init()
|
||||||
call materialpoint_init
|
call materialpoint_init()
|
||||||
call config_deallocate
|
call config_deallocate()
|
||||||
|
|
||||||
end subroutine materialpoint_initAll
|
end subroutine materialpoint_initAll
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ end subroutine materialpoint_initAll
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief allocate the arrays defined in module materialpoint and initialize them
|
!> @brief allocate the arrays defined in module materialpoint and initialize them
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine materialpoint_init
|
subroutine materialpoint_init()
|
||||||
|
|
||||||
type(tList), pointer :: &
|
type(tList), pointer :: &
|
||||||
debug_materialpoint
|
debug_materialpoint
|
||||||
|
|
|
@ -852,7 +852,7 @@ end function to_flow
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief Check correctness of some YAML functions.
|
!> @brief Check correctness of some YAML functions.
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine selfTest
|
subroutine selfTest()
|
||||||
|
|
||||||
if (indentDepth(' a') /= 1) error stop 'indentDepth'
|
if (indentDepth(' a') /= 1) error stop 'indentDepth'
|
||||||
if (indentDepth('a') /= 0) error stop 'indentDepth'
|
if (indentDepth('a') /= 0) error stop 'indentDepth'
|
||||||
|
|
|
@ -40,37 +40,37 @@ contains
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief Initialize all modules.
|
!> @brief Initialize all modules.
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine materialpoint_initAll
|
subroutine materialpoint_initAll()
|
||||||
|
|
||||||
call parallelization_init
|
call parallelization_init()
|
||||||
call CLI_init ! Spectral and FEM interface to commandline
|
call CLI_init() ! grid and mesh commandline interface
|
||||||
call signals_init
|
call signals_init()
|
||||||
call prec_init
|
call prec_init()
|
||||||
call IO_init
|
call IO_init()
|
||||||
#if defined(MESH)
|
#if defined(MESH)
|
||||||
call FEM_quadrature_init
|
call FEM_quadrature_init()
|
||||||
#elif defined(GRID)
|
#elif defined(GRID)
|
||||||
call base64_init
|
call base64_init()
|
||||||
#endif
|
#endif
|
||||||
call YAML_types_init
|
call YAML_types_init()
|
||||||
call YAML_parse_init
|
call YAML_parse_init()
|
||||||
call HDF5_utilities_init
|
call HDF5_utilities_init()
|
||||||
call results_init(restart=CLI_restartInc>0)
|
call results_init(restart=CLI_restartInc>0)
|
||||||
call config_init
|
call config_init()
|
||||||
call math_init
|
call math_init()
|
||||||
call rotations_init
|
call rotations_init()
|
||||||
call polynomials_init
|
call polynomials_init()
|
||||||
call lattice_init
|
call lattice_init()
|
||||||
#if defined(MESH)
|
#if defined(MESH)
|
||||||
call discretization_mesh_init(restart=CLI_restartInc>0)
|
call discretization_mesh_init(restart=CLI_restartInc>0)
|
||||||
#elif defined(GRID)
|
#elif defined(GRID)
|
||||||
call discretization_grid_init(restart=CLI_restartInc>0)
|
call discretization_grid_init(restart=CLI_restartInc>0)
|
||||||
#endif
|
#endif
|
||||||
call material_init(restart=CLI_restartInc>0)
|
call material_init(restart=CLI_restartInc>0)
|
||||||
call phase_init
|
call phase_init()
|
||||||
call homogenization_init
|
call homogenization_init()
|
||||||
call materialpoint_init
|
call materialpoint_init()
|
||||||
call config_deallocate
|
call config_deallocate()
|
||||||
|
|
||||||
end subroutine materialpoint_initAll
|
end subroutine materialpoint_initAll
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@ end subroutine materialpoint_initAll
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief Read restart information if needed.
|
!> @brief Read restart information if needed.
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine materialpoint_init
|
subroutine materialpoint_init()
|
||||||
|
|
||||||
integer(HID_T) :: fileHandle
|
integer(HID_T) :: fileHandle
|
||||||
|
|
||||||
|
@ -103,7 +103,7 @@ end subroutine materialpoint_init
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief Write restart information.
|
!> @brief Write restart information.
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine materialpoint_restartWrite
|
subroutine materialpoint_restartWrite()
|
||||||
|
|
||||||
integer(HID_T) :: fileHandle
|
integer(HID_T) :: fileHandle
|
||||||
|
|
||||||
|
@ -123,10 +123,10 @@ end subroutine materialpoint_restartWrite
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief Forward data for new time increment.
|
!> @brief Forward data for new time increment.
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine materialpoint_forward
|
subroutine materialpoint_forward()
|
||||||
|
|
||||||
call homogenization_forward
|
call homogenization_forward()
|
||||||
call phase_forward
|
call phase_forward()
|
||||||
|
|
||||||
end subroutine materialpoint_forward
|
end subroutine materialpoint_forward
|
||||||
|
|
||||||
|
@ -139,13 +139,13 @@ subroutine materialpoint_results(inc,time)
|
||||||
integer, intent(in) :: inc
|
integer, intent(in) :: inc
|
||||||
real(pReal), intent(in) :: time
|
real(pReal), intent(in) :: time
|
||||||
|
|
||||||
call results_openJobFile
|
call results_openJobFile()
|
||||||
call results_addIncrement(inc,time)
|
call results_addIncrement(inc,time)
|
||||||
call phase_results
|
call phase_results()
|
||||||
call homogenization_results
|
call homogenization_results()
|
||||||
call discretization_results
|
call discretization_results()
|
||||||
call results_finalizeIncrement
|
call results_finalizeIncrement()
|
||||||
call results_closeJobFile
|
call results_closeJobFile()
|
||||||
|
|
||||||
end subroutine materialpoint_results
|
end subroutine materialpoint_results
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@ contains
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief Initialize shared memory (openMP) and distributed memory (MPI) parallelization.
|
!> @brief Initialize shared memory (openMP) and distributed memory (MPI) parallelization.
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine parallelization_init
|
subroutine parallelization_init()
|
||||||
|
|
||||||
integer(MPI_INTEGER_KIND) :: err_MPI, typeSize, version, subversion, devNull
|
integer(MPI_INTEGER_KIND) :: err_MPI, typeSize, version, subversion, devNull
|
||||||
character(len=4) :: rank_str
|
character(len=4) :: rank_str
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @author Martin Diehl, KU Leuven
|
!> @author Martin Diehl, KU Leuven
|
||||||
!> @brief Polynomial representation for variable data
|
!> @brief Polynomial representation for variable data.
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
module polynomials
|
module polynomials
|
||||||
use prec
|
use prec
|
||||||
|
@ -19,8 +19,8 @@ module polynomials
|
||||||
end type tPolynomial
|
end type tPolynomial
|
||||||
|
|
||||||
interface polynomial
|
interface polynomial
|
||||||
module procedure polynomial_from_dict
|
|
||||||
module procedure polynomial_from_coef
|
module procedure polynomial_from_coef
|
||||||
|
module procedure polynomial_from_dict
|
||||||
end interface polynomial
|
end interface polynomial
|
||||||
|
|
||||||
public :: &
|
public :: &
|
||||||
|
@ -43,7 +43,7 @@ end subroutine polynomials_init
|
||||||
|
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief Initialize a Polynomial from Coefficients.
|
!> @brief Initialize a polynomial from coefficients.
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
pure function polynomial_from_coef(coef,x_ref) result(p)
|
pure function polynomial_from_coef(coef,x_ref) result(p)
|
||||||
|
|
||||||
|
@ -59,7 +59,7 @@ end function polynomial_from_coef
|
||||||
|
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief Initialize a Polynomial from a Dictionary with Coefficients.
|
!> @brief Initialize a polynomial from a dictionary with coefficients.
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
function polynomial_from_dict(dict,y,x) result(p)
|
function polynomial_from_dict(dict,y,x) result(p)
|
||||||
|
|
||||||
|
@ -93,7 +93,7 @@ end function polynomial_from_dict
|
||||||
|
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief Evaluate a Polynomial.
|
!> @brief Evaluate a polynomial.
|
||||||
!> @details https://nvlpubs.nist.gov/nistpubs/jres/71b/jresv71bn1p11_a1b.pdf (eq. 1.2)
|
!> @details https://nvlpubs.nist.gov/nistpubs/jres/71b/jresv71bn1p11_a1b.pdf (eq. 1.2)
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
pure function eval(self,x) result(y)
|
pure function eval(self,x) result(y)
|
||||||
|
|
Loading…
Reference in New Issue