Changeset 4325 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2013-11-29T16:27:48+01:00 (10 years ago)

Author:

cbricaud

Message:

dev_MERGE_2013: solve tickets 1192, 1193, 1194

Location:

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC

Files:

• LDF/ldfdyn_c2d.h90 (modified) (2 diffs)
• TRA/traadv_mle.F90 (modified) (1 diff)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c2d.h90

@@ -146 +146 @@
       INTEGER  ::   inum, iim, ijm            ! local integers
       INTEGER  ::   ifreq, il1, il2, ij, ii
+      INTEGER  ::   ijpt0,ijpt1
       REAL(wp) ::   zahmeq, zcoft, zcoff, zmsk
       CHARACTER (len=15) ::   clexp
@@ -373 +374 @@
       INTEGER ::   iim, ijm
       INTEGER ::   ifreq, il1, il2, ij, ii
+      INTEGER ::   ijpt0,ijpt1
       REAL(wp) ::   zahmeq, zcoft, zcoff, zmsk, zam20s
       CHARACTER (len=15) ::   clexp

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90

@@ -117 +117 @@
          END DO
       END DO
-      ikmax = MAX( MAXVAL( inml_mle(:,:) ), jpkm1 )                  ! max level of the computation
+      ikmax = MIN( MAXVAL( inml_mle(:,:) ), jpkm1 )                  ! max level of the computation
       !
       !