Skip to content

Commit

Permalink
Modif strain u (#45)
Browse files Browse the repository at this point in the history
* Corrected wrong sign for shearU

* Use arear instead of area in div_stress

* Minor modif in viscous_coeffs_and_rep_pressure_T2U

* Changed erea to earear in use ice grid...it now compiles
  • Loading branch information
JFLemieux73 authored Nov 30, 2021
1 parent 54e5c34 commit cc0e716
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions cicecore/cicedynB/dynamics/ice_dyn_evp.F90
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ subroutine evp (dt)
dxe, dxn, dxt, dxu, dye, dyn, dyt, dyu, &
ratiodxN, ratiodxNr, ratiodyE, ratiodyEr, &
dxhy, dyhx, cxp, cyp, cxm, cym, &
tarear, uarear, earea, narea, tinyarea, grid_average_X2Y, tarea, &
tarear, uarear, earear, narear, tinyarea, grid_average_X2Y, tarea, &
grid_type, grid_system
use ice_state, only: aice, vice, vsno, uvel, vvel, uvelN, vvelN, &
uvelE, vvelE, divu, shear, &
Expand Down Expand Up @@ -740,7 +740,7 @@ subroutine evp (dt)
indxei (:,iblk), indxej (:,iblk), &
dxE (:,:,iblk), dyE (:,:,iblk), &
dxU (:,:,iblk), dyT (:,:,iblk), &
earea (:,:,iblk), &
earear (:,:,iblk), &
stresspT (:,:,iblk), stressmT (:,:,iblk), &
stress12U (:,:,iblk), &
stresspU (:,:,iblk), stressmU (:,:,iblk), &
Expand All @@ -753,7 +753,7 @@ subroutine evp (dt)
indxni (:,iblk), indxnj (:,iblk), &
dxN (:,:,iblk), dyN (:,:,iblk), &
dxT (:,:,iblk), dyU (:,:,iblk), &
narea (:,:,iblk), &
narear (:,:,iblk), &
stresspU (:,:,iblk), stressmU (:,:,iblk), &
stress12T (:,:,iblk), &
stresspT (:,:,iblk), stressmT (:,:,iblk), &
Expand Down Expand Up @@ -1608,7 +1608,7 @@ subroutine div_stress (nx_block, ny_block, &
indxi, indxj, &
dxE_N, dyE_N, &
dxT_U, dyT_U, &
area, &
arear, &
stresspF1, stressmF1, &
stress12F1, &
stresspF2, stressmF2, &
Expand All @@ -1632,7 +1632,7 @@ subroutine div_stress (nx_block, ny_block, &
dyE_N , & ! height of E or N-cell through the middle (m)
dxT_U , & ! width of T or U-cell through the middle (m)
dyT_U , & ! height of T or U-cell through the middle (m)
area , & ! earea or narea
arear , & ! earear or narear
stresspF1 , & ! stressp (U or T) used for F1 calculation
stressmF1 , & ! stressm (U or T) used for F1 calculation
stress12F1 , & ! stress12 (U or T) used for F1 calculation
Expand Down Expand Up @@ -1668,14 +1668,14 @@ subroutine div_stress (nx_block, ny_block, &
select case (trim(grid_location))
case('E')

F1(i,j) = (c1/area(i,j)) * &
F1(i,j) = arear(i,j) * &
( p5 * dyE_N(i,j) * ( stresspF1(i+1,j)-stresspF1(i,j) ) &
+ (p5/dyE_N(i,j)) * ( (dyT_U(i+1,j)**2) * stressmF1(i+1,j) &
-(dyT_U(i,j)**2)*stressmF1(i,j) ) &
+ (c1/dxE_N(i,j)) * ( (dxT_U(i,j)**2) * stress12F1(i,j) &
-(dxT_U(i,j-1)**2)*stress12F1(i,j-1) ) )

F2(i,j) = (c1/area(i,j)) * &
F2(i,j) = arear(i,j) * &
( p5 * dxE_N(i,j) * ( stresspF2(i,j)-stresspF2(i,j-1) ) &
- (p5/dxE_N(i,j)) * ( (dxT_U(i,j)**2) * stressmF2(i,j) &
-(dxT_U(i,j-1)**2)*stressmF2(i,j-1) ) &
Expand All @@ -1684,14 +1684,14 @@ subroutine div_stress (nx_block, ny_block, &

case('N')

F1(i,j) = (c1/area(i,j)) * &
F1(i,j) = arear(i,j) * &
( p5 * dyE_N(i,j) * ( stresspF1(i,j)-stresspF1(i-1,j) ) &
+ (p5/dyE_N(i,j)) * ( (dyT_U(i,j)**2) * stressmF1(i,j) &
-(dyT_U(i-1,j)**2)*stressmF1(i-1,j) ) &
+ (c1/dxE_N(i,j)) * ( (dxT_U(i,j+1)**2) * stress12F1(i,j+1) &
-(dxT_U(i,j)**2)*stress12F1(i,j) ) )

F2(i,j) = (c1/area(i,j)) * &
F2(i,j) = arear(i,j) * &
( p5 * dxE_N(i,j) * ( stresspF2(i,j+1)-stresspF2(i,j) ) &
- (p5/dxE_N(i,j)) * ( (dxT_U(i,j+1)**2) * stressmF2(i,j+1) &
-(dxT_U(i,j)**2)*stressmF2(i,j) ) &
Expand Down
4 changes: 2 additions & 2 deletions cicecore/cicedynB/dynamics/ice_dyn_shared.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1863,7 +1863,7 @@ subroutine strain_rates_U (nx_block, ny_block, &
shearU = dxU(i,j) * ( uEijp1 - uEij ) &
- uvelU(i,j) * uvm(i,j) * ( dxE(i,j+1) - dxE(i,j) ) &
+ dyU(i,j) * ( vNip1j - vNij ) &
+ vvelU(i,j) * uvm(i,j) * ( dyN(i+1,j) - dyN(i,j) )
- vvelU(i,j) * uvm(i,j) * ( dyN(i+1,j) - dyN(i,j) )

! Delta (in the denominator of zeta, eta)
DeltaU = sqrt(divU**2 + e_factor*(tensionU**2 + shearU**2))
Expand Down Expand Up @@ -2031,7 +2031,7 @@ subroutine viscous_coeffs_and_rep_pressure_T2U (zetax2T_00, zetax2T_01, &
maskT_11*Tarea_11 *etax2T_11 + &
maskT_01*Tarea_01 *etax2T_01)/Totarea

rep_prsU = (c1-ktens)/(1+Ktens)*zetax2U*deltaU
rep_prsU = (c1-Ktens)/(c1+Ktens)*zetax2U*deltaU

end subroutine viscous_coeffs_and_rep_pressure_T2U

Expand Down

0 comments on commit cc0e716

Please sign in to comment.