Changeset 14072 for NEMO/trunk/src/ICE/icesbc.F90

Timestamp:

2020-12-04T08:48:38+01:00 (4 years ago)

Author:

laurent

Message:

Merging branch "2020/dev_r13648_ASINTER-04_laurent_bulk_ice", ticket #2369

File:

• NEMO/trunk/src/ICE/icesbc.F90 (modified) (14 diffs)

NEMO/trunk/src/ICE/icesbc.F90

@@ -59 +59 @@
       !!
       INTEGER  ::   ji, jj                 ! dummy loop index
-      REAL(wp), DIMENSION(jpi,jpj) ::   zutau_ice, zvtau_ice 
+      REAL(wp), DIMENSION(jpi,jpj) ::   zutau_ice, zvtau_ice
       !!-------------------------------------------------------------------
       !
@@ -72 +72 @@
       SELECT CASE( ksbc )
          CASE( jp_usr     )   ;    CALL usrdef_sbc_ice_tau( kt )                 ! user defined formulation
-         CASE( jp_blk     )   ;    CALL blk_ice_1( sf(jp_wndi)%fnow(:,:,1), sf(jp_wndj)%fnow(:,:,1),   &
-            &                                      sf(jp_tair)%fnow(:,:,1), sf(jp_humi)%fnow(:,:,1),   &
+      CASE( jp_blk     )
+         CALL blk_ice_1( sf(jp_wndi)%fnow(:,:,1), sf(jp_wndj)%fnow(:,:,1),   &
+            &                                      theta_air_zt(:,:), q_air_zt(:,:),   &   ! #LB: known from "sbc_oce" module...
             &                                      sf(jp_slp )%fnow(:,:,1), u_ice, v_ice, tm_su    ,   &   ! inputs
-            &                                      putaui = utau_ice, pvtaui = vtau_ice            )       ! outputs                             
+            &                                      putaui = utau_ice, pvtaui = vtau_ice            )       ! outputs
  !        CASE( jp_abl     )    utau_ice & vtau_ice are computed in ablmod
          CASE( jp_purecpl )   ;    CALL sbc_cpl_ice_tau( utau_ice , vtau_ice )   ! Coupled      formulation
@@ -93 +94 @@
    END SUBROUTINE ice_sbc_tau
 
-   
+
    SUBROUTINE ice_sbc_flx( kt, ksbc )
       !!-------------------------------------------------------------------
@@ -108 +109 @@
       !!                dqns_ice                                 = non solar  heat sensistivity                  [W/m2]
       !!                qemp_oce, qemp_ice, qprec_ice, qevap_ice = sensible heat (associated with evap & precip) [W/m2]
-      !!            + some fields that are not used outside this module: 
+      !!            + some fields that are not used outside this module:
       !!                qla_ice                                  = latent heat flux over ice                     [W/m2]
       !!                dqla_ice                                 = latent heat sensistivity                      [W/m2]
@@ -118 +119 @@
       !
       INTEGER  ::   ji, jj, jl      ! dummy loop index
-      REAL(wp) ::   zmiss_val       ! missing value retrieved from xios 
+      REAL(wp) ::   zmiss_val       ! missing value retrieved from xios
       REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   zalb, zmsk00      ! 2D workspace
       !!--------------------------------------------------------------------
@@ -142 +143 @@
                                   CALL usrdef_sbc_ice_flx( kt, h_s, h_i )
       CASE( jp_blk, jp_abl )  !--- bulk formulation & ABL formulation
-                                  CALL blk_ice_2    ( t_su, h_s, h_i, alb_ice, sf(jp_tair)%fnow(:,:,1), sf(jp_humi)%fnow(:,:,1),    &
-            &                                           sf(jp_slp)%fnow(:,:,1), sf(jp_qlw)%fnow(:,:,1), sf(jp_prec)%fnow(:,:,1), sf(jp_snow)%fnow(:,:,1) )    ! 
+                                  CALL blk_ice_2    ( t_su, h_s, h_i, alb_ice, &
+            &                                         theta_air_zt(:,:), q_air_zt(:,:),    &   ! #LB: known from "sbc_oce" module...
+            &                                         sf(jp_slp)%fnow(:,:,1), sf(jp_qlw)%fnow(:,:,1), &
+            &                                         sf(jp_prec)%fnow(:,:,1), sf(jp_snow)%fnow(:,:,1) )
          IF( ln_mixcpl        )   CALL sbc_cpl_ice_flx( picefr=at_i_b, palbi=alb_ice, psst=sst_m, pist=t_su, phs=h_s, phi=h_i )
          IF( nn_flxdist /= -1 )   CALL ice_flx_dist   ( t_su, alb_ice, qns_ice, qsr_ice, dqns_ice, evap_ice, devap_ice, nn_flxdist )
@@ -163 +166 @@
             zalb  (:,:) = rn_alb_oce
          ELSEWHERE
-            zmsk00(:,:) = 1._wp            
+            zmsk00(:,:) = 1._wp
             zalb  (:,:) = SUM( alb_ice * a_i_b, dim=3 ) / at_i_b
          END WHERE
@@ -185 +188 @@
       !!                  ***  ROUTINE ice_flx_dist  ***
       !!
-      !! ** Purpose :   update the ice surface boundary condition by averaging 
+      !! ** Purpose :   update the ice surface boundary condition by averaging
       !!              and/or redistributing fluxes on ice categories
       !!
@@ -192 +195 @@
       !! ** Action  :   depends on k_flxdist
       !!                = -1  Do nothing (needs N(cat) fluxes)
-      !!                =  0  Average N(cat) fluxes then apply the average over the N(cat) ice 
+      !!                =  0  Average N(cat) fluxes then apply the average over the N(cat) ice
       !!                =  1  Average N(cat) fluxes then redistribute over the N(cat) ice
       !!                                                 using T-ice and albedo sensitivity
@@ -222 +225 @@
       ELSEWHERE                      ; z1_at_i(:,:) = 0._wp
       END WHERE
-      
+
       SELECT CASE( k_flxdist )       !==  averaged on all ice categories  ==!
       !
       CASE( 0 , 1 )
          !
-         ALLOCATE( z_qns_m(jpi,jpj), z_qsr_m(jpi,jpj), z_dqn_m(jpi,jpj), z_evap_m(jpi,jpj), z_devap_m(jpi,jpj) )  
+         ALLOCATE( z_qns_m(jpi,jpj), z_qsr_m(jpi,jpj), z_dqn_m(jpi,jpj), z_evap_m(jpi,jpj), z_devap_m(jpi,jpj) )
          !
          z_qns_m  (:,:) = SUM( a_i(:,:,:) * pqns_ice  (:,:,:) , dim=3 ) * z1_at_i(:,:)
@@ -242 +245 @@
          END DO
          !
-         DEALLOCATE( z_qns_m, z_qsr_m, z_dqn_m, z_evap_m, z_devap_m )  
+         DEALLOCATE( z_qns_m, z_qsr_m, z_dqn_m, z_evap_m, z_devap_m )
          !
       END SELECT
@@ -250 +253 @@
       CASE( 1 , 2 )
          !
-         ALLOCATE( zalb_m(jpi,jpj), ztem_m(jpi,jpj) )  
+         ALLOCATE( zalb_m(jpi,jpj), ztem_m(jpi,jpj) )
          !
          zalb_m(:,:) = SUM( a_i(:,:,:) * palb_ice(:,:,:) , dim=3 ) * z1_at_i(:,:)
@@ -260 +263 @@
          END DO
          !
-         DEALLOCATE( zalb_m, ztem_m )  
+         DEALLOCATE( zalb_m, ztem_m )
          !
       END SELECT
@@ -272 +275 @@
       !!
       !! ** Purpose :   Physical constants and parameters linked to the ice dynamics
-      !!      
+      !!
       !! ** Method  :   Read the namsbc namelist and check the ice-dynamic
       !!              parameter values called at the first timestep (nit000)