Changeset 10957 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DYN/dynnxt.F90

Timestamp:

2019-05-10T12:26:38+02:00 (5 years ago)

Author:

davestorkey

Message:

2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps : BDY module (including some removal of redundant code). Tested in AMM12 and ORCA1 (not full SETTE test at this stage).

File:

• NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DYN/dynnxt.F90 (modified) (4 diffs)

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DYN/dynnxt.F90

@@ -50 +50 @@
 #if defined key_agrif
    USE agrif_oce_interp
-#endif
+#endif   
 
    IMPLICIT NONE
@@ -64 +64 @@
 CONTAINS
 
-   SUBROUTINE dyn_nxt ( kt, Kmm )
+   SUBROUTINE dyn_nxt ( kt, Kbb, Kmm, Kaa )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE dyn_nxt  ***
@@ -92 +92 @@
       !!               un,vn   now horizontal velocity of next time-step
       !!----------------------------------------------------------------------
-      INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
-      INTEGER, INTENT( in ) ::   Kmm     ! time level index
+      INTEGER, INTENT( in ) ::   kt             ! ocean time-step index
+      INTEGER, INTENT( in ) ::   Kbb, Kmm, Kaa  ! time level indices
       !
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
@@ -148 +148 @@
       !
       !                                !* BDY open boundaries
-      IF( ln_bdy .AND. ln_dynspg_exp )   CALL bdy_dyn( kt )
-      IF( ln_bdy .AND. ln_dynspg_ts  )   CALL bdy_dyn( kt, dyn3d_only=.true. )
+      !! IMMERSE development : Following the general pattern for the new code we want to pass in the 
+      !!                       velocities to bdy_dyn as arguments so here we use "uu" and "vv" even 
+      !!                       though we haven't converted the velocity names in the rest of dynnxt.F90
+      !!                       because it will be completely rewritten. DS.
+      IF( ln_bdy .AND. ln_dynspg_exp )   CALL bdy_dyn( kt, Kbb, uu, vv, Kaa )
+      IF( ln_bdy .AND. ln_dynspg_ts  )   CALL bdy_dyn( kt, Kbb, uu, vv, Kaa, dyn3d_only=.true. )
 
 !!$   Do we need a call to bdy_vol here??