Changeset 12154 for NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ABL/sbcabl.F90

Timestamp:

2019-12-10T15:44:23+01:00 (4 years ago)

Author:

cetlod

Message:

commit

Location:

NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/ABL

Files:

• . (copied) (copied from NEMO/branches/2019/dev_r11265_ASINTER-01_Guillaume_ABL1D/src/ABL)
• sbcabl.F90 (modified) (6 diffs)

NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/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 dom_oce, ONLY  : tmask
    !
@@ -93 +94 @@
       IF( nn_dyn_restore  < 0   .OR.  nn_dyn_restore  > 2 )   &
          &                 CALL ctl_stop( 'abl_init : bad flag, nn_dyn_restore must be  0, 1 or 2 ' )            
-      !
+
       !!---------------------------------------------------------------------
       !! Control prints
@@ -215 +216 @@
             WRITE(numout,*) ' ABL Maximum value for dynamics restoring = ',zcff1
             ! Check that restoring coefficients are between 0 and 1
-            !IF( zcff1 > 1._wp .OR. zcff1 < 0._wp )   &
-            !IF( zcff1 > nn_fsbc .OR. zcff1 < 0._wp )   &
             IF( zcff1 - nn_fsbc > 0.001_wp .OR. zcff1 < 0._wp )   &
                &                   CALL ctl_stop( 'abl_init : wrong value for rn_ldyn_max' )
-            !IF( zcff  > 1._wp .OR. zcff  < 0._wp )   &
             IF( zcff  - nn_fsbc > 0.001_wp .OR. zcff  < 0._wp )   &
                &                   CALL ctl_stop( 'abl_init : wrong value for rn_ldyn_min' )
@@ -236 +234 @@
          WRITE(numout,*) ' ABL Maximum value for tracers restoring = ',zcff1
          ! Check that restoring coefficients are between 0 and 1
-         !IF( zcff1 > 1._wp .OR. zcff1 < 0._wp )   &
          IF( zcff1 - nn_fsbc > 0.001_wp .OR. zcff1 < 0._wp )   &
             &                   CALL ctl_stop( 'abl_init : wrong value for rn_ltra_max' )
-         !IF( zcff  > 1._wp .OR. zcff  < 0._wp )   &
          IF( zcff  - nn_fsbc > 0.001_wp .OR. zcff  < 0._wp )   &
             &                   CALL ctl_stop( 'abl_init : wrong value for rn_ltra_min' )
@@ -294 +290 @@
          tke_abl(:,:,:,nt_a     ) = 0._wp
       ENDIF
+
+      rhoa(:,:) = rho_air( tq_abl(:,:,2,nt_n,jp_ta), tq_abl(:,:,2,nt_n,jp_qa), sf(jp_slp)%fnow(:,:,1) ) !!GS: rhoa must be (re)computed here here to avoid division by zero in blk_ice_1 (TBI)
      
    END SUBROUTINE sbc_abl_init
@@ -341 +339 @@
          &                tq_abl(:,:,2,nt_n,jp_ta), tq_abl(:,:,2,nt_n,jp_qa),   &   !   <<= in
          &                sf(jp_slp )%fnow(:,:,1) , sst_m, ssu_m, ssv_m     ,   &   !   <<= in
+         &                sf(jp_qsr )%fnow(:,:,1) , sf(jp_qlw )%fnow(:,:,1) ,   &   !   <<= in
          &                zssq, zcd_du, zsen, zevp                          )       !   =>> out