Changeset 8098 for branches/2016/dev_r6859_LIM3_meltponds/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90

Timestamp:

2017-05-30T13:17:53+02:00 (7 years ago)

Author:

vancop

Message:

Further melt pond work

File:

• branches/2016/dev_r6859_LIM3_meltponds/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 (modified) (4 diffs)

branches/2016/dev_r6859_LIM3_meltponds/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90

@@ -88 +88 @@
       REAL(wp)   :: ztmelts, zdh
       INTEGER    :: i_hemis, i_fill, jl0
-      REAL(wp)   :: zarg, zV, zconv, zdv, z1_jpl 
+      REAL(wp)   :: zarg, zV, zconv, zdv
       REAL(wp), POINTER, DIMENSION(:,:)   :: zswitch    ! ice indicator
       REAL(wp), POINTER, DIMENSION(:,:)   :: zht_i_ini, zat_i_ini, zvt_i_ini            !data from namelist or nc file
@@ -380 +380 @@
          ! MV MP 2016
          ! Melt pond volume and fraction
-         
-         z1_jpl =  1. / REAL(jpl)
-   
-         SELECT CASE ( nn_pnd_scheme )
-   
-            CASE ( 0 )           !--- Prescribed melt ponds
-   
-               DO jl = 1, jpl
-   
-                  a_ip(:,:,jl) = rn_apnd * z1_jpl * zswitch(:,:)
-                  v_ip(:,:,jl) = 0.1 * zswitch(:,:) * a_ip(:,:,jl)
-   
-               END DO
-   
-            CASE ( 1, 2 )        !--- Prognostic melt ponds
-   
-               DO jl = 1, jpl
-   
-                  a_ip(:,:,jl) = 0.1 * zswitch(:,:)
-                  v_ip(:,:,jl) = 0.1 * zswitch(:,:) * a_ip(:,:,jl)
-   
-               END DO
-   
-         END SELECT
-   
+         IF ( ln_pnd ) THEN
+
+            DO jl = 1, jpl
+               a_ip(:,:,jl) = 0.1 * zswitch(:,:)
+               v_ip(:,:,jl) = 0.1 * zswitch(:,:) * a_ip(:,:,jl)
+            END DO
+
+         ELSE
+
+            a_ip = 0._wp
+            v_ip = 0._wp
+
+         ENDIF
          ! END MV MP 2016
 
@@ -433 +421 @@
          a_ip(:,:,:)      = 0._wp
          v_ip(:,:,:)      = 0._wp
-         h_ip(:,:,:)      = 0._wp
-         a_ip_frac(:,:,:) = 0._wp
          ! END MV MP 2016
 
@@ -488 +474 @@
 
       ! MV MP 2016
-      IF ( nn_pnd_scheme >= 1 ) THEN
+      IF ( nn_pnd_scheme > 0 ) THEN
          sxap  (:,:,:) = 0._wp    ; sxvp  (:,:,:) = 0._wp 
          syap  (:,:,:) = 0._wp    ; syvp  (:,:,:) = 0._wp