Changeset 15036 for NEMO/branches/2021

Timestamp:

2021-06-21T15:27:34+02:00 (3 years ago)

Author:

techene

Message:

#2695 isf + qco OK in ISOMIP not in WED025

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE

Files:

• DOM/domzgr_substitute.h90 (modified) (2 diffs)
• DYN/dynhpg.F90 (modified) (4 diffs)
• ISF/isfstp.F90 (modified) (1 diff)

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DOM/domzgr_substitute.h90

@@ -25 +25 @@
 #   define  r1_hu(i,j,t)   (r1_hu_0(i,j)/(1._wp+r3u(i,j,t)))
 #   define  r1_hv(i,j,t)   (r1_hv_0(i,j)/(1._wp+r3v(i,j,t)))
+# if defined key_isf 
+#   define  gdept(i,j,k,t) ((gdept_0(i,j,k)-risfdep(i,j))*(1._wp+r3t(i,j,t))+risfdep(i,j))
+#   define  gdepw(i,j,k,t) ((gdepw_0(i,j,k)-risfdep(i,j))*(1._wp+r3t(i,j,t))+risfdep(i,j))
+# else
 #   define  gdept(i,j,k,t) (gdept_0(i,j,k)*(1._wp+r3t(i,j,t)))
 #   define  gdepw(i,j,k,t) (gdepw_0(i,j,k)*(1._wp+r3t(i,j,t)))
-#   define  gde3w(i,j,k)   (gdept_0(i,j,k)*(1._wp+r3t(i,j,Kmm))-ssh(i,j,Kmm))
+# endif
+#   define  gde3w(i,j,k)   (gdept(i,j,k,Kmm)-ssh(i,j,Kmm))
 #elif defined key_linssh
 #   define  e3t(i,j,k,t)   e3t_0(i,j,k)
@@ -47 +52 @@
 #endif
 !!----------------------------------------------------------------------
-

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DYN/dynhpg.F90

@@ -188 +188 @@
       IF( (.NOT.ln_hpg_isf .AND. ln_isfcav) .OR. (ln_hpg_isf .AND. .NOT.ln_isfcav) )                  &
          &   CALL ctl_stop( 'dyn_hpg_init : ln_hpg_isf=T requires ln_isfcav=T and vice versa' )  
-      !
-#if defined key_qco
-      IF( ln_hpg_isf ) THEN
-         CALL ctl_stop( 'dyn_hpg_init : key_qco and ln_hpg_isf not yet compatible' )
-      ENDIF
-#endif
       !
       !                               ! Set nhpg from ln_hpg_... flags & consistency check
@@ -550 +544 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk ) ::  zhpi, zhpj
       REAL(wp), DIMENSION(jpi,jpj,jpts) ::  zts_top
-      REAL(wp), DIMENSION(jpi,jpj)      ::  zrhdtop_oce
+      REAL(wp), DIMENSION(jpi,jpj)      ::  zrhd_top, zdep_top
       !!----------------------------------------------------------------------
       !
@@ -561 +555 @@
       ! usefull to reduce residual current in the test case ISOMIP with no melting
       DO ji = 1, jpi
-        DO jj = 1, jpj
-          ikt = mikt(ji,jj)
-          zts_top(ji,jj,1) = ts(ji,jj,ikt,1,Kmm)
-          zts_top(ji,jj,2) = ts(ji,jj,ikt,2,Kmm)
-        END DO
+         DO jj = 1, jpj
+            ikt = mikt(ji,jj)
+            zts_top(ji,jj,1) = ts(ji,jj,ikt,1,Kmm)
+            zts_top(ji,jj,2) = ts(ji,jj,ikt,2,Kmm)
+            zdep_top(ji,jj)  = MAX( risfdep(ji,jj) , gdept(ji,jj,1,Kmm) )
+         END DO
       END DO
-      CALL eos( zts_top, risfdep, zrhdtop_oce )
+!!st      CALL eos( zts_top, zdep_top, zrhd_top )
+      CALL eos( zts_top, risfdep, zrhd_top )
 
       !                     !===========================!
@@ -579 +575 @@
          !                          ! we assume ISF is in isostatic equilibrium
          zhpi(ji,jj,1) = zcoef0 * r1_e1u(ji,jj) * (   risfload(ji+1,jj) - risfload(ji,jj)  &
-            &                                       + 0.5_wp * ( ze3wi1 * ( rhd(ji+1,jj,ikti1) + zrhdtop_oce(ji+1,jj) )     &
-            &                                                  - ze3w   * ( rhd(ji  ,jj,ikt  ) + zrhdtop_oce(ji  ,jj) ) )   )
+            &                                       + 0.5_wp * ( ze3wi1 * ( rhd(ji+1,jj,ikti1) + zrhd_top(ji+1,jj) )     &
+            &                                                  - ze3w   * ( rhd(ji  ,jj,ikt  ) + zrhd_top(ji  ,jj) ) )   )
          zhpj(ji,jj,1) = zcoef0 * r1_e2v(ji,jj) * (   risfload(ji,jj+1) - risfload(ji,jj)  &
-            &                                       + 0.5_wp * ( ze3wj1 * ( rhd(ji,jj+1,iktj1) + zrhdtop_oce(ji,jj+1) )      &
-            &                                                  - ze3w   * ( rhd(ji,jj  ,ikt  ) + zrhdtop_oce(ji,jj  ) ) )   ) 
+            &                                       + 0.5_wp * ( ze3wj1 * ( rhd(ji,jj+1,iktj1) + zrhd_top(ji,jj+1) )      &
+            &                                                  - ze3w   * ( rhd(ji,jj  ,ikt  ) + zrhd_top(ji,jj  ) ) )   ) 
          !                          ! s-coordinate pressure gradient correction (=0 if z coordinate)
          zuap = -zcoef0 * ( rhd    (ji+1,jj,1) + rhd    (ji,jj,1) )   &

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/ISF/isfstp.F90

@@ -195 +195 @@
          !
          IF ( ln_isf ) THEN
+#if key_qco
+# if ! defined key_isf
+            CALL ctl_stop( 'STOP', 'isf_ctl: ice shelf requires both ln_isf=T AND key_isf activated' )
+# endif
+#endif
             WRITE(numout,*) '      Add debug print in isf module           ln_isfdebug     = ', ln_isfdebug
             WRITE(numout,*)