Changeset 7506 for branches/2016/v3_6_CMIP6_ice_diagnostics/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90

Timestamp:

2016-12-15T20:41:18+01:00 (8 years ago)

Author:

vancop

Message:

Commit a first set of modifications

File:

• branches/2016/v3_6_CMIP6_ice_diagnostics/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 (modified) (4 diffs)

branches/2016/v3_6_CMIP6_ice_diagnostics/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90

@@ -116 +116 @@
          tm_i(:,:)  = 0._wp
          tm_su(:,:) = 0._wp
+         tm_si(:,:) = 0._wp ! MV SIMIP 2016
          om_i (:,:) = 0._wp
          DO jl = 1, jpl
@@ -123 +124 @@
                   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
@@ -141 +143 @@
          tm_i  = tm_i  + rt0
          tm_su = tm_su + rt0
+         tm_si = tm_si + rt0
          !
       ENDIF
@@ -596 +599 @@
                wfx_snw(ji,jj)  = wfx_snw(ji,jj) - ( v_s(ji,jj,jl)   - zvs  ) * rhosn * r1_rdtice
                hfx_res(ji,jj)  = hfx_res(ji,jj) + ( e_s(ji,jj,1,jl) - zes ) * r1_rdtice ! W.m-2 <0
+
+               ! SIMIP snow melt diagnostic
+               diag_dms_mel_1d(ji) = diag_dms_mel(ji,jj) + ( v_s(ji,jj,jl) - zvs  ) * rhosn * r1_rdtice
+
             END DO
          END DO