Skip to content

Commit

Permalink
ice_dyn_vp: rename 'ww[xy]' to 'orig_basis_[xy]'
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
phil-blain committed Jul 17, 2020
1 parent 14be2c3 commit 9267229
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions cicecore/cicedynB/dynamics/ice_dyn_vp.F90
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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, &
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9267229

Please sign in to comment.