From dde60ec53f1cf9f1bdb2c3bfbf0199846c2fe24b Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Tue, 21 Feb 2023 15:18:17 +0000 Subject: [PATCH] Consistent use of () in subroutine calling --- src/Marc/discretization_Marc.f90 | 10 +++++----- src/Marc/materialpoint_Marc.f90 | 16 ++++++++-------- src/config.f90 | 4 ++-- src/geometry_plastic_nonlocal.f90 | 5 ++--- src/grid/DAMASK_grid.f90 | 14 +++++++------- src/grid/base64.f90 | 2 +- src/grid/discretization_grid.f90 | 6 +++--- src/grid/grid_damage_spectral.f90 | 2 +- src/grid/grid_thermal_spectral.f90 | 2 +- src/material.f90 | 4 ++-- src/mesh/DAMASK_mesh.f90 | 4 ++-- src/mesh/FEM_quadrature.f90 | 2 +- src/mesh/discretization_mesh.f90 | 4 ++-- src/phase.f90 | 2 +- src/phase_mechanical_plastic_nonlocal.f90 | 2 +- src/result.f90 | 4 ++-- src/rotations.f90 | 2 +- 17 files changed, 42 insertions(+), 43 deletions(-) diff --git a/src/Marc/discretization_Marc.f90 b/src/Marc/discretization_Marc.f90 index 144690bcf..46e9eba45 100644 --- a/src/Marc/discretization_Marc.f90 +++ b/src/Marc/discretization_Marc.f90 @@ -103,7 +103,7 @@ subroutine discretization_Marc_init call geometry_plastic_nonlocal_setIParea(norm2(unscaledNormals,1)) call geometry_plastic_nonlocal_setIPareaNormal(unscaledNormals/spread(norm2(unscaledNormals,1),1,3)) call geometry_plastic_nonlocal_setIPneighborhood(IPneighborhood(elem)) - call geometry_plastic_nonlocal_result + call geometry_plastic_nonlocal_result() end subroutine discretization_Marc_init @@ -160,7 +160,7 @@ subroutine writeGeometry(elem, & coordinates_points - call result_openJobFile + call result_openJobFile() call result_closeGroup(result_addGroup('geometry')) call result_writeDataset(connectivity_elem,'geometry','T_e',& @@ -176,7 +176,7 @@ subroutine writeGeometry(elem, & call result_writeDataset(coordinates_points,'geometry','x_p', & 'initial coordinates of the materialpoints (cell centers)','m') - call result_closeJobFile + call result_closeJobFile() end subroutine writeGeometry @@ -209,11 +209,11 @@ subroutine inputRead(elem,node0_elem,connectivity_elem,materialAt) mapElemSet !< list of elements in elementSet - call result_openJobFile + call result_openJobFile() call result_writeDataset_str(IO_read(trim(getSolverJobName())//InputFileExtension), 'setup', & trim(getSolverJobName())//InputFileExtension, & 'MSC.Marc input deck') - call result_closeJobFile + call result_closeJobFile() inputFile = IO_readlines(trim(getSolverJobName())//InputFileExtension) call inputRead_fileFormat(fileFormatVersion, & diff --git a/src/Marc/materialpoint_Marc.f90 b/src/Marc/materialpoint_Marc.f90 index 43c2ac960..4890d978e 100644 --- a/src/Marc/materialpoint_Marc.f90 +++ b/src/Marc/materialpoint_Marc.f90 @@ -205,8 +205,8 @@ end subroutine materialpoint_general !-------------------------------------------------------------------------------------------------- subroutine materialpoint_forward - call homogenization_forward - call phase_forward + call homogenization_forward() + call phase_forward() end subroutine materialpoint_forward @@ -219,13 +219,13 @@ subroutine materialpoint_result(inc,time) integer, intent(in) :: inc real(pReal), intent(in) :: time - call result_openJobFile + call result_openJobFile() call result_addIncrement(inc,time) - call phase_result - call homogenization_result - call discretization_result - call result_finalizeIncrement - call result_closeJobFile + call phase_result() + call homogenization_result() + call discretization_result() + call result_finalizeIncrement() + call result_closeJobFile() end subroutine materialpoint_result diff --git a/src/config.f90 b/src/config.f90 index 82e8186a2..0a7e522be 100644 --- a/src/config.f90 +++ b/src/config.f90 @@ -52,7 +52,7 @@ subroutine parse_material() fileContent = IO_read('material.yaml') call result_openJobFile(parallel=.false.) call result_writeDataset_str(fileContent,'setup','material.yaml','main configuration') - call result_closeJobFile + call result_closeJobFile() end if call parallelization_bcast_str(fileContent) @@ -81,7 +81,7 @@ subroutine parse_numerics() if (len(fileContent) > 0) then call result_openJobFile(parallel=.false.) call result_writeDataset_str(fileContent,'setup','numerics.yaml','numerics configuration') - call result_closeJobFile + call result_closeJobFile() end if end if call parallelization_bcast_str(fileContent) diff --git a/src/geometry_plastic_nonlocal.f90 b/src/geometry_plastic_nonlocal.f90 index a0ec3d644..e9e7a19cc 100644 --- a/src/geometry_plastic_nonlocal.f90 +++ b/src/geometry_plastic_nonlocal.f90 @@ -114,7 +114,7 @@ subroutine geometry_plastic_nonlocal_result() integer, dimension(:), allocatable :: shp - call result_openJobFile + call result_openJobFile() writeVolume: block real(pReal), dimension(:), allocatable :: temp @@ -140,8 +140,7 @@ subroutine geometry_plastic_nonlocal_result() 'initial cell face normals','-',transposed=.false.) end block writeNormals - - call result_closeJobFile + call result_closeJobFile() end subroutine geometry_plastic_nonlocal_result diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90 index a64987dee..399ca859c 100644 --- a/src/grid/DAMASK_grid.f90 +++ b/src/grid/DAMASK_grid.f90 @@ -147,7 +147,7 @@ program DAMASK_grid if (scan(fname,'/') /= 0) fname = fname(scan(fname,'/',.true.)+1:) call result_openJobFile(parallel=.false.) call result_writeDataset_str(fileContent,'setup',fname,'load case definition (grid solver)') - call result_closeJobFile + call result_closeJobFile() end if call parallelization_bcast_str(fileContent) @@ -313,7 +313,7 @@ program DAMASK_grid !-------------------------------------------------------------------------------------------------- ! doing initialization depending on active solvers - call spectral_Utilities_init + call spectral_Utilities_init() do field = 2, nActiveFields select case (ID(field)) @@ -434,7 +434,7 @@ program DAMASK_grid if ( (all(solres(:)%converged .and. solres(:)%stagConverged)) & ! converged .and. .not. solres(1)%termIll) then ! and acceptable solution found - call mechanical_updateCoords + call mechanical_updateCoords() Delta_t_prev = Delta_t cutBack = .false. guess = .true. ! start guessing after first converged (sub)inc @@ -479,14 +479,14 @@ program DAMASK_grid do field = 1, nActiveFields select case (ID(field)) case(FIELD_MECH_ID) - call mechanical_restartWrite + call mechanical_restartWrite() case(FIELD_THERMAL_ID) - call grid_thermal_spectral_restartWrite + call grid_thermal_spectral_restartWrite() case(FIELD_DAMAGE_ID) - call grid_damage_spectral_restartWrite + call grid_damage_spectral_restartWrite() end select end do - call materialpoint_restartWrite + call materialpoint_restartWrite() end if 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) diff --git a/src/grid/base64.f90 b/src/grid/base64.f90 index 40986d783..ee38e0b19 100644 --- a/src/grid/base64.f90 +++ b/src/grid/base64.f90 @@ -29,7 +29,7 @@ subroutine base64_init print'(/,1x,a)', '<<<+- base64 init -+>>>'; flush(IO_STDOUT) - call selfTest + call selfTest() end subroutine base64_init diff --git a/src/grid/discretization_grid.f90 b/src/grid/discretization_grid.f90 index db5adc03b..ee44f5907 100644 --- a/src/grid/discretization_grid.f90 +++ b/src/grid/discretization_grid.f90 @@ -90,7 +90,7 @@ subroutine discretization_grid_init(restart) if (scan(fname,'/') /= 0) fname = fname(scan(fname,'/',.true.)+1:) call result_openJobFile(parallel=.false.) call result_writeDataset_str(fileContent,'setup',fname,'geometry definition (grid solver)') - call result_closeJobFile + call result_closeJobFile() else allocate(materialAt_global(0)) ! needed for IntelMPI end if @@ -146,12 +146,12 @@ subroutine discretization_grid_init(restart) !-------------------------------------------------------------------------------------------------- ! store geometry information for post processing if (.not. restart) then - call result_openJobFile + call result_openJobFile() call result_closeGroup(result_addGroup('geometry')) call result_addAttribute('cells', cells, '/geometry') call result_addAttribute('size', geomSize,'/geometry') call result_addAttribute('origin',origin, '/geometry') - call result_closeJobFile + call result_closeJobFile() end if !-------------------------------------------------------------------------------------------------- diff --git a/src/grid/grid_damage_spectral.f90 b/src/grid/grid_damage_spectral.f90 index e096ec3ef..0ba3c5a31 100644 --- a/src/grid/grid_damage_spectral.f90 +++ b/src/grid/grid_damage_spectral.f90 @@ -298,7 +298,7 @@ subroutine grid_damage_spectral_forward(cutBack) end do; end do; end do else phi_lastInc = phi - call updateReference + call updateReference() end if end subroutine grid_damage_spectral_forward diff --git a/src/grid/grid_thermal_spectral.f90 b/src/grid/grid_thermal_spectral.f90 index a5d9f4ec8..6483c91c6 100644 --- a/src/grid/grid_thermal_spectral.f90 +++ b/src/grid/grid_thermal_spectral.f90 @@ -276,7 +276,7 @@ subroutine grid_thermal_spectral_forward(cutBack) else dotT_lastInc = (T - T_lastInc)/params%Delta_t T_lastInc = T - call updateReference + call updateReference() end if end subroutine grid_thermal_spectral_forward diff --git a/src/material.f90 b/src/material.f90 index 791996730..2f8efa3aa 100644 --- a/src/material.f90 +++ b/src/material.f90 @@ -69,10 +69,10 @@ subroutine material_init(restart) 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_homogenization(material_ID_homogenization,material_entry_homogenization,material_name_homogenization) - call result_closeJobFile + call result_closeJobFile() end if end subroutine material_init diff --git a/src/mesh/DAMASK_mesh.f90 b/src/mesh/DAMASK_mesh.f90 index d28d064df..c85b071e0 100644 --- a/src/mesh/DAMASK_mesh.f90 +++ b/src/mesh/DAMASK_mesh.f90 @@ -229,7 +229,7 @@ program DAMASK_mesh !-------------------------------------------------------------------------------------------------- ! doing initialization depending on active solvers - call FEM_Utilities_init + call FEM_Utilities_init() call FEM_mechanical_init(loadCases(1)%fieldBC(1)) if (worldrank == 0) then @@ -324,7 +324,7 @@ program DAMASK_mesh if (mod(inc,loadCases(currentLoadCase)%outputFrequency) == 0) then ! at output frequency print'(/,1x,a)', '... writing results to file ...............................................' - call FEM_mechanical_updateCoords + call FEM_mechanical_updateCoords() call materialpoint_result(totalIncsCounter,time) end if diff --git a/src/mesh/FEM_quadrature.f90 b/src/mesh/FEM_quadrature.f90 index dde762eda..518cd1a4e 100644 --- a/src/mesh/FEM_quadrature.f90 +++ b/src/mesh/FEM_quadrature.f90 @@ -178,7 +178,7 @@ subroutine FEM_quadrature_init() permutationStar211([0.3523052600879940_pReal, 0.0992057202494530_pReal]), & permutationStar31([0.1344783347929940_pReal]) ] - call selfTest + call selfTest() end subroutine FEM_quadrature_init diff --git a/src/mesh/discretization_mesh.f90 b/src/mesh/discretization_mesh.f90 index fe54ab030..b8505f3cb 100644 --- a/src/mesh/discretization_mesh.f90 +++ b/src/mesh/discretization_mesh.f90 @@ -263,7 +263,7 @@ subroutine writeGeometry(coordinates_points,coordinates_nodes) coordinates_nodes, & coordinates_points - call result_openJobFile + call result_openJobFile() call result_closeGroup(result_addGroup('geometry')) 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', & 'initial coordinates of the materialpoints (cell centers)','m') - call result_closeJobFile + call result_closeJobFile() end subroutine writeGeometry diff --git a/src/phase.f90 b/src/phase.f90 index db682817e..6634f3084 100644 --- a/src/phase.f90 +++ b/src/phase.f90 @@ -413,7 +413,7 @@ subroutine phase_init end do call mechanical_init(phases) - call damage_init + call damage_init() call thermal_init(phases) call crystallite_init() diff --git a/src/phase_mechanical_plastic_nonlocal.f90 b/src/phase_mechanical_plastic_nonlocal.f90 index c9b1bc05a..baaecb7b9 100644 --- a/src/phase_mechanical_plastic_nonlocal.f90 +++ b/src/phase_mechanical_plastic_nonlocal.f90 @@ -200,7 +200,7 @@ module function plastic_nonlocal_init() result(myPlasticity) myPlasticity = plastic_active('nonlocal') Ninstances = count(myPlasticity) if (Ninstances == 0) then - call geometry_plastic_nonlocal_disable + call geometry_plastic_nonlocal_disable() return end if diff --git a/src/result.f90 b/src/result.f90 index 02b1557b5..4f96b32de 100644 --- a/src/result.f90 +++ b/src/result.f90 @@ -96,7 +96,7 @@ subroutine result_init(restart) call result_addAttribute('description','input data used to run the simulation','setup') else date = now() - call result_openJobFile + call result_openJobFile() call get_command(commandLine) call result_addAttribute('call (restart at '//date//')',trim(commandLine)) call H5Gmove_f(resultFile,'setup','tmp',hdferr) @@ -106,7 +106,7 @@ subroutine result_init(restart) call H5Gmove_f(resultFile,'tmp','setup/previous',hdferr) end if - call result_closeJobFile + call result_closeJobFile() end subroutine result_init diff --git a/src/rotations.f90 b/src/rotations.f90 index 657480ef4..0110736be 100644 --- a/src/rotations.f90 +++ b/src/rotations.f90 @@ -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)', 'https://doi.org/10.1088/0965-0393/23/8/083501' - call selfTest + call selfTest() end subroutine rotations_init