Changeset 8061 for branches/2016/dev_r6859_LIM3_meltponds/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90

Timestamp:

2017-05-24T10:02:23+02:00 (7 years ago)

Author:

vancop

Message:

Quick commit on empirical melt ponds

File:

• branches/2016/dev_r6859_LIM3_meltponds/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 (modified) (10 diffs)

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

@@ -79 +79 @@
       ! With melt ponds, we have to diffuse them
       ! We hard code the number of variables to diffuse
-      ! since we can't put an IF ( ln_limMP ) for a declaration
+      ! since we can't put an IF ( nn_pnd_scheme ) for a declaration
       ! ideally, the ihdf_vars should probably be passed as an argument and
-      ! defined somewhere depending on ln_limMP
+      ! defined somewhere depending on nn_pnd_scheme
       ! END MV MP 2016
       INTEGER , PARAMETER                    ::   ihdf_vars  = 8 ! Number of variables in which we apply horizontal diffusion
@@ -217 +217 @@
                CALL lim_adv_umx( kt, zdt, zudy, zvdx, zcu_box, zcv_box, e_s(:,:,1,jl) )    ! Snow heat content
                ! MV MP 2016
-               IF ( ln_limMP ) THEN
+               IF ( nn_pnd_scheme > 0 ) THEN
                   CALL lim_adv_umx( kt, zdt, zudy, zvdx, zcu_box, zcv_box, a_ip(:,:,jl) )  ! Melt pond fraction
                   CALL lim_adv_umx( kt, zdt, zudy, zvdx, zcu_box, zcv_box, v_ip(:,:,jl) )  ! Melt pond volume
@@ -265 +265 @@
             END DO
             ! MV MP 2016
-            IF ( ln_limMP ) THEN
+            IF ( nn_pnd_scheme > 0 ) THEN
                z0ap  (:,:,jl)  = a_ip (:,:,jl) * e12t(:,:) ! Melt pond fraction
                z0vp  (:,:,jl)  = v_ip (:,:,jl) * e12t(:,:) ! Melt pond volume
@@ -365 +365 @@
                   END DO
                   ! MV MP 2016
-                  IF ( ln_limMP ) THEN
+                  IF ( nn_pnd_scheme > 0 ) THEN
                      CALL lim_adv_y( zusnit, v_ice, 1._wp, zarea, z0ap  (:,:,jl), sxap (:,:,jl),   &   !--- melt pond fraction ---
                      &                                         sxxap (:,:,jl), syap (:,:,jl), syyap (:,:,jl), sxyap (:,:,jl)  )
@@ -395 +395 @@
             END DO
             ! MV MP 2016
-            IF ( ln_limMP ) THEN
+            IF ( nn_pnd_scheme > 0 ) THEN
                a_ip  (:,:,jl)   = z0ap (:,:,jl) * r1_e12t(:,:)
                v_ip  (:,:,jl)   = z0vp (:,:,jl) * r1_e12t(:,:)
@@ -442 +442 @@
             zhdfptab(:,:,jm)= e_s  (:,:,1,jl); jm = jm + 1
             ! MV MP 2016
-            IF ( ln_limMP ) THEN
+            IF ( nn_pnd_scheme > 0 ) THEN
                zhdfptab(:,:,jm)= a_ip  (:,:,  jl); jm = jm + 1
                zhdfptab(:,:,jm)= v_ip  (:,:,  jl); jm = jm + 1
@@ -481 +481 @@
             e_s  (:,:,1,jl) = zhdfptab(:,:,jm); jm = jm + 1
             ! MV MP 2016
-            IF ( ln_limMP ) THEN
+            IF ( nn_pnd_scheme > 0 ) THEN
                a_ip (:,:,  jl) = zhdfptab(:,:,jm); jm = jm + 1
                v_ip (:,:,  jl) = zhdfptab(:,:,jm); jm = jm + 1
@@ -539 +539 @@
 
                         ! MV MP 2016
-                        IF ( ln_limMP ) THEN
+                        IF ( nn_pnd_scheme > 0 ) THEN
                            a_ip (ji,jj,jl)        = rswitch * a_ip (ji,jj,jl)
                            v_ip (ji,jj,jl)        = rswitch * v_ip (ji,jj,jl)
@@ -563 +563 @@
                a_i (ji,jj,jpl) = v_i(ji,jj,jpl) / MAX( ht_i(ji,jj,jpl) , epsi20 ) * rswitch
                ! MV MP 2016
-               IF ( ln_limMP ) THEN
+               IF ( nn_pnd_scheme > 0 ) THEN
                   ! correct pond fraction to avoid a_ip > a_i
                   a_ip(ji,jj,jpl) = a_ip(ji,jj,jpl) * a_i(ji,jj,jpl) / MAX( za_old , epsi20 ) * rswitch
@@ -598 +598 @@
 
       ! MV MP 2016 (remove once we get rid of a_i_frac and ht_i)
-      IF ( ln_limMP ) THEN
+      IF ( nn_pnd_scheme > 0 ) THEN
           at_ip(:,:) = SUM( a_ip(:,:,:), dim = 3 )
           vt_ip(:,:) = SUM( v_ip(:,:,:), dim = 3 )