Changeset 6403 for trunk/NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90

Timestamp:

2016-03-25T17:24:35+01:00 (8 years ago)

Author:

cetlod

Message:

trunk:new developments already included in 3.6 stable, see points 1, 2 and 4 of ticket #1678

File:

• trunk/NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90 (modified) (1 diff)

trunk/NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90

@@ -94 +94 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               IF( at_i(ji,jj) > rn_amax .AND. a_i(ji,jj,jl) > 0._wp ) THEN
-                  a_i (ji,jj,jl) = a_i (ji,jj,jl) * ( 1._wp - ( 1._wp - rn_amax / at_i(ji,jj) ) )
-                  oa_i(ji,jj,jl) = oa_i(ji,jj,jl) * ( 1._wp - ( 1._wp - rn_amax / at_i(ji,jj) ) )
+               IF( at_i(ji,jj) > rn_amax_2d(ji,jj) .AND. a_i(ji,jj,jl) > 0._wp ) THEN
+                  a_i (ji,jj,jl) = a_i (ji,jj,jl) * ( 1._wp - ( 1._wp - rn_amax_2d(ji,jj) / at_i(ji,jj) ) )
+                  oa_i(ji,jj,jl) = oa_i(ji,jj,jl) * ( 1._wp - ( 1._wp - rn_amax_2d(ji,jj) / at_i(ji,jj) ) )
                ENDIF
             END DO