Changeset 12584 for NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3

Timestamp:

2020-03-22T22:18:21+01:00 (4 years ago)

Author:

techene

Message:

OCE/DOM/domqe.F90: remove dom_qe_r3c call from dom_qe_sf_nxt and make it public, OCE/steplf.F90: add dom_qe_r3c and update r3 factors (bug)

Location:

NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE

Files:

• DOM/domqe.F90 (modified) (2 diffs)
• steplf.F90 (modified) (3 diffs)

NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/DOM/domqe.F90

@@ -42 +42 @@
    PUBLIC  dom_qe_init       ! called by domain.F90
    PUBLIC  dom_qe_zgr        ! called by isfcpl.F90
-   PUBLIC  dom_qe_sf_nxt     ! called by step.F90
-   PUBLIC  dom_qe_sf_update  ! called by step.F90
+   PUBLIC  dom_qe_sf_nxt     ! called by steplf.F90
+   PUBLIC  dom_qe_sf_update  ! called by steplf.F90
    PUBLIC  dom_qe_interpol   ! called by dynnxt.F90
    PUBLIC  dom_qe_r3c        ! called by steplf.F90
@@ -259 +259 @@
       ENDIF
 
-      IF( PRESENT(kcall) ) THEN
-         IF( kcall == 2 ) THEN
-            CALL dom_qe_r3c( ssh(:,:,Kaa), r3t(:,:,Kaa), r3u(:,:,Kaa), r3v(:,:,Kaa), r3f(:,:) )
-         ELSE
-            CALL dom_qe_r3c( ssh(:,:,Kaa), r3t(:,:,Kaa), r3u(:,:,Kaa), r3v(:,:,Kaa) )
-         ENDIF
-      ENDIF
 
       ! ******************************* !

NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/steplf.F90

@@ -185 +185 @@
 
                             CALL ssh_nxt       ( kstp, Nbb, Nnn, ssh, Naa )    ! after ssh (includes call to div_hor)
-      IF( .NOT.ln_linssh )  CALL dom_qe_sf_nxt( kstp, Nbb, Nnn,      Naa )    ! after vertical scale factors
+      IF( .NOT.ln_linssh )  CALL dom_qe_r3c    ( ssh(:,:,Naa), r3t(:,:,Naa), r3u(:,:,Naa), r3v(:,:,Naa) )
+      IF( .NOT.ln_linssh )  CALL dom_qe_sf_nxt ( kstp, Nbb, Nnn,      Naa )    ! after vertical scale factors
                             CALL wzv           ( kstp, Nbb, Nnn, ww,  Naa )    ! now cross-level velocity
       IF( ln_zad_Aimp )     CALL wAimp         ( kstp,      Nnn           )  ! Adaptive-implicit vertical advection partitioning
@@ -211 +212 @@
       IF( ln_dynspg_ts ) THEN                         ! vertical scale factors and vertical velocity need to be updated
                             CALL div_hor       ( kstp, Nbb, Nnn )                ! Horizontal divergence  (2nd call in time-split case)
-         IF(.NOT.ln_linssh) CALL dom_qe_sf_nxt( kstp, Nbb, Nnn, Naa, kcall=2 )  ! after vertical scale factors (update depth average component)
+         IF(.NOT.ln_linssh) CALL dom_qe_r3c    ( ssh(:,:,Naa), r3t(:,:,Naa), r3u(:,:,Naa), r3v(:,:,Naa), r3f(:,:) )
+         IF(.NOT.ln_linssh) CALL dom_qe_sf_nxt ( kstp, Nbb, Nnn, Naa, kcall=2 )  ! after vertical scale factors (update depth average component)
       ENDIF
                             CALL dyn_zdf    ( kstp, Nbb, Nnn, Nrhs, uu, vv, Naa  )  ! vertical diffusion
@@ -296 +298 @@
                          CALL tra_atf_lf    ( kstp, Nbb, Nnn, Naa, ts )                      ! time filtering of "now" tracer arrays
                          CALL dyn_atf_lf    ( kstp, Nbb, Nnn, Naa, uu, vv, e3t, e3u, e3v  )  ! time filtering of "now" velocities and scale factors
+                         r3t(:,:,Nnn) = r3t_f(:,:)
+                         r3u(:,:,Nnn) = r3u_f(:,:)
+                         r3v(:,:,Nnn) = r3v_f(:,:)
+
       !
       ! Swap time levels