Changeset 14072 for NEMO/trunk/src/ABL/sbcabl.F90

Timestamp:

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

Author:

laurent

Message:

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

File:

• NEMO/trunk/src/ABL/sbcabl.F90 (modified) (6 diffs)

NEMO/trunk/src/ABL/sbcabl.F90

@@ -22 +22 @@
    USE sbc_oce        ! Surface boundary condition: ocean fields
    USE sbcblk         ! Surface boundary condition: bulk formulae
-   USE sbcblk_phy     ! Surface boundary condition: bulk formulae
+   USE sbc_phy        ! Catalog of functions for physical/meteorological parameters in the marine boundary layer
    USE dom_oce, ONLY  : tmask
    !
@@ -175 +175 @@
          IF(nn_amxl==0) WRITE(numout,*) 'Deardorff 80 length-scale '
          IF(nn_amxl==1) WRITE(numout,*) 'Modified Deardorff 80 length-scale '
-         IF(nn_amxl==2) WRITE(numout,*) 'Bougeault and Lacarrere length-scale '      
-         IF(nn_amxl==3) WRITE(numout,*) 'Rodier et al. length-scale '   
+         IF(nn_amxl==2) WRITE(numout,*) 'Bougeault and Lacarrere length-scale '
+         IF(nn_amxl==3) WRITE(numout,*) 'Rodier et al. length-scale '
          WRITE(numout,*) ' Minimum value of atmospheric TKE           = ',tke_min,' m^2 s^-2'
          WRITE(numout,*) ' Minimum value of atmospheric mixing length = ',mxl_min,' m'
@@ -320 +320 @@
       INTEGER ,         INTENT(in) ::   kt   ! ocean time step
       !!
-      REAL(wp), DIMENSION(jpi,jpj) ::   zssq, zcd_du, zsen, zevp
+      REAL(wp), DIMENSION(jpi,jpj) ::   zssq, zcd_du, zsen, zlat, zevp
 #if defined key_si3
       REAL(wp), DIMENSION(jpi,jpj) ::   zssqi, zcd_dui, zseni, zevpi
@@ -344 +344 @@
             &                sf(jp_uoatm)%fnow(:,:,1), sf(jp_voatm)%fnow(:,:,1),   &   !   <<= in
             &                sf(jp_qsr )%fnow(:,:,1) , sf(jp_qlw )%fnow(:,:,1) ,   &   !   <<= in
-            &                tsk_m, zssq, zcd_du, zsen, zevp                       )   !   =>> out
+            &                tsk_m, zssq, zcd_du, zsen, zlat, zevp                 )   !   =>> out
 
 #if defined key_si3
@@ -356 +356 @@
          !! 3 - Advance ABL variables from now (n) to after (n+1)
          !!-------------------------------------------------------------------------------------------
-   
+
          CALL abl_stp( kt, tsk_m, ssu_m, ssv_m, zssq,                          &   !   <<= in
             &              sf(jp_wndi)%fnow(:,:,:), sf(jp_wndj)%fnow(:,:,:),   &   !   <<= in
@@ -375 +375 @@
          !!-------------------------------------------------------------------------------------------
 
-         CALL blk_oce_2( tq_abl(:,:,2,nt_n,jp_ta),                            &
-            &            sf(jp_qsr )%fnow(:,:,1) , sf(jp_qlw )%fnow(:,:,1),   &
+         CALL blk_oce_2( tq_abl(:,:,2,nt_n,jp_ta), sf(jp_qlw )%fnow(:,:,1),   &
             &            sf(jp_prec)%fnow(:,:,1) , sf(jp_snow)%fnow(:,:,1),   &
-            &            tsk_m, zsen, zevp                                )
-   
+            &            tsk_m, zsen, zlat, zevp                                )
+
          CALL abl_rst_opn( kt )                       ! Open abl restart file (if necessary)
          IF( lrst_abl ) CALL abl_rst_write( kt )      ! -- abl restart file