Changeset 12566 for NEMO/branches/UKMO/NEMO_4.0.1_fix_cpl/src/OCE/SBC/sbccpl.F90

Timestamp:

2020-03-17T17:09:23+01:00 (4 years ago)

Author:

dancopsey

Message:

Move calculation of effective pond fraction to icethd_pnd.F90 (not sbccpl)

File:

• NEMO/branches/UKMO/NEMO_4.0.1_fix_cpl/src/OCE/SBC/sbccpl.F90 (modified) (3 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_fix_cpl/src/OCE/SBC/sbccpl.F90

@@ -2122 +2122 @@
       INTEGER, INTENT(in) ::   kt
       !
-      REAL(wp), PARAMETER :: pnd_lid_max = 0.015                  !  pond lid thickness above which the ponds disappear from the albedo calculation
-      REAL(wp), PARAMETER :: pnd_lid_min = 0.005                  !  pond lid thickness below which the full pond area is used in the albedo calculation
-                                                                  ! Note: these two variables are mirrored in icealb.F90 (maybe put them in one place...)
       !
       INTEGER ::   ji, jj, jl   ! dummy loop indices
@@ -2130 +2127 @@
       REAL(wp) ::   zumax, zvmax
       REAL(wp), DIMENSION(jpi,jpj)     ::   zfr_l, ztmp1, ztmp2, zotx1, zoty1, zotz1, zitx1, zity1, zitz1
-      REAL(wp), DIMENSION(jpi,jpj,jpl) ::   ztmp3, ztmp4   
-      REAL(wp), DIMENSION(jpi,jpj,jpl) ::   lfrac_pnd                 ! The fraction of the meltpond exposed (not inder a frozen lid)
+      REAL(wp), DIMENSION(jpi,jpj,jpl) ::   ztmp3, ztmp4
 
       !!----------------------------------------------------------------------
@@ -2348 +2344 @@
             CASE( 'yes' )  
 
-               ! Calculate how much meltpond is exposed (not under a frozen lid)
-               lfrac_pnd(:,:,1:jpl) = 1.0
-               WHERE( lh_ip(:,:,1:jpl) > pnd_lid_max )
-                    lfrac_pnd(:,:,1:jpl) = 0.0
-               END WHERE
-               WHERE( lh_ip(:,:,1:jpl) > pnd_lid_min .AND. lh_ip(:,:,1:jpl) <= pnd_lid_max )
-                    lfrac_pnd(:,:,1:jpl) = ( lh_ip(:,:,1:jpl) - pnd_lid_min ) / (pnd_lid_max - pnd_lid_min)
-               END WHERE
-
-               ztmp3(:,:,1:jpl) =  a_ip_frac(:,:,1:jpl) * lfrac_pnd(:,:,1:jpl)
+               ztmp3(:,:,1:jpl) =  a_ip_eff(:,:,1:jpl)
                ztmp4(:,:,1:jpl) =  h_ip(:,:,1:jpl)