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

Timestamp:

2017-06-28T14:33:07+02:00 (7 years ago)

Author:

clem

Message:

merge with dev_r6859_LIM3_meltponds@r8179

File:

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

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

@@ -91 +91 @@
       et_i(:,:)  = SUM( SUM( e_i(:,:,:,:), dim=4 ), dim=3 )
 
+      ! MV MP 2016
+      IF ( ln_pnd ) THEN
+         at_ip(:,:) = SUM( a_ip, dim=3 )
+         vt_ip(:,:) = SUM( v_ip, dim=3 )
+      ENDIF
+      ! END MP 2016
+
       ! open water fraction
       DO jj = 1, jpj
@@ -244 +251 @@
       END DO
 
-      ! integrated values
+      ! integrated values 
       vt_i (:,:) = SUM( v_i, dim=3 )
       vt_s (:,:) = SUM( v_s, dim=3 )
       at_i (:,:) = SUM( a_i, dim=3 )
+
+      ! MV MP 2016
+      ! probably should resum for melt ponds ???
 
       !
@@ -516 +526 @@
       !!-------------------------------------------------------------------
       INTEGER  ::   ji, jj, jl, jk   ! dummy loop indices
-      REAL(wp) ::   zsal, zvi, zvs, zei, zes
+      REAL(wp) ::   zsal, zvi, zvs, zei, zes, zvp
       !!-------------------------------------------------------------------
       at_i (:,:) = 0._wp
@@ -556 +566 @@
                zvs  = v_s  (ji,jj,  jl)
                zes  = e_s  (ji,jj,1,jl)
+               IF ( ( nn_pnd_scheme > 0 ) .AND. ln_pnd_fw )   zvp  = v_ip (ji,jj  ,jl)
                !-----------------------------------------------------------------
                ! Zap snow energy 
@@ -572 +583 @@
                oa_i (ji,jj,jl) = oa_i (ji,jj,jl) * rswitch
                smv_i(ji,jj,jl) = smv_i(ji,jj,jl) * rswitch
+
+               ! MV MP 2016
+               IF ( ln_pnd ) THEN 
+                  a_ip (ji,jj,jl) = a_ip (ji,jj,jl) * rswitch
+                  v_ip (ji,jj,jl) = v_ip (ji,jj,jl) * rswitch
+                  IF ( ln_pnd_fw )   wfx_res(ji,jj)  = wfx_res(ji,jj) - ( v_ip(ji,jj,jl)  - zvp  ) * rhofw * r1_rdtice
+               ENDIF
+               ! END MV MP 2016
 
                ! update exchanges with ocean