Changeset 12726 for NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/ICE/icethd_pnd.F90

Timestamp:

2020-04-09T16:30:48+02:00 (4 years ago)

Author:

clem

Message:

clean useless variables

File:

• NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/ICE/icethd_pnd.F90 (modified) (6 diffs)

NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/ICE/icethd_pnd.F90

@@ -88 +88 @@
          !
          IF( a_i_1d(ji) > 0._wp .AND. t_su_1d(ji) >= rt0 ) THEN
-            a_ip_frac_1d(ji) = rn_apnd
             h_ip_1d(ji)      = rn_hpnd    
-            a_ip_1d(ji)      = a_ip_frac_1d(ji) * a_i_1d(ji)
+            a_ip_1d(ji)      = rn_apnd * a_i_1d(ji)
             h_il_1d(ji)      = 0._wp    ! no pond lids whatsoever
          ELSE
-            a_ip_frac_1d(ji) = 0._wp
             h_ip_1d(ji)      = 0._wp    
             a_ip_1d(ji)      = 0._wp
@@ -184 +182 @@
             !--- Remove ponds on thin ice or tiny ice fractions
             a_ip_1d(ji)      = 0._wp
-            a_ip_frac_1d(ji) = 0._wp
             h_ip_1d(ji)      = 0._wp
             h_il_1d(ji)      = 0._wp
@@ -261 +258 @@
             ! a_ip/a_i = a_ip_frac = h_ip / zaspect (cf Holland 2012, fitting SHEBA so that knowing v_ip we can distribute it to a_ip and h_ip)
             a_ip_1d(ji)      = MIN( a_i_1d(ji), SQRT( v_ip_1d(ji) * z1_aspect * a_i_1d(ji) ) ) ! make sure a_ip < a_i
-            a_ip_frac_1d(ji) = a_ip_1d(ji) / a_i_1d(ji)
-            h_ip_1d(ji)      = zaspect * a_ip_frac_1d(ji)
+            h_ip_1d(ji)      = zaspect * a_ip_1d(ji) / a_i_1d(ji)
 
             !---------------!            
@@ -269 +265 @@
             IF( ln_pnd_flush ) THEN
                ! height of top of the pond above sea-level
-               zhp = ( h_i_1d(ji) * ( rau0 - rhoi ) + h_ip_1d(ji) * ( rau0 - rhow * a_ip_frac_1d(ji) ) ) * r1_rau0
+               zhp = ( h_i_1d(ji) * ( rau0 - rhoi ) + h_ip_1d(ji) * ( rau0 - rhow * a_ip_1d(ji) / a_i_1d(ji) ) ) * r1_rau0
 
                ! Calculate the permeability of the ice (Assur 1958)
@@ -288 +284 @@
                !--- Set new pond area and depth ---! assuming linear relation between h_ip and a_ip_frac
                a_ip_1d(ji)      = MIN( a_i_1d(ji), SQRT( v_ip_1d(ji) * z1_aspect * a_i_1d(ji) ) ) ! make sure a_ip < a_i
-               a_ip_frac_1d(ji) = a_ip_1d(ji) / a_i_1d(ji)
-               h_ip_1d(ji)      = zaspect * a_ip_frac_1d(ji)
+               h_ip_1d(ji)      = zaspect * a_ip_1d(ji) / a_i_1d(ji)
 
             ENDIF
@@ -302 +297 @@
                IF ( h_il_1d(ji) > h_ip_1d(ji) * 10._wp ) THEN
                   a_ip_1d(ji)      = 0._wp
-                  a_ip_frac_1d(ji) = 0._wp
                   h_ip_1d(ji)      = 0._wp
                   h_il_1d(ji)      = 0._wp