fix rmin_surf definition

dngoldberg · Jun 7, 2021 · bbb6f8e · bbb6f8e
1 parent 8c1a266
commit bbb6f8e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/model/src/ini_nlfs_vars.F b/model/src/ini_nlfs_vars.F
@@ -148,7 +148,8 @@ SUBROUTINE INI_NLFS_VARS( myThid )
 
 #if defined(ALLOW_SHELFICE) && defined(ALLOW_SHELFICE_GROUNDED_ICE)
  Rmin_surf(i,j,bi,bj) =
- & R_low(i,j,bi,bj) + hFacInf*drF(ks)
+ & MAX(rF(ks+1),R_low(i,j,bi,bj)) + hFacInf*drF(ks)
+! & R_low(i,j,bi,bj) + hFacInf*drF(ks)
 ! Rmin_surf(i,j,bi,bj) =
 ! & MAX(rF(ks+1),R_low(i,j,bi,bj)) + hFacInf*drF(ks)
 #else

diff --git a/pkg/shelfice/shelfice_remesh_uv_mask.F b/pkg/shelfice/shelfice_remesh_uv_mask.F
@@ -295,8 +295,10 @@ SUBROUTINE SHELFICE_REMESH_UV_MASK(
  & Rmin_tmp = MAX(Rmin_tmp, R_low(i,j+1,bi,bj))
 
 #if defined(ALLOW_SHELFICE) && defined(ALLOW_SHELFICE_GROUNDED_ICE)
+! Rmin_surf(i,j,bi,bj) =
+! & R_low(i,j,bi,bj) + hFacInf*drF(ks)
  Rmin_surf(i,j,bi,bj) =
- & R_low(i,j,bi,bj) + hFacInf*drF(ks)
+ & MAX(rF(ks+1),R_low(i,j,bi,bj)) + hFacInf*drF(ks)
 #else
  Rmin_surf(i,j,bi,bj) =
  & MAX( MAX(rF(ks+1),R_low(i,j,bi,bj)) + hFacInf*drF(ks),