From 9267229a8cbe867cc083cde1cc8358feff259cf9 Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Fri, 17 Jul 2020 16:51:31 -0400 Subject: [PATCH] ice_dyn_vp: rename 'ww[xy]' to 'orig_basis_[xy]' The arrays 'ww_[xy]' are used to keep the values of the preconditioned vectors, in order to update the solution at the end of the iteration. As such, rename them to 'orig_basis_[xy]', since they form a basis of the solution space and this name describes their purpose better. --- cicecore/cicedynB/dynamics/ice_dyn_vp.F90 | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/cicecore/cicedynB/dynamics/ice_dyn_vp.F90 b/cicecore/cicedynB/dynamics/ice_dyn_vp.F90 index 5cb6807ee..b7b0e6f39 100644 --- a/cicecore/cicedynB/dynamics/ice_dyn_vp.F90 +++ b/cicecore/cicedynB/dynamics/ice_dyn_vp.F90 @@ -2710,8 +2710,8 @@ subroutine fgmres (zetaD , & arnoldi_basis_y ! Arnoldi basis (y components) real (kind=dbl_kind), dimension(nx_block, ny_block, max_blocks, maxinner) :: & - wwx , & ! !phb FIND BETTER NAME (x components) - wwy ! !phb FIND BETTER NAME (y components) + orig_basis_x , & ! original basis (x components) + orig_basis_y ! original basis (y components) real (kind=dbl_kind) :: & norm_residual , & ! current L^2 norm of residual vector @@ -2851,9 +2851,8 @@ subroutine fgmres (zetaD , & diagx , diagy , & precond_type, & workspace_x , workspace_y) - ! !phb DESCRIBE ww - wwx(:,:,:,initer) = workspace_x - wwy(:,:,:,initer) = workspace_y + orig_basis_x(:,:,:,initer) = workspace_x + orig_basis_y(:,:,:,initer) = workspace_y ! Update workspace with boundary values call ice_HaloUpdate_vel(workspace_x, workspace_y, & @@ -2974,8 +2973,8 @@ subroutine fgmres (zetaD , & i = indxui(ij, iblk) j = indxuj(ij, iblk) - solx(i, j, iblk) = solx(i, j, iblk) + t * wwx(i, j, iblk, it) - soly(i, j, iblk) = soly(i, j, iblk) + t * wwy(i, j, iblk, it) + solx(i, j, iblk) = solx(i, j, iblk) + t * orig_basis_x(i, j, iblk, it) + soly(i, j, iblk) = soly(i, j, iblk) + t * orig_basis_y(i, j, iblk, it) enddo ! ij enddo !$OMP END PARALLEL DO