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

Timestamp:

2019-07-25T14:02:55+02:00 (5 years ago)

Author:

gsamson

Message:

dev_r11265_ABL :

• merge HPC-13_IRRMANN_BDY_optimization branch @ rev11332 with dev_r11265_ABL branch @ rev11334
• allow ln_dm2dc option with ABL
• cosmetic change in sbcabl.F90

identical results with rev11334 for bulk and abl orca2

File:

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

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

@@ -76 +76 @@
       REWIND( numnam_ref )              ! Namelist namsbc_abl in reference namelist : ABL parameters
       READ  ( numnam_ref, namsbc_abl, IOSTAT = ios, ERR = 901 )
-901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc_abl in reference namelist', lwp )
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc_abl in reference namelist' )
       !
       REWIND( numnam_cfg )              ! Namelist namsbc_abl in configuration namelist : ABL parameters
       READ  ( numnam_cfg, namsbc_abl, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc_abl in configuration namelist', lwp )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc_abl in configuration namelist' )
       !
       IF(lwm) WRITE( numond, namsbc_abl )
@@ -147 +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' )
@@ -328 +328 @@
       !! 2 - Compute Cd x ||U||, Ch x ||U||, Ce x ||U||, and SSQ using now fields
       !!-------------------------------------------------------------------------------------------  
-         
-      CALL blk_oce_1( kt, 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), sst_m, ssu_m, ssv_m, &
-              &              zssq, zcd_du, zsen, zevp )
-
+
+      CALL blk_oce_1( kt,  u_abl(:,:,2,nt_n      ),  v_abl(:,:,2,nt_n      ),   &   !   <<= in
+         &                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
+         &                zssq, zcd_du, zsen, zevp                          )       !   =>> out
+  
 #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  
+      CALL blk_ice_1(  u_abl(:,:,2,nt_n      ),  v_abl(:,:,2,nt_n      ),   &   !   <<= in
+         &            tq_abl(:,:,2,nt_n,jp_ta), tq_abl(:,:,2,nt_n,jp_qa),   &   !   <<= in
+         &            sf(jp_slp)%fnow(:,:,1)  ,  u_ice, v_ice           ,   &   !   <<= in
+         &            pseni=zseni, pevpi=zevpi, ptsui=tm_su             ,   &   !   <<= out
+         &            pssqi=zssqi, pcd_dui=zcd_dui                      )       !   =>> out
 #endif  
 
@@ -343 +346 @@
       !!-------------------------------------------------------------------------------------------    
   
-      CALL abl_stp( kt, sst_m, ssu_m, ssv_m, zssq, &                            ! in
-              &         sf(jp_wndi)%fnow(:,:,:), sf(jp_wndj)%fnow(:,:,:),   &
-              &         sf(jp_tair)%fnow(:,:,:), sf(jp_humi)%fnow(:,:,:), sf(jp_slp)%fnow(:,:,1),  &
-              &         sf(jp_hpgi)%fnow(:,:,:), sf(jp_hpgj)%fnow(:,:,:),                          &
-              &         zcd_du, zsen, zevp,    &                                ! in/out
-              &         wndm, utau, vtau, taum &                                 ! out
+      CALL abl_stp( kt, sst_m, ssu_m, ssv_m, zssq,                          &   !   <<= in
+         &              sf(jp_wndi)%fnow(:,:,:), sf(jp_wndj)%fnow(:,:,:),   &   !   <<= in
+         &              sf(jp_tair)%fnow(:,:,:), sf(jp_humi)%fnow(:,:,:),   &   !   <<= in
+         &              sf(jp_slp )%fnow(:,:,1),                            &   !   <<= in
+         &              sf(jp_hpgi)%fnow(:,:,:), sf(jp_hpgj)%fnow(:,:,:),   &   !   <<= in
+         &              zcd_du, zsen, zevp,                                 &   !   <=> in/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                &
+         &            , tm_su, u_ice, v_ice, zssqi, zcd_dui                 &   !   <<= in
+         &            , zseni, zevpi, wndm_ice, ato_i                       &   !   <<= in
+         &            , utau_ice, vtau_ice                                  &   !   =>> out
 #endif           
-              &                                                                )
+         &                                                                  )
       !!-------------------------------------------------------------------------------------------
       !! 4 - Finalize flux computation using ABL variables at (n+1), nt_n corresponds to (n+1) since 
@@ -360 +364 @@
       !!-------------------------------------------------------------------------------------------   
 
-      CALL blk_oce_2( kt, tq_abl(:,:,2,nt_n,jp_ta), sf(jp_qsr )%fnow(:,:,1), sf(jp_qlw )%fnow(:,:,1),     &
-              &           sf(jp_prec)%fnow(:,:,1),  sf(jp_snow)%fnow(:,:,1),   &
-              &           sst_m , zsen, zevp )
+      CALL blk_oce_2( kt, tq_abl(:,:,2,nt_n,jp_ta),                            &
+         &                sf(jp_qsr )%fnow(:,:,1) , sf(jp_qlw )%fnow(:,:,1),   &
+         &                sf(jp_prec)%fnow(:,:,1) , sf(jp_snow)%fnow(:,:,1),   &
+         &                sst_m, zsen, zevp                                )
 
 #if defined key_si3
-! Avoid a USE abl in icesbc module
+      ! 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