Changeset 8239 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90

Timestamp:

2017-06-28T17:55:50+02:00 (7 years ago)

Author:

clem

Message:

merge with v3_6_CMIP6_ice_diagnostics@r8238

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 (modified) (3 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90

@@ -120 +120 @@
          tm_i(:,:)  = 0._wp
          tm_su(:,:) = 0._wp
+         tm_si(:,:) = 0._wp
          om_i (:,:) = 0._wp
          DO jl = 1, jpl
@@ -127 +128 @@
                   rswitch      = MAX( 0._wp , SIGN( 1._wp , at_i(ji,jj) - epsi10 ) )
                   tm_su(ji,jj) = tm_su(ji,jj) + rswitch * ( t_su(ji,jj,jl) - rt0 ) * a_i(ji,jj,jl) / MAX( at_i(ji,jj) , epsi10 )
-                  om_i (ji,jj) = om_i (ji,jj) + rswitch *   oa_i(ji,jj,jl)                         / MAX( at_i(ji,jj) , epsi10 )
+                  tm_si(ji,jj) = tm_si(ji,jj) + rswitch * ( t_si(ji,jj,jl) - rt0 ) * a_i(ji,jj,jl) / MAX( at_i(ji,jj) , epsi10 )
+                  om_i (ji,jj) = om_i (ji,jj) + rswitch *   oa_i(ji,jj,jl)                         / MAX( at_i(ji,jj) , epsi06 )
                END DO
             END DO
@@ -145 +147 @@
          tm_i  = tm_i  + rt0
          tm_su = tm_su + rt0
+         tm_si = tm_si + rt0
          !
       ENDIF