Changeset 15529 for NEMO/trunk/src/OCE/DYN

Timestamp:

2021-11-23T16:00:19+01:00 (3 years ago)

Author:

techene

Message:

#2695 : isf+qco are now compatible

File:

• NEMO/trunk/src/OCE/DYN/dynhpg.F90 (modified) (4 diffs)

NEMO/trunk/src/OCE/DYN/dynhpg.F90

@@ -189 +189 @@
          &   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
@@ -555 +550 @@
       REAL(wp), DIMENSION(A2D(nn_hls),jpk ) ::  zhpi, zhpj
       REAL(wp), DIMENSION(A2D(nn_hls),jpts) ::  zts_top
-      REAL(wp), DIMENSION(A2D(nn_hls))      ::  zrhdtop_oce
+      REAL(wp), DIMENSION(A2D(nn_hls))      ::  zrhd_top, zdep_top
       !!----------------------------------------------------------------------
       !
@@ -569 +564 @@
          zts_top(ji,jj,1) = ts(ji,jj,ikt,1,Kmm)
          zts_top(ji,jj,2) = ts(ji,jj,ikt,2,Kmm)
-      END_2D
-      CALL eos( zts_top, risfdep, zrhdtop_oce )
+         zdep_top(ji,jj)  = MAX( risfdep(ji,jj) , gdept(ji,jj,1,Kmm) )
+      END_2D
+      CALL eos( zts_top, zdep_top, zrhd_top )
 
       !                     !===========================!
@@ -582 +578 @@
          !                          ! 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) )   &