From 56d55c7ad2b33e8b7e2fadbcc9840e999b39d58c Mon Sep 17 00:00:00 2001
From: Philippe Blain <philippe.blain@canada.ca>
Date: Mon, 10 Jun 2019 13:56:05 -0400
Subject: [PATCH] ice_dyn_vp: make 'calc_bvec' use already computed 'vrel'

Pass the already computed 'vrel' as an argument instead of recomputing
it.
---
 cicecore/cicedynB/dynamics/ice_dyn_vp.F90 | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/cicecore/cicedynB/dynamics/ice_dyn_vp.F90 b/cicecore/cicedynB/dynamics/ice_dyn_vp.F90
index 3bab1290e..4892fa398 100644
--- a/cicecore/cicedynB/dynamics/ice_dyn_vp.F90
+++ b/cicecore/cicedynB/dynamics/ice_dyn_vp.F90
@@ -764,7 +764,8 @@ subroutine picard_solver (icellt,   icellu,  &
                             waterx   (:,:,iblk), watery  (:,:,iblk), & 
                             uprev_k  (:,:,iblk), vprev_k (:,:,iblk), & 
                             bxfix    (:,:,iblk), byfix   (:,:,iblk), &
-                            bx       (:,:,iblk), by      (:,:,iblk))
+                            bx       (:,:,iblk), by      (:,:,iblk), &
+                            vrel     (:,:,iblk))
 
       !     prepare precond matrix
            if (precond .gt. 1) then
@@ -1228,7 +1229,8 @@ subroutine anderson_solver (icellt,   icellu,  &
                             waterx   (:,:,iblk), watery  (:,:,iblk), & 
                             ulin     (:,:,iblk), vlin    (:,:,iblk), &
                             bxfix    (:,:,iblk), byfix   (:,:,iblk), &
-                            bx       (:,:,iblk), by      (:,:,iblk))
+                            bx       (:,:,iblk), by      (:,:,iblk), &
+                            vrel     (:,:,iblk))
             
             ! Compute nonlinear residual norm (PDE residual)
             call matvec (nx_block             , ny_block,            &
@@ -3048,7 +3050,8 @@ subroutine calc_bvec (nx_block,   ny_block, &
                        waterx,     watery,   &
                        uvel,       vvel,     &
                        bxfix,      byfix,    &
-                       bx,         by)
+                       bx,         by,       &
+                       vrel)
 
       integer (kind=int_kind), intent(in) :: &
          nx_block, ny_block, & ! block dimensions
@@ -3070,7 +3073,8 @@ subroutine calc_bvec (nx_block,   ny_block, &
          bxfix   , & ! bx = taux + bxfix !jfl
          byfix   , & ! by = tauy + byfix !jfl
          uocn    , & ! ocean current, x-direction (m/s)
-         vocn        ! ocean current, y-direction (m/s)
+         vocn    , & ! ocean current, y-direction (m/s)
+         vrel        ! relative ice-ocean velocity
          
       real (kind=dbl_kind), dimension(nx_block,ny_block,8), &
          intent(in) :: &
@@ -3087,7 +3091,6 @@ subroutine calc_bvec (nx_block,   ny_block, &
          i, j, ij
 
       real (kind=dbl_kind) :: &
-         vrel              , & ! relative ice-ocean velocity
          utp, vtp          , & ! utp = uvel, vtp = vvel !jfl needed?
          taux, tauy        , & ! part of ocean stress term
          strintx, strinty  , & ! divergence of the internal stress tensor (only Pr part)
@@ -3098,8 +3101,6 @@ subroutine calc_bvec (nx_block,   ny_block, &
       !-----------------------------------------------------------------
       ! calc b vector
       !-----------------------------------------------------------------
-
-      !JFL vrel could be sent here (already calc before...
       
       call icepack_query_parameters(rhow_out=rhow)
       call icepack_warnings_flush(nu_diag)
@@ -3113,12 +3114,9 @@ subroutine calc_bvec (nx_block,   ny_block, &
          utp = uvel(i,j)
          vtp = vvel(i,j)
 
-         ! (magnitude of relative ocean current)*rhow*drag*aice
-         vrel = aiu(i,j)*rhow*Cw(i,j)*sqrt((uocn(i,j) - utp)**2 + &
-                                           (vocn(i,j) - vtp)**2)  ! m/s
          ! ice/ocean stress
-         taux = vrel*waterx(i,j) ! NOTE this is not the entire
-         tauy = vrel*watery(i,j) ! ocn stress term
+         taux = vrel(i,j)*waterx(i,j) ! NOTE this is not the entire
+         tauy = vrel(i,j)*watery(i,j) ! ocn stress term
          
          ! divergence of the internal stress tensor (only Pr part, i.e. dPr/dx)
          strintx = uarear(i,j)* &