Changeset 4387 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2014-01-31T14:48:39+01:00 (10 years ago)

Author:

jchanut

Message:

Correct call to dom_vvl_sf_nxt (impacts ztilde and dynspg_flt only): ticket #1209

File:

• branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (2 diffs)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -162 +162 @@
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
                          CALL ssh_nxt       ( kstp )  ! after ssh (includes call to div_cur)
-
-      IF( lk_dynspg_ts ) THEN
-          IF( lk_vvl     )        CALL dom_vvl_sf_nxt( kstp )  ! after vertical scale factors 
-                                  CALL wzv           ( kstp )  ! now cross-level velocity 
+      IF( lk_vvl     )   CALL dom_vvl_sf_nxt( kstp )  ! after vertical scale factors 
+                         CALL wzv           ( kstp )  ! now cross-level velocity 
+
+      IF( lk_dynspg_ts ) THEN 
           ! In case the time splitting case, update almost all momentum trends here:
           ! Note that the computation of vertical velocity above, hence "after" sea level
@@ -193 +193 @@
 
                                   CALL div_cur( kstp )         ! Horizontal divergence & Relative vorticity (2nd call in time-split case)
-      ENDIF
-      IF( lk_vvl     )   CALL dom_vvl_sf_nxt( kstp, kcall=2 )  ! after vertical scale factors
-                         CALL wzv           ( kstp )  ! now cross-level velocity 
+          IF( lk_vvl     )        CALL dom_vvl_sf_nxt( kstp, kcall=2 )  ! after vertical scale factors (update depth average component)
+                                  CALL wzv           ( kstp )  ! now cross-level velocity 
+      ENDIF
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>