Changes between Version 15 and Version 16 of ticket/0863

Timestamp:

2011-10-13T18:40:34+02:00 (13 years ago)

Author:

mlelod

Comment:

--

ticket/0863

@@ -18 +18 @@
 Next sea surface height is first computed. The latter is necessary before computing next vertical scale factors. And now vertical velocity (eulerian cross-level velocity) can then be calculated. [[BR]] After this sequence, tracers and dynamics terms can be computed. Next tracers and dynamics fields are updated.[[BR]] Finally, after the swap of those fields, sea surface height and vertical scale factors can be swaped.
 
-Calling sequence in `step` before tracers and dynamics:[[BR]]
+Calling sequence in `step` :[[BR]]
 
 {{{
-               CALL ssh_nxt       ( kstp )
-IF( lk_vvl )   CALL dom_vvl_sf_nxt( kstp )
-               CALL wzv           ( kstp )
-}}}
-Calling sequence in `step` after tracers and dynamics:[[BR]]
+      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+      ! Update data, open boundaries, surface boundary condition (including sea-ice)
+      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+          .
+          .
+          .
+      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+      !  Ocean dynamics : hdiv, rot, ssh, e3, wn
+      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+                         CALL ssh_nxt       ( kstp )  ! after ssh
+      IF( lk_vvl     )   CALL dom_vvl_sf_nxt( kstp )  ! after vertical scale factors
+                         CALL wzv           ( kstp )  ! now cross-level velocity
 
-{{{
-               CALL ssh_swp       ( kstp )
-IF( lk_vvl )   CALL dom_vvl_sf_swp( kstp )
+      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+      ! Ocean physics update                (ua, va, ta, sa used as workspace)
+      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+          .
+          .
+          .
+      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+      ! Passive Tracer Model
+      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+          .
+          .
+          .
+      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+      ! Active tracers                              (ua, va used as workspace)
+      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+          .
+          .
+          .
+      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+      ! Dynamics                                    (ta, sa used as workspace)
+      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+          .
+          .
+          .
+                               CALL ssh_swp( kstp )         ! swap of sea surface height
+      IF( lk_vvl           )   CALL dom_vvl_sf_swp( kstp )  ! swap of vertical scale factors
 }}}
 == Newly created , renamed and suppressed variables ==
- * 2D fields `sshu_b`, `sshu_n`,` sshu_a`, `sshv_b`, `sshv_n`, `sshv_a` and `sshf_n` needed for the previous z_star implementation are suppressed.
+ * 2D fields `sshu_b`, `sshu_n`,` sshu_a`, `sshv_b`, `sshv_n`, `sshv_a` and `sshf_n` needed for the previous z_star implementation are suppressed.
  * 3D fields `mut`, `muu`, `muv` and `muf` and 2D fields `ee_t`, `ee_u`, `ee_v`, `ee_w` needed for the previous z_star implementation are also suppressed.
  * `e3t_1`, `e3u_1`, `e3v_1`, `e3w_1`, `e3f_1`, `gdep3w_1`, `gdept_1` and `gdepw_1` are renamed with `_n` instead of `_1.`