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

Timestamp:

2020-12-09T22:26:04+01:00 (4 years ago)

Author:

techene

Message:

#2385 add key_linssh equivalent to ln_linssh using domzr_substitute

Location:

NEMO/trunk/src/OCE/DYN

Files:

• dynatf.F90 (modified) (1 diff)
• dynatf_qco.F90 (modified) (3 diffs)
• dynhpg.F90 (modified) (1 diff)
• dynvor.F90 (modified) (4 diffs)

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

@@ -60 +60 @@
    PUBLIC    dyn_atf   ! routine called by step.F90
 
-#if defined key_qco
+#if defined key_qco   ||   defined key_linssh
    !!----------------------------------------------------------------------
-   !!   'key_qco'      EMPTY ROUTINE     Quasi-Eulerian vertical coordonate
+   !!   'key_qco'                        Quasi-Eulerian vertical coordinate
+   !!       OR         EMPTY MODULE
+   !!   'key_linssh'                        Fix in time vertical coordinate
    !!----------------------------------------------------------------------
 CONTAINS
 
-   SUBROUTINE dyn_atf ( kt, Kbb, Kmm, Kaa, puu, pvv, pe3t, pe3u, pe3v )
+   SUBROUTINE dyn_atf( kt, Kbb, Kmm, Kaa, puu, pvv, pe3t, pe3u, pe3v )
       INTEGER                             , INTENT(in   ) :: kt               ! ocean time-step index
       INTEGER                             , INTENT(in   ) :: Kbb, Kmm, Kaa    ! before and after time level indices

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

@@ -66 +66 @@
 CONTAINS
 
-   SUBROUTINE dyn_atf_qco ( kt, Kbb, Kmm, Kaa, puu, pvv )
+   SUBROUTINE dyn_atf_qco( kt, Kbb, Kmm, Kaa, puu, pvv )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE dyn_atf_qco  ***
@@ -196 +196 @@
       ! JC: Would be more clever to swap variables than to make a full vertical
       ! integration
-      ! CAUTION : calculation need to be done in the same way than see GM  
+      ! CAUTION : calculation need to be done in the same way than see GM
+#if defined key_linssh
+      uu_b(:,:,Kaa) = e3u(:,:,1,Kaa) * puu(:,:,1,Kaa) * umask(:,:,1)
+      uu_b(:,:,Kmm) = e3u(:,:,1,Kmm) * puu(:,:,1,Kmm) * umask(:,:,1)
+      vv_b(:,:,Kaa) = e3v(:,:,1,Kaa) * pvv(:,:,1,Kaa) * vmask(:,:,1)
+      vv_b(:,:,Kmm) = e3v(:,:,1,Kmm) * pvv(:,:,1,Kmm) * vmask(:,:,1)
+      DO jk = 2, jpkm1
+         uu_b(:,:,Kaa) = uu_b(:,:,Kaa) + e3u(:,:,jk,Kaa) * puu(:,:,jk,Kaa) * umask(:,:,jk)
+         uu_b(:,:,Kmm) = uu_b(:,:,Kmm) + e3u(:,:,jk,Kmm) * puu(:,:,jk,Kmm) * umask(:,:,jk)
+         vv_b(:,:,Kaa) = vv_b(:,:,Kaa) + e3v(:,:,jk,Kaa) * pvv(:,:,jk,Kaa) * vmask(:,:,jk)
+         vv_b(:,:,Kmm) = vv_b(:,:,Kmm) + e3v(:,:,jk,Kmm) * pvv(:,:,jk,Kmm) * vmask(:,:,jk)
+      END DO
+      uu_b(:,:,Kaa) = uu_b(:,:,Kaa) * r1_hu(:,:,Kaa)
+      vv_b(:,:,Kaa) = vv_b(:,:,Kaa) * r1_hv(:,:,Kaa)
+      uu_b(:,:,Kmm) = uu_b(:,:,Kmm) * r1_hu(:,:,Kmm)
+      vv_b(:,:,Kmm) = vv_b(:,:,Kmm) * r1_hv(:,:,Kmm)
+#else
       uu_b(:,:,Kaa) = e3u(:,:,1,Kaa) * puu(:,:,1,Kaa) * umask(:,:,1)
       uu_b(:,:,Kmm) = (e3u_0(:,:,1) * ( 1._wp + r3u_f(:,:) * umask(:,:,1) )) * puu(:,:,1,Kmm) * umask(:,:,1)
@@ -211 +227 @@
       uu_b(:,:,Kmm) = uu_b(:,:,Kmm) * (r1_hu_0(:,:)/( 1._wp + r3u_f(:,:) ))
       vv_b(:,:,Kmm) = vv_b(:,:,Kmm) * (r1_hv_0(:,:)/( 1._wp + r3v_f(:,:) ))
+#endif
       !
       IF( .NOT.ln_dynspg_ts ) THEN        ! output the barotropic currents

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

@@ -186 +186 @@
          &   CALL ctl_stop( 'dyn_hpg_init : non-linear free surface incompatible with hpg_zco or hpg_zps' )
       !
-      IF( .NOT. (ln_hpg_isf.AND.ln_isfcav) )                  &
+      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' )  
       !

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

@@ -406 +406 @@
          END SELECT
          !
-#if defined key_qco
+#if defined key_qco   ||   defined key_linssh
          DO_2D( 1, 0, 1, 0 )                 !==  potential vorticity  ==!   (key_qco)
             zwz(ji,jj) = zwz(ji,jj) / e3f_vor(ji,jj,jk)
@@ -533 +533 @@
          !
          !
-#if defined key_qco
+#if defined key_qco   ||   defined key_linssh
          DO_2D( 1, 0, 1, 0 )                 !==  potential vorticity  ==!   (key_qco)
             zwz(ji,jj) = zwz(ji,jj) / e3f_vor(ji,jj,jk)
@@ -624 +624 @@
          !                                             ! ===============
          !
-#if defined key_qco
+#if defined key_qco   ||   defined key_linssh
          DO_2D( 1, 0, 1, 0 )                 ! == reciprocal of e3 at F-point (key_qco)
             z1_e3f(ji,jj) = 1._wp / e3f_vor(ji,jj,jk)
@@ -952 +952 @@
          !
       END SELECT
-#if defined key_qco
-      SELECT CASE( nvor_scheme )    ! qco case: pre-computed a specific e3f_0 for some vorticity schemes
+#if defined key_qco   ||   defined key_linssh
+      SELECT CASE( nvor_scheme )    ! qco or linssh cases : pre-computed a specific e3f_0 for some vorticity schemes
       CASE( np_ENS , np_ENE , np_EEN , np_MIX )
          !