Changeset 4178 for branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2013-11-11T13:01:19+01:00 (10 years ago)

Author:

acc

Message:

Branch 2013/dev_r3858_NOC_ZTC, #863. Merge of Mercator time-stepping changes with z-tilde structure. Not yet fully operational with key_dynspg_ts but main structural changes are all in place.

File:

• branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (5 diffs)

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

@@ -99 +99 @@
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
                          CALL ssh_nxt       ( kstp )  ! after ssh
+      IF( lk_dynspg_ts ) THEN
+                                  CALL wzv_1         ( kstp )  ! now cross-level velocity 
+          ! In case the time splitting case, update almost all momentum trends here:
+          ! Note that the computation of vertical velocity above, hence "after" sea level
+          ! is necessary to compute momentum advection for the rhs of barotropic loop:
+                                  CALL eos    ( tsn, rhd, rhop )                 ! now in situ density for hpg computation
+          IF( ln_zps      )       CALL zps_hde( kstp, jpts, tsn, gtsu, gtsv,  &  ! zps: now hor. derivative
+                &                                          rhd, gru , grv  )     ! of t, s, rd at the last ocean level
+                                  CALL zdf_bfr( kstp )         ! bottom friction (if quadratic)
+
+                                  ua(:,:,:) = 0.e0             ! set dynamics trends to zero
+                                  va(:,:,:) = 0.e0
+          IF(  ln_asmiau .AND. &
+             & ln_dyninc       )  CALL dyn_asm_inc  ( kstp )   ! apply dynamics assimilation increment
+          IF( ln_neptsimp )       CALL dyn_nept_cor ( kstp )   ! subtract Neptune velocities (simplified)
+          IF( lk_bdy           )  CALL bdy_dyn3d_dmp( kstp )   ! bdy damping trends
+                                  CALL dyn_adv      ( kstp )   ! advection (vector or flux form)
+                                  CALL dyn_vor      ( kstp )   ! vorticity term including Coriolis
+                                  CALL dyn_ldf      ( kstp )   ! lateral mixing
+          IF( ln_neptsimp )       CALL dyn_nept_cor ( kstp )   ! add Neptune velocities (simplified)
+#if defined key_agrif
+          IF(.NOT. Agrif_Root())  CALL Agrif_Sponge_dyn        ! momentum sponge
+#endif
+                                  CALL dyn_hpg( kstp )         ! horizontal gradient of Hydrostatic pressure
+                                  CALL dyn_spg( kstp, indic )  ! surface pressure gradient
+
+                                  ua_sv(:,:,:) = ua(:,:,:)     ! save next velocities (not trends !)
+                                  va_sv(:,:,:) = va(:,:,:)
+      ENDIF
       IF( lk_vvl     )   CALL dom_vvl_sf_nxt( kstp )  ! after vertical scale factors
-                         CALL wzv           ( kstp )  ! now cross-level velocity
+                         CALL wzv_2         ( kstp )  ! now cross-level velocity (original)
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -109 +138 @@
       !
       !  VERTICAL PHYSICS
-                         CALL zdf_bfr( kstp )         ! bottom friction
+      IF( .NOT. lk_dynspg_ts ) CALL zdf_bfr( kstp )         ! bottom friction
 
       !                                               ! Vertical eddy viscosity and diffusivity coefficients
@@ -208 +237 @@
 
       ELSE                                                  ! centered hpg  (eos then time stepping)
-                             CALL eos    ( tsn, rhd, rhop, fsdept_n(:,:,:) )  ! now in situ density for hpg computation
-         IF( ln_zps      )   CALL zps_hde( kstp, jpts, tsn, gtsu, gtsv,  &    ! zps: now hor. derivative
+         IF ( .NOT. lk_dynspg_ts ) THEN                     ! eos already called in time-split case
+                                CALL eos    ( tsn, rhd, rhop, fsdept_n(:,:,:) )  ! now in situ density for hpg computation
+            IF( ln_zps      )   CALL zps_hde( kstp, jpts, tsn, gtsu, gtsv,  &    ! zps: now hor. derivative
             &                                          rhd, gru , grv  )      ! of t, s, rd at the last ocean level
+         ENDIF
          IF( ln_zdfnpc   )   CALL tra_npc( kstp )                ! update after fields by non-penetrative convection
                              CALL tra_nxt( kstp )                ! tracer fields at next time step
@@ -218 +249 @@
       ! Dynamics                                    (tsa used as workspace)
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+      IF( lk_dynspg_ts   )  THEN
+! revert to previously computed tendencies:
+! (not using ua, va as temporary arrays during tracers' update could avoid that)
+                               ua(:,:,:) = ua_sv(:,:,:)
+                               va(:,:,:) = va_sv(:,:,:)
+                               CALL dyn_bfr( kstp )         ! bottom friction
+                               CALL dyn_zdf( kstp )         ! vertical diffusion
+      ELSE
                                ua(:,:,:) = 0.e0             ! set dynamics trends to zero
                                va(:,:,:) = 0.e0
 
-      IF(  ln_asmiau .AND. &
-         & ln_dyninc       )   CALL dyn_asm_inc( kstp )     ! apply dynamics assimilation increment
-      IF( ln_bkgwri )          CALL asm_bkg_wri( kstp )     ! output background fields
-      IF( ln_neptsimp )        CALL dyn_nept_cor( kstp )    ! subtract Neptune velocities (simplified)
-      IF( lk_bdy           )   CALL bdy_dyn3d_dmp(kstp )    ! bdy damping trends
+        IF(  ln_asmiau .AND. &
+           & ln_dyninc      )  CALL dyn_asm_inc( kstp )     ! apply dynamics assimilation increment
+        IF( ln_bkgwri )        CALL asm_bkg_wri( kstp )     ! output background fields
+        IF( ln_neptsimp )      CALL dyn_nept_cor( kstp )    ! subtract Neptune velocities (simplified)
+        IF( lk_bdy          )  CALL bdy_dyn3d_dmp(kstp )    ! bdy damping trends
                                CALL dyn_adv( kstp )         ! advection (vector or flux form)
                                CALL dyn_vor( kstp )         ! vorticity term including Coriolis
                                CALL dyn_ldf( kstp )         ! lateral mixing
-      IF( ln_neptsimp )        CALL dyn_nept_cor( kstp )    ! add Neptune velocities (simplified)
-#if defined key_agrif
-      IF(.NOT. Agrif_Root())   CALL Agrif_Sponge_dyn        ! momemtum sponge
+        IF( ln_neptsimp )      CALL dyn_nept_cor( kstp )    ! add Neptune velocities (simplified)
+#if defined key_agrif
+        IF(.NOT. Agrif_Root()) CALL Agrif_Sponge_dyn        ! momemtum sponge
 #endif
                                CALL dyn_hpg( kstp )         ! horizontal gradient of Hydrostatic pressure
@@ -237 +276 @@
                                CALL dyn_zdf( kstp )         ! vertical diffusion
                                CALL dyn_spg( kstp, indic )  ! surface pressure gradient
+      ENDIF
                                CALL dyn_nxt( kstp )         ! lateral velocity at next time step