clearer names and reporting
This commit is contained in:
parent
37d511062d
commit
00fcf069fb
|
@ -18,14 +18,13 @@ module material
|
||||||
|
|
||||||
integer, dimension(:), allocatable, public, protected :: &
|
integer, dimension(:), allocatable, public, protected :: &
|
||||||
homogenization_Nconstituents !< number of grains in each homogenization
|
homogenization_Nconstituents !< number of grains in each homogenization
|
||||||
|
integer, public, protected :: &
|
||||||
|
homogenization_maxNconstituents !< max number of grains in any homogenization
|
||||||
|
|
||||||
character(len=:), public, protected, allocatable, dimension(:) :: &
|
character(len=:), public, protected, allocatable, dimension(:) :: &
|
||||||
material_name_phase, & !< name of each phase
|
material_name_phase, & !< name of each phase
|
||||||
material_name_homogenization !< name of each homogenization
|
material_name_homogenization !< name of each homogenization
|
||||||
|
|
||||||
integer, public, protected :: &
|
|
||||||
homogenization_maxNconstituents !< max number of grains in any USED homogenization
|
|
||||||
|
|
||||||
integer, dimension(:), allocatable, public, protected :: & ! (elem)
|
integer, dimension(:), allocatable, public, protected :: & ! (elem)
|
||||||
material_homogenizationAt, & !< homogenization ID of each element
|
material_homogenizationAt, & !< homogenization ID of each element
|
||||||
material_homogenizationID, & !< per cell
|
material_homogenizationID, & !< per cell
|
||||||
|
@ -55,8 +54,8 @@ subroutine material_init(restart)
|
||||||
print'(/,a)', ' <<<+- material init -+>>>'; flush(IO_STDOUT)
|
print'(/,a)', ' <<<+- material init -+>>>'; flush(IO_STDOUT)
|
||||||
|
|
||||||
|
|
||||||
call material_parseMaterial
|
call parse
|
||||||
print*, 'Material parsed'
|
print*, 'parsed material.yaml'
|
||||||
|
|
||||||
|
|
||||||
if (.not. restart) then
|
if (.not. restart) then
|
||||||
|
@ -69,11 +68,10 @@ subroutine material_init(restart)
|
||||||
end subroutine material_init
|
end subroutine material_init
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief parses the material part in the material configuration file
|
!> @brief Parse material.yaml to get the global structure
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine material_parseMaterial
|
subroutine parse()
|
||||||
|
|
||||||
class(tNode), pointer :: materials, & !> list of materials
|
class(tNode), pointer :: materials, & !> list of materials
|
||||||
material, & !> material definition
|
material, & !> material definition
|
||||||
|
@ -155,7 +153,7 @@ subroutine material_parseMaterial
|
||||||
|
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
end subroutine material_parseMaterial
|
end subroutine parse
|
||||||
|
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in New Issue