unified capitalization
This commit is contained in:
parent
be39865ff7
commit
fc4619189f
|
@ -46,7 +46,7 @@ subroutine DAMASK_interface_init
|
||||||
integer :: ierr
|
integer :: ierr
|
||||||
character(len=pPathLen) :: wd
|
character(len=pPathLen) :: wd
|
||||||
|
|
||||||
print'(/,1x,a)', '<<<+- DAMASK_marc init -+>>>'
|
print'(/,1x,a)', '<<<+- DAMASK_Marc init -+>>>'
|
||||||
|
|
||||||
print*, 'Roters et al., Computational Materials Science 158:420–478, 2019'
|
print*, 'Roters et al., Computational Materials Science 158:420–478, 2019'
|
||||||
print*, 'https://doi.org/10.1016/j.commatsci.2018.04.030'
|
print*, 'https://doi.org/10.1016/j.commatsci.2018.04.030'
|
||||||
|
@ -380,7 +380,7 @@ end subroutine hypela2
|
||||||
subroutine flux(f,ts,n,time)
|
subroutine flux(f,ts,n,time)
|
||||||
use prec
|
use prec
|
||||||
use homogenization
|
use homogenization
|
||||||
use discretization_marc
|
use discretization_Marc
|
||||||
|
|
||||||
implicit none
|
implicit none
|
||||||
real(pReal), dimension(6), intent(in) :: &
|
real(pReal), dimension(6), intent(in) :: &
|
||||||
|
@ -426,7 +426,7 @@ subroutine uedinc(inc,incsub)
|
||||||
endif
|
endif
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
call discretization_marc_UpdateNodeAndIpCoords(d_n)
|
call discretization_Marc_UpdateNodeAndIpCoords(d_n)
|
||||||
call materialpoint_results(inc,cptim)
|
call materialpoint_results(inc,cptim)
|
||||||
|
|
||||||
inc_written = inc
|
inc_written = inc
|
||||||
|
|
|
@ -136,7 +136,7 @@ end subroutine discretization_Marc_updateNodeAndIpCoords
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief Calculate and set current nodal and IP positions (including cell nodes)
|
!> @brief Calculate and set current nodal and IP positions (including cell nodes)
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
function discretization_marc_FEM2DAMASK_cell(IP_FEM,elem_FEM) result(cell)
|
function discretization_Marc_FEM2DAMASK_cell(IP_FEM,elem_FEM) result(cell)
|
||||||
|
|
||||||
integer, intent(in) :: IP_FEM, elem_FEM
|
integer, intent(in) :: IP_FEM, elem_FEM
|
||||||
integer :: cell
|
integer :: cell
|
||||||
|
@ -147,7 +147,7 @@ function discretization_marc_FEM2DAMASK_cell(IP_FEM,elem_FEM) result(cell)
|
||||||
cell = (discretization_Marc_FEM2DAMASK_elem(elem_FEM)-1)*discretization_nIPs + IP_FEM
|
cell = (discretization_Marc_FEM2DAMASK_elem(elem_FEM)-1)*discretization_nIPs + IP_FEM
|
||||||
|
|
||||||
|
|
||||||
end function discretization_marc_FEM2DAMASK_cell
|
end function discretization_Marc_FEM2DAMASK_cell
|
||||||
|
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -21,7 +21,7 @@ module materialpoint_Marc
|
||||||
use homogenization
|
use homogenization
|
||||||
|
|
||||||
use discretization
|
use discretization
|
||||||
use discretization_marc
|
use discretization_Marc
|
||||||
|
|
||||||
implicit none
|
implicit none
|
||||||
private
|
private
|
||||||
|
@ -86,7 +86,7 @@ subroutine materialpoint_initAll
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue