Changeset 5179

Timestamp:

2015-03-26T14:04:33+01:00 (9 years ago)

Author:

clem

Message:

LIM3 bug fix on ice temperature output

File:

• trunk/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90

@@ -238 +238 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
-                  rswitch = MAX( 0._wp , SIGN( 1._wp , vt_i(ji,jj) - epsi20 ) )
-                  tm_i(ji,jj) = tm_i(ji,jj) + ( 1._wp - rswitch ) * rt0 +  &
-                     &                        rswitch * t_i(ji,jj,jk,jl) * v_i(ji,jj,jl)   &
-                     &                        / (  REAL(nlay_i,wp) * MAX( vt_i(ji,jj) , epsi20 )  )
-               END DO
-            END DO
-         END DO
-      END DO
+                  rswitch = MAX( 0._wp , SIGN( 1._wp , vt_i(ji,jj) - epsi10 ) )
+                  tm_i(ji,jj) = tm_i(ji,jj) + r1_nlay_i * rswitch * ( t_i(ji,jj,jk,jl) - rt0 ) * v_i(ji,jj,jl)  &
+                     &            / MAX( vt_i(ji,jj) , epsi10 )
+               END DO
+            END DO
+         END DO
+      END DO
+      tm_i = tm_i + rt0
       !
    END SUBROUTINE lim_var_glo2eqv
@@ -396 +396 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
-                  rswitch = MAX( 0._wp , SIGN( 1._wp , vt_i(ji,jj) - epsi06 ) )
-                  tm_i(ji,jj) = tm_i(ji,jj) + rswitch * t_i(ji,jj,jk,jl) * v_i(ji,jj,jl)   &
-                     &                      * r1_nlay_i / MAX( vt_i(ji,jj) , epsi06 )
-               END DO
-            END DO
-         END DO
-      END DO
+                  rswitch = MAX( 0._wp , SIGN( 1._wp , vt_i(ji,jj) - epsi10 ) )
+                  tm_i(ji,jj) = tm_i(ji,jj) + r1_nlay_i * rswitch * ( t_i(ji,jj,jk,jl) - rt0 ) * v_i(ji,jj,jl)  &
+                     &            / MAX( vt_i(ji,jj) , epsi10 )
+               END DO
+            END DO
+         END DO
+      END DO
+      tm_i = tm_i + rt0
 
    END SUBROUTINE lim_var_icetm