Changeset 4427 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90

Timestamp:

2014-02-04T13:14:00+01:00 (10 years ago)

Author:

trackstand2

Message:

First files changed on last FINISS work package. Stephen's work although
commited by Andy P.

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) (3 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90

@@ -815 +815 @@
       !
       !                          !==   surface mixed layer mask   !
+#if defined key_z_first
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            DO jk = 1, jpkf          ! =1 inside the mixed layer, =0 otherwise
+#else
       DO jk = 1, jpkf                ! =1 inside the mixed layer, =0 otherwise
-# if ( defined key_vectopt_loop ) && ! ( defined key_z_first )
+# if defined key_vectopt_loop 
          DO jj = 1, 1
             DO ji = 1, jpij   ! vector opt. (forced unrolling)
@@ -823 +828 @@
             DO ji = 1, jpi
 # endif
+#endif
                ik = nmln(ji,jj) - 1
                IF( jk <= ik ) THEN   ;   omlmask(ji,jj,jk) = 1._wp
@@ -967 +973 @@
             DO jj = 2, jpjm1
                DO ji = 2, jpim1
-                  DO jk = 1, jpkf
+                  DO jk = 1, mbkmax(ji,jj)
 #else
             DO jk = 1, jpkf