diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90 index 397a53c13..46f78ed71 100644 --- a/src/grid/DAMASK_grid.f90 +++ b/src/grid/DAMASK_grid.f90 @@ -94,8 +94,8 @@ program DAMASK_spectral mech_forward procedure(grid_mech_spectral_basic_solution), pointer :: & mech_solution - procedure(grid_mech_spectral_basic_age), pointer :: & - mech_age + procedure(grid_mech_spectral_basic_updateCoords), pointer :: & + mech_updateCoords procedure(grid_mech_spectral_basic_restartWrite), pointer :: & mech_restartWrite @@ -125,7 +125,7 @@ program DAMASK_spectral mech_init => grid_mech_spectral_basic_init mech_forward => grid_mech_spectral_basic_forward mech_solution => grid_mech_spectral_basic_solution - mech_age => grid_mech_spectral_basic_age + mech_updateCoords => grid_mech_spectral_basic_updateCoords mech_restartWrite => grid_mech_spectral_basic_restartWrite case ('polarisation') @@ -134,7 +134,7 @@ program DAMASK_spectral mech_init => grid_mech_spectral_polarisation_init mech_forward => grid_mech_spectral_polarisation_forward mech_solution => grid_mech_spectral_polarisation_solution - mech_age => grid_mech_spectral_polarisation_age + mech_updateCoords => grid_mech_spectral_polarisation_updateCoords mech_restartWrite => grid_mech_spectral_polarisation_restartWrite case ('fem') @@ -143,7 +143,7 @@ program DAMASK_spectral mech_init => grid_mech_FEM_init mech_forward => grid_mech_FEM_forward mech_solution => grid_mech_FEM_solution - mech_age => grid_mech_FEM_age + mech_updateCoords => grid_mech_FEM_updateCoords mech_restartWrite => grid_mech_FEM_restartWrite case default @@ -518,7 +518,7 @@ program DAMASK_spectral if ( (all(solres(:)%converged .and. solres(:)%stagConverged)) & ! converged .and. .not. solres(1)%termIll) then ! and acceptable solution found - call mech_age + call mech_updateCoords timeIncOld = timeinc cutBack = .false. guess = .true. ! start guessing after first converged (sub)inc diff --git a/src/grid/grid_mech_FEM.f90 b/src/grid/grid_mech_FEM.f90 index f7a0d796f..41b087805 100644 --- a/src/grid/grid_mech_FEM.f90 +++ b/src/grid/grid_mech_FEM.f90 @@ -72,7 +72,7 @@ module grid_mech_FEM grid_mech_FEM_init, & grid_mech_FEM_solution, & grid_mech_FEM_forward, & - grid_mech_FEM_age, & + grid_mech_FEM_updateCoords, & grid_mech_FEM_restartWrite contains @@ -354,11 +354,11 @@ end subroutine grid_mech_FEM_forward !-------------------------------------------------------------------------------------------------- !> @brief Age !-------------------------------------------------------------------------------------------------- -subroutine grid_mech_FEM_age() +subroutine grid_mech_FEM_updateCoords() call utilities_updateCoords(F) -end subroutine grid_mech_FEM_age +end subroutine grid_mech_FEM_updateCoords !-------------------------------------------------------------------------------------------------- diff --git a/src/grid/grid_mech_spectral_basic.f90 b/src/grid/grid_mech_spectral_basic.f90 index 46ef3145b..042e29928 100644 --- a/src/grid/grid_mech_spectral_basic.f90 +++ b/src/grid/grid_mech_spectral_basic.f90 @@ -76,7 +76,7 @@ module grid_mech_spectral_basic grid_mech_spectral_basic_init, & grid_mech_spectral_basic_solution, & grid_mech_spectral_basic_forward, & - grid_mech_spectral_basic_age, & + grid_mech_spectral_basic_updateCoords, & grid_mech_spectral_basic_restartWrite contains @@ -318,7 +318,7 @@ end subroutine grid_mech_spectral_basic_forward !-------------------------------------------------------------------------------------------------- !> @brief Age !-------------------------------------------------------------------------------------------------- -subroutine grid_mech_spectral_basic_age() +subroutine grid_mech_spectral_basic_updateCoords() PetscErrorCode :: ierr PetscScalar, dimension(:,:,:,:), pointer :: F @@ -327,7 +327,7 @@ subroutine grid_mech_spectral_basic_age() call utilities_updateCoords(F) call DMDAVecRestoreArrayF90(da,solution_vec,F,ierr); CHKERRQ(ierr) -end subroutine grid_mech_spectral_basic_age +end subroutine grid_mech_spectral_basic_updateCoords !-------------------------------------------------------------------------------------------------- diff --git a/src/grid/grid_mech_spectral_polarisation.f90 b/src/grid/grid_mech_spectral_polarisation.f90 index 9c54b75d6..28a7a2e9d 100644 --- a/src/grid/grid_mech_spectral_polarisation.f90 +++ b/src/grid/grid_mech_spectral_polarisation.f90 @@ -82,7 +82,7 @@ module grid_mech_spectral_polarisation grid_mech_spectral_polarisation_init, & grid_mech_spectral_polarisation_solution, & grid_mech_spectral_polarisation_forward, & - grid_mech_spectral_polarisation_age, & + grid_mech_spectral_polarisation_updateCoords, & grid_mech_spectral_polarisation_restartWrite contains @@ -361,17 +361,16 @@ end subroutine grid_mech_spectral_polarisation_forward !-------------------------------------------------------------------------------------------------- !> @brief Age !-------------------------------------------------------------------------------------------------- -subroutine grid_mech_spectral_polarisation_age() +subroutine grid_mech_spectral_polarisation_updateCoords() PetscErrorCode :: ierr - PetscScalar, dimension(:,:,:,:), pointer :: FandF_tau, F + PetscScalar, dimension(:,:,:,:), pointer :: FandF_tau call DMDAVecGetArrayF90(da,solution_vec,FandF_tau,ierr); CHKERRQ(ierr) - F => FandF_tau(0:8,:,:,:) - call utilities_updateCoords(F) + call utilities_updateCoords(FandF_tau(0:8,:,:,:)) call DMDAVecRestoreArrayF90(da,solution_vec,FandF_tau,ierr); CHKERRQ(ierr) -end subroutine grid_mech_spectral_polarisation_age +end subroutine grid_mech_spectral_polarisation_updateCoords !--------------------------------------------------------------------------------------------------