Changeset 5836 for trunk/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90

Timestamp:

2015-10-26T15:49:40+01:00 (9 years ago)

Author:

cetlod

Message:

merge the simplification branch onto the trunk, see ticket #1612

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90

@@ -4 +4 @@
    !! Ocean floats :   trajectory computation
    !!======================================================================
-#if   defined key_floats   ||   defined key_esopa
+#if   defined key_floats
    !!----------------------------------------------------------------------
    !!   'key_floats'                                     float trajectories
@@ -125 +125 @@
 
             ! for a isobar float zsurfz is put to zero. The vertical velocity will be zero too.
-            zsurfz = e1t(iiloc(jfl),ijloc(jfl)) * e2t(iiloc(jfl),ijloc(jfl))
+            zsurfz =          e1e2t(iiloc(jfl),ijloc(jfl))
             zvol   = zsurfz * fse3t(iiloc(jfl),ijloc(jfl),-ikl(jfl))