Changeset 11334 for NEMO/branches/2019/dev_r11265_ASINTER-01_Guillaume_ABL1D/src/ABL/sbcabl.F90

Timestamp:

2019-07-24T11:20:42+02:00 (5 years ago)

Author:

flemarie

Message:

Follow-on to the ABL implementation (see ticket #2131)

• Modification of diawri.F90 to output ABL variables with IOIPSL (i.e. without key_iomput)
• Modification of ice_var_agg in icevar.F90 to allow the use of tm_su in ABL and bulk
• Error handling in case ln_abl = .true. and ABL sources were not compiled
• ABL now works with SI3 considering an average over ice categories
• Update reference namelist to avoid runtime warnings due to nam_tide

• Sanity checks with ORCA2 for the following configurations :

1 - ABL src + ln_blk = .true.
2 - ABL src + ln_abl = .true.
3 - no ABL src + ln_blk = .true.

All configurations are MPP reproducible and configurations 1 and 3 results are identical

File:

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

NEMO/branches/2019/dev_r11265_ASINTER-01_Guillaume_ABL1D/src/ABL/sbcabl.F90

@@ -30 +30 @@
    USE lbclnk         ! ocean lateral boundary conditions (or mpp link)
    USE prtctl         ! Print control
-
+#if defined key_si3
+   USE ice    , ONLY : u_ice, v_ice, tm_su, ato_i      ! ato_i = total open water fractional area
+   USE sbc_ice, ONLY : wndm_ice, utau_ice, vtau_ice
+#endif   
+#if ! defined key_iomput
+   USE diawri    , ONLY : dia_wri_alloc_abl
+#endif
    IMPLICIT NONE
    PRIVATE
@@ -141 +147 @@
       CALL iom_get( inum, jpdom_unknown, 'ghw_abl', ghw_abl(:) )
       CALL iom_close( inum )
+     
+#if ! defined key_iomput
+     IF( dia_wri_alloc_abl()  /= 0 ) CALL ctl_stop( 'STOP', 'abl_init : unable to allocate arrays' )
+#endif
 
       IF(lwp) THEN
@@ -303 +313 @@
       !!
       REAL(wp), DIMENSION(jpi,jpj) ::   zssq, zcd_du, zsen, zevp
+#if defined key_si3
+      REAL(wp), DIMENSION(jpi,jpj) ::   zssqi, zcd_dui, zseni, zevpi
+#endif     
       INTEGER                      ::   jbak, jbak_dta, ji, jj
       !!---------------------------------------------------------------------
@@ -319 +332 @@
               &           sf(jp_slp )%fnow(:,:,1), sst_m, ssu_m, ssv_m, &
               &              zssq, zcd_du, zsen, zevp )
-  
+
+#if defined key_si3
+     CALL blk_ice_1( u_abl(:,:,2,nt_n), v_abl(:,:,2,nt_n), tq_abl(:,:,2,nt_n,jp_ta), tq_abl(:,:,2,nt_n,jp_qa),   &
+        &            sf(jp_slp)%fnow(:,:,1), u_ice, v_ice,                                          &
+         &            pseni=zseni, pevpi=zevpi, ptsui=tm_su, pssqi=zssqi, pcd_dui=zcd_dui )   ! outputs  
+#endif  
+
       !!-------------------------------------------------------------------------------------------
       !! 3 - Advance ABL variables from now (n) to after (n+1)
@@ -329 +348 @@
               &         sf(jp_hpgi)%fnow(:,:,:), sf(jp_hpgj)%fnow(:,:,:),                          &
               &         zcd_du, zsen, zevp,    &                                ! in/out
-              &         wndm, utau, vtau, taum )                                ! out
-
+              &         wndm, utau, vtau, taum &                                 ! out
+#if defined key_si3          
+              &          , tm_su, u_ice, v_ice, zssqi, zcd_dui   & 
+              &          , zseni, zevpi, wndm_ice, ato_i,        & 
+           &            utau_ice,     vtau_ice                &
+#endif           
+              &                                                                )
       !!-------------------------------------------------------------------------------------------
       !! 4 - Finalize flux computation using ABL variables at (n+1), nt_n corresponds to (n+1) since 
@@ -340 +364 @@
               &           sst_m , zsen, zevp )
 
+#if defined key_si3
+! Avoid a USE abl in icesbc module
+      sf(jp_tair)%fnow(:,:,1) = tq_abl(:,:,2,nt_n,jp_ta);  sf(jp_humi)%fnow(:,:,1) = tq_abl(:,:,2,nt_n,jp_qa)
+#endif 
+
    END SUBROUTINE sbc_abl