223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Consistent use of () in subroutine calling

This commit is contained in:
Philip Eisenlohr 2023-02-21 15:18:17 +00:00 committed by Franz Roters
parent f3aafb0911
commit dde60ec53f
17 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Marc/discretization_Marc.f90
View File

@ -103,7 +103,7 @@ subroutine discretization_Marc_init
call geometry_plastic_nonlocal_setIParea(norm2(unscaledNormals,1)) call geometry_plastic_nonlocal_setIParea(norm2(unscaledNormals,1))
call geometry_plastic_nonlocal_setIPareaNormal(unscaledNormals/spread(norm2(unscaledNormals,1),1,3)) call geometry_plastic_nonlocal_setIPareaNormal(unscaledNormals/spread(norm2(unscaledNormals,1),1,3))
call geometry_plastic_nonlocal_setIPneighborhood(IPneighborhood(elem)) call geometry_plastic_nonlocal_setIPneighborhood(IPneighborhood(elem))
call geometry_plastic_nonlocal_result call geometry_plastic_nonlocal_result()
end subroutine discretization_Marc_init end subroutine discretization_Marc_init
@ -160,7 +160,7 @@ subroutine writeGeometry(elem, &
coordinates_points coordinates_points
call result_openJobFile call result_openJobFile()
call result_closeGroup(result_addGroup('geometry')) call result_closeGroup(result_addGroup('geometry'))
call result_writeDataset(connectivity_elem,'geometry','T_e',& call result_writeDataset(connectivity_elem,'geometry','T_e',&
@ -176,7 +176,7 @@ subroutine writeGeometry(elem, &
call result_writeDataset(coordinates_points,'geometry','x_p', & call result_writeDataset(coordinates_points,'geometry','x_p', &
'initial coordinates of the materialpoints (cell centers)','m') 'initial coordinates of the materialpoints (cell centers)','m')
call result_closeJobFile call result_closeJobFile()
end subroutine writeGeometry end subroutine writeGeometry
@ -209,11 +209,11 @@ subroutine inputRead(elem,node0_elem,connectivity_elem,materialAt)
mapElemSet !< list of elements in elementSet mapElemSet !< list of elements in elementSet
call result_openJobFile call result_openJobFile()
call result_writeDataset_str(IO_read(trim(getSolverJobName())//InputFileExtension), 'setup', & call result_writeDataset_str(IO_read(trim(getSolverJobName())//InputFileExtension), 'setup', &
trim(getSolverJobName())//InputFileExtension, & trim(getSolverJobName())//InputFileExtension, &
'MSC.Marc input deck') 'MSC.Marc input deck')
call result_closeJobFile call result_closeJobFile()
inputFile = IO_readlines(trim(getSolverJobName())//InputFileExtension) inputFile = IO_readlines(trim(getSolverJobName())//InputFileExtension)
call inputRead_fileFormat(fileFormatVersion, & call inputRead_fileFormat(fileFormatVersion, &

16
src/Marc/materialpoint_Marc.f90
View File

@ -205,8 +205,8 @@ end subroutine materialpoint_general
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
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
@ -219,13 +219,13 @@ subroutine materialpoint_result(inc,time)
integer, intent(in) :: inc integer, intent(in) :: inc
real(pReal), intent(in) :: time real(pReal), intent(in) :: time
call result_openJobFile call result_openJobFile()
call result_addIncrement(inc,time) call result_addIncrement(inc,time)
call phase_result call phase_result()
call homogenization_result call homogenization_result()
call discretization_result call discretization_result()
call result_finalizeIncrement call result_finalizeIncrement()
call result_closeJobFile call result_closeJobFile()
end subroutine materialpoint_result end subroutine materialpoint_result

4
src/config.f90
View File

@ -52,7 +52,7 @@ subroutine parse_material()
fileContent = IO_read('material.yaml') fileContent = IO_read('material.yaml')
call result_openJobFile(parallel=.false.) call result_openJobFile(parallel=.false.)
call result_writeDataset_str(fileContent,'setup','material.yaml','main configuration') call result_writeDataset_str(fileContent,'setup','material.yaml','main configuration')
call result_closeJobFile call result_closeJobFile()
end if end if
call parallelization_bcast_str(fileContent) call parallelization_bcast_str(fileContent)
@ -81,7 +81,7 @@ subroutine parse_numerics()
if (len(fileContent) > 0) then if (len(fileContent) > 0) then
call result_openJobFile(parallel=.false.) call result_openJobFile(parallel=.false.)
call result_writeDataset_str(fileContent,'setup','numerics.yaml','numerics configuration') call result_writeDataset_str(fileContent,'setup','numerics.yaml','numerics configuration')
call result_closeJobFile call result_closeJobFile()
end if end if
end if end if
call parallelization_bcast_str(fileContent) call parallelization_bcast_str(fileContent)

5
src/geometry_plastic_nonlocal.f90
View File

@ -114,7 +114,7 @@ subroutine geometry_plastic_nonlocal_result()
integer, dimension(:), allocatable :: shp integer, dimension(:), allocatable :: shp
call result_openJobFile call result_openJobFile()
writeVolume: block writeVolume: block
real(pReal), dimension(:), allocatable :: temp real(pReal), dimension(:), allocatable :: temp
@ -140,8 +140,7 @@ subroutine geometry_plastic_nonlocal_result()
'initial cell face normals','-',transposed=.false.) 'initial cell face normals','-',transposed=.false.)
end block writeNormals end block writeNormals
call result_closeJobFile()
call result_closeJobFile
end subroutine geometry_plastic_nonlocal_result end subroutine geometry_plastic_nonlocal_result

14
src/grid/DAMASK_grid.f90
View File

@ -147,7 +147,7 @@ program DAMASK_grid
if (scan(fname,'/') /= 0) fname = fname(scan(fname,'/',.true.)+1:) if (scan(fname,'/') /= 0) fname = fname(scan(fname,'/',.true.)+1:)
call result_openJobFile(parallel=.false.) call result_openJobFile(parallel=.false.)
call result_writeDataset_str(fileContent,'setup',fname,'load case definition (grid solver)') call result_writeDataset_str(fileContent,'setup',fname,'load case definition (grid solver)')
call result_closeJobFile call result_closeJobFile()
end if end if
call parallelization_bcast_str(fileContent) call parallelization_bcast_str(fileContent)
@ -313,7 +313,7 @@ program DAMASK_grid
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! doing initialization depending on active solvers ! doing initialization depending on active solvers
call spectral_Utilities_init call spectral_Utilities_init()
do field = 2, nActiveFields do field = 2, nActiveFields
select case (ID(field)) select case (ID(field))
@ -434,7 +434,7 @@ program DAMASK_grid
if ( (all(solres(:)%converged .and. solres(:)%stagConverged)) & ! converged if ( (all(solres(:)%converged .and. solres(:)%stagConverged)) & ! converged
.and. .not. solres(1)%termIll) then ! and acceptable solution found .and. .not. solres(1)%termIll) then ! and acceptable solution found
call mechanical_updateCoords call mechanical_updateCoords()
Delta_t_prev = Delta_t Delta_t_prev = Delta_t
cutBack = .false. cutBack = .false.
guess = .true. ! start guessing after first converged (sub)inc guess = .true. ! start guessing after first converged (sub)inc
@ -479,14 +479,14 @@ program DAMASK_grid
do field = 1, nActiveFields do field = 1, nActiveFields
select case (ID(field)) select case (ID(field))
case(FIELD_MECH_ID) case(FIELD_MECH_ID)
call mechanical_restartWrite call mechanical_restartWrite()
case(FIELD_THERMAL_ID) case(FIELD_THERMAL_ID)
call grid_thermal_spectral_restartWrite call grid_thermal_spectral_restartWrite()
case(FIELD_DAMAGE_ID) case(FIELD_DAMAGE_ID)
call grid_damage_spectral_restartWrite call grid_damage_spectral_restartWrite()
end select end select
end do end do
call materialpoint_restartWrite call materialpoint_restartWrite()
end if end if
if (sig) call signal_setSIGUSR2(.false.) if (sig) call signal_setSIGUSR2(.false.)
call MPI_Allreduce(signal_SIGINT,sig,1_MPI_INTEGER_KIND,MPI_LOGICAL,MPI_LOR,MPI_COMM_WORLD,err_MPI) call MPI_Allreduce(signal_SIGINT,sig,1_MPI_INTEGER_KIND,MPI_LOGICAL,MPI_LOR,MPI_COMM_WORLD,err_MPI)

2
src/grid/base64.f90
View File

@ -29,7 +29,7 @@ subroutine base64_init
print'(/,1x,a)', '<<<+- base64 init -+>>>'; flush(IO_STDOUT) print'(/,1x,a)', '<<<+- base64 init -+>>>'; flush(IO_STDOUT)
call selfTest call selfTest()
end subroutine base64_init end subroutine base64_init

6
src/grid/discretization_grid.f90
View File

@ -90,7 +90,7 @@ subroutine discretization_grid_init(restart)
if (scan(fname,'/') /= 0) fname = fname(scan(fname,'/',.true.)+1:) if (scan(fname,'/') /= 0) fname = fname(scan(fname,'/',.true.)+1:)
call result_openJobFile(parallel=.false.) call result_openJobFile(parallel=.false.)
call result_writeDataset_str(fileContent,'setup',fname,'geometry definition (grid solver)') call result_writeDataset_str(fileContent,'setup',fname,'geometry definition (grid solver)')
call result_closeJobFile call result_closeJobFile()
else else
allocate(materialAt_global(0)) ! needed for IntelMPI allocate(materialAt_global(0)) ! needed for IntelMPI
end if end if
@ -146,12 +146,12 @@ subroutine discretization_grid_init(restart)
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! store geometry information for post processing ! store geometry information for post processing
if (.not. restart) then if (.not. restart) then
call result_openJobFile call result_openJobFile()
call result_closeGroup(result_addGroup('geometry')) call result_closeGroup(result_addGroup('geometry'))
call result_addAttribute('cells', cells, '/geometry') call result_addAttribute('cells', cells, '/geometry')
call result_addAttribute('size', geomSize,'/geometry') call result_addAttribute('size', geomSize,'/geometry')
call result_addAttribute('origin',origin, '/geometry') call result_addAttribute('origin',origin, '/geometry')
call result_closeJobFile call result_closeJobFile()
end if end if
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------

2
src/grid/grid_damage_spectral.f90
View File

@ -298,7 +298,7 @@ subroutine grid_damage_spectral_forward(cutBack)
end do; end do; end do end do; end do; end do
else else
phi_lastInc = phi phi_lastInc = phi
call updateReference call updateReference()
end if end if
end subroutine grid_damage_spectral_forward end subroutine grid_damage_spectral_forward

2
src/grid/grid_thermal_spectral.f90
View File

@ -276,7 +276,7 @@ subroutine grid_thermal_spectral_forward(cutBack)
else else
dotT_lastInc = (T - T_lastInc)/params%Delta_t dotT_lastInc = (T - T_lastInc)/params%Delta_t
T_lastInc = T T_lastInc = T
call updateReference call updateReference()
end if end if
end subroutine grid_thermal_spectral_forward end subroutine grid_thermal_spectral_forward

4
src/material.f90
View File

@ -69,10 +69,10 @@ subroutine material_init(restart)
if (.not. restart) then if (.not. restart) then
call result_openJobFile call result_openJobFile()
call result_mapping_phase(material_ID_phase,material_entry_phase,material_name_phase) call result_mapping_phase(material_ID_phase,material_entry_phase,material_name_phase)
call result_mapping_homogenization(material_ID_homogenization,material_entry_homogenization,material_name_homogenization) call result_mapping_homogenization(material_ID_homogenization,material_entry_homogenization,material_name_homogenization)
call result_closeJobFile call result_closeJobFile()
end if end if
end subroutine material_init end subroutine material_init

4
src/mesh/DAMASK_mesh.f90
View File

@ -229,7 +229,7 @@ program DAMASK_mesh
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! doing initialization depending on active solvers ! doing initialization depending on active solvers
call FEM_Utilities_init call FEM_Utilities_init()
call FEM_mechanical_init(loadCases(1)%fieldBC(1)) call FEM_mechanical_init(loadCases(1)%fieldBC(1))
if (worldrank == 0) then if (worldrank == 0) then
@ -324,7 +324,7 @@ program DAMASK_mesh
if (mod(inc,loadCases(currentLoadCase)%outputFrequency) == 0) then ! at output frequency if (mod(inc,loadCases(currentLoadCase)%outputFrequency) == 0) then ! at output frequency
print'(/,1x,a)', '... writing results to file ...............................................' print'(/,1x,a)', '... writing results to file ...............................................'
call FEM_mechanical_updateCoords call FEM_mechanical_updateCoords()
call materialpoint_result(totalIncsCounter,time) call materialpoint_result(totalIncsCounter,time)
end if end if

2
src/mesh/FEM_quadrature.f90
View File

@ -178,7 +178,7 @@ subroutine FEM_quadrature_init()
permutationStar211([0.3523052600879940_pReal, 0.0992057202494530_pReal]), & permutationStar211([0.3523052600879940_pReal, 0.0992057202494530_pReal]), &
permutationStar31([0.1344783347929940_pReal]) ] permutationStar31([0.1344783347929940_pReal]) ]
call selfTest call selfTest()
end subroutine FEM_quadrature_init end subroutine FEM_quadrature_init

4
src/mesh/discretization_mesh.f90
View File

@ -263,7 +263,7 @@ subroutine writeGeometry(coordinates_points,coordinates_nodes)
coordinates_nodes, & coordinates_nodes, &
coordinates_points coordinates_points
call result_openJobFile call result_openJobFile()
call result_closeGroup(result_addGroup('geometry')) call result_closeGroup(result_addGroup('geometry'))
call result_writeDataset(coordinates_nodes,'geometry','x_n', & call result_writeDataset(coordinates_nodes,'geometry','x_n', &
@ -272,7 +272,7 @@ subroutine writeGeometry(coordinates_points,coordinates_nodes)
call result_writeDataset(coordinates_points,'geometry','x_p', & call result_writeDataset(coordinates_points,'geometry','x_p', &
'initial coordinates of the materialpoints (cell centers)','m') 'initial coordinates of the materialpoints (cell centers)','m')
call result_closeJobFile call result_closeJobFile()
end subroutine writeGeometry end subroutine writeGeometry

2
src/phase.f90
View File

@ -413,7 +413,7 @@ subroutine phase_init
end do end do
call mechanical_init(phases) call mechanical_init(phases)
call damage_init call damage_init()
call thermal_init(phases) call thermal_init(phases)
call crystallite_init() call crystallite_init()

2
src/phase_mechanical_plastic_nonlocal.f90
View File

@ -200,7 +200,7 @@ module function plastic_nonlocal_init() result(myPlasticity)
myPlasticity = plastic_active('nonlocal') myPlasticity = plastic_active('nonlocal')
Ninstances = count(myPlasticity) Ninstances = count(myPlasticity)
if (Ninstances == 0) then if (Ninstances == 0) then
call geometry_plastic_nonlocal_disable call geometry_plastic_nonlocal_disable()
return return
end if end if

4
src/result.f90
View File

@ -96,7 +96,7 @@ subroutine result_init(restart)
call result_addAttribute('description','input data used to run the simulation','setup') call result_addAttribute('description','input data used to run the simulation','setup')
else else
date = now() date = now()
call result_openJobFile call result_openJobFile()
call get_command(commandLine) call get_command(commandLine)
call result_addAttribute('call (restart at '//date//')',trim(commandLine)) call result_addAttribute('call (restart at '//date//')',trim(commandLine))
call H5Gmove_f(resultFile,'setup','tmp',hdferr) call H5Gmove_f(resultFile,'setup','tmp',hdferr)
@ -106,7 +106,7 @@ subroutine result_init(restart)
call H5Gmove_f(resultFile,'tmp','setup/previous',hdferr) call H5Gmove_f(resultFile,'tmp','setup/previous',hdferr)
end if end if
call result_closeJobFile call result_closeJobFile()
end subroutine result_init end subroutine result_init

2
src/rotations.f90
View File

@ -106,7 +106,7 @@ subroutine rotations_init
print'(/,1x,a)', 'D. Rowenhorst et al., Modelling and Simulation in Materials Science and Engineering 23:083501, 2015' print'(/,1x,a)', 'D. Rowenhorst et al., Modelling and Simulation in Materials Science and Engineering 23:083501, 2015'
print'( 1x,a)', 'https://doi.org/10.1088/0965-0393/23/8/083501' print'( 1x,a)', 'https://doi.org/10.1088/0965-0393/23/8/083501'
call selfTest call selfTest()
end subroutine rotations_init end subroutine rotations_init