Changeset 12020 for NEMO/branches/2019

Timestamp:

2019-12-01T19:18:50+01:00 (4 years ago)

Author:

laurent

Message:

Improved syntax...

Location:

NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/src/OCE/SBC

Files:

• sbc_oce.F90 (modified) (1 diff)
• sbcblk.F90 (modified) (11 diffs)

NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/src/OCE/SBC/sbc_oce.F90

@@ -153 +153 @@
    !!                     Cool-skin/Warm-layer
    !!----------------------------------------------------------------------
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   tsk       !: sea-surface skin temperature (used if ln_skin_cs==.true. .OR. ln_skin_wl==.true.)  [K] !LB
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tsk !: sea-surface skin temperature [K] (ln_skin_cs==T or ln_skin_wl==T) 
 
    

NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/src/OCE/SBC/sbcblk.F90

@@ -47 +47 @@
    USE sbcblk_algo_ncar     ! => turb_ncar     : NCAR - CORE (Large & Yeager, 2009)
    USE sbcblk_algo_coare3p0 ! => turb_coare3p0 : COAREv3.0 (Fairall et al. 2003)
-   USE sbcblk_algo_coare3p6 ! => turb_coare3p6 : COAREv3.6 (Fairall et al. 2018 + Edson et al. 2013)
+   USE sbcblk_algo_coare3p6 ! => turb_coare3p6 : COAREv3.6 (Fairall et al. 201 + Edson et al. 2013)
    USE sbcblk_algo_ecmwf    ! => turb_ecmwf    : ECMWF (IFS cycle 45r1)
    !
@@ -56 +56 @@
    USE prtctl         ! Print control
 
-   USE sbcblk_phy     !LB: all thermodynamics functions in the marine boundary layer, rho_air, q_sat, etc...
+   USE sbcblk_phy     ! a catalog of functions for physical/meteorological parameters in the marine boundary layer, rho_air, q_sat, etc...
 
 
@@ -142 +142 @@
       !!-------------------------------------------------------------------
       ALLOCATE( Cd_atm (jpi,jpj), Ch_atm (jpi,jpj), Ce_atm (jpi,jpj), t_zu(jpi,jpj), q_zu(jpi,jpj), &
-         &      cdn_oce(jpi,jpj), chn_oce(jpi,jpj), cen_oce(jpi,jpj), tsk(jpi,jpj), STAT=sbc_blk_alloc )
+         &      cdn_oce(jpi,jpj), chn_oce(jpi,jpj), cen_oce(jpi,jpj), tsk (jpi,jpj), STAT=sbc_blk_alloc )
       !
       CALL mpp_sum ( 'sbcblk', sbc_blk_alloc )
@@ -212 +212 @@
          !! Some namelist sanity tests:
          IF( ln_NCAR )      &
-            & CALL ctl_stop( 'sbc_blk_init: Cool-skin/warm-layer param. not compatible with NCAR algorithm' )         
+            & CALL ctl_stop( 'sbc_blk_init: Cool-skin/warm-layer param. not compatible with NCAR algorithm' )
          IF( nn_fsbc /= 1 ) &
-            & CALL ctl_stop( 'sbc_blk_init: Please set "nn_fsbc" to 1 when using cool-skin/warm-layer param.')                  
+            & CALL ctl_stop( 'sbc_blk_init: Please set "nn_fsbc" to 1 when using cool-skin/warm-layer param.')
       END IF
-      
+
       ioptio = 0
       IF( ln_humi_sph ) THEN
@@ -364 +364 @@
       CALL fld_read( kt, nn_fsbc, sf )             ! input fields provided at the current time-step
       !
-      IF( kt == nit000 ) tsk(:,:) = sst_m(:,:)*tmask(:,:,1)  ! no previous estimate of skin temperature => using bulk SST
-      !
-      IF( MOD( kt - 1, nn_fsbc ) == 0 )   CALL blk_oce( kt, sf, sst_m, ssu_m, ssv_m ) !  compute the surface ocean fluxes using bulk formulea
+      IF( kt == nit000 ) tsk(:,:) = sst_m(:,:)*tmask(:,:,1)  ! no previous estimate of skin temperature => using bulk SST (use restart?)
+      !                                                      ! compute the surface ocean fluxes using bulk formulea
+      IF( MOD( kt - 1, nn_fsbc ) == 0 )   CALL blk_oce( kt, sf, sst_m, ssu_m, ssv_m )
 
 #if defined key_cice
@@ -377 +377 @@
          ENDIF
          tatm_ice(:,:)    = sf(jp_tair)%fnow(:,:,1)
-
          SELECT CASE( nhumi )
          CASE( np_humi_sph )
@@ -386 +385 @@
             qatm_ice(:,:) = q_air_rh( 0.01_wp*sf(jp_humi)%fnow(:,:,1), sf(jp_tair)%fnow(:,:,1), sf(jp_slp)%fnow(:,:,1)) !LB: 0.01 => RH is % percent in file
          END SELECT
-
          tprecip(:,:)     = sf(jp_prec)%fnow(:,:,1) * rn_pfac
          sprecip(:,:)     = sf(jp_snow)%fnow(:,:,1) * rn_pfac
@@ -510 +508 @@
       ztpot = sf(jp_tair)%fnow(:,:,1) + gamma_moist( sf(jp_tair)%fnow(:,:,1), zqair(:,:) ) * rn_zqt
 
-      
+
       !! Time to call the user-selected bulk parameterization for
       !!  ==  transfer coefficients  ==!   Cd, Ch, Ce at T-point, and more...
-      SELECT CASE( nblk )        
-         
+      SELECT CASE( nblk )
+
       CASE( np_NCAR      )
          CALL turb_ncar     (     rn_zqt, rn_zu, zst, ztpot, zsq, zqair, wndm,                         &
             &                Cd_atm, Ch_atm, Ce_atm, t_zu, q_zu, zU_zu, cdn_oce, chn_oce, cen_oce )
-         
+
       CASE( np_COARE_3p0 )
          CALL turb_coare3p0 ( kt, rn_zqt, rn_zu, zst, ztpot, zsq, zqair, wndm, ln_skin_cs, ln_skin_wl, &
             &                Cd_atm, Ch_atm, Ce_atm, t_zu, q_zu, zU_zu, cdn_oce, chn_oce, cen_oce,     &
             &                Qsw=qsr(:,:), rad_lw=sf(jp_qlw)%fnow(:,:,1), slp=sf(jp_slp)%fnow(:,:,1) )
-         
+
       CASE( np_COARE_3p6 )
          CALL turb_coare3p6 ( kt, rn_zqt, rn_zu, zst, ztpot, zsq, zqair, wndm, ln_skin_cs, ln_skin_wl, &
             &                Cd_atm, Ch_atm, Ce_atm, t_zu, q_zu, zU_zu, cdn_oce, chn_oce, cen_oce,     &
             &                Qsw=qsr(:,:), rad_lw=sf(jp_qlw)%fnow(:,:,1), slp=sf(jp_slp)%fnow(:,:,1) )
-         
+
       CASE( np_ECMWF     )
          CALL turb_ecmwf   ( kt, rn_zqt, rn_zu, zst, ztpot, zsq, zqair, wndm, ln_skin_cs, ln_skin_wl,  &
@@ -537 +535 @@
          CALL ctl_stop( 'STOP', 'sbc_oce: non-existing bulk formula selected' )
       END SELECT
-      
+
       IF( ln_skin_cs .OR. ln_skin_wl ) THEN
          !! In the presence of sea-ice we forget about the cool-skin/warm-layer update of zst and zsq:
-         WHERE ( fr_i < 0.001_wp )
-            ! zst and zsq have been updated by cool-skin/warm-layer scheme and we keep it!!!
+         WHERE ( fr_i(:,:) < 0.001_wp )
+            ! zst and zsq have been updated by cool-skin/warm-layer scheme and we keep them !!!
             zst(:,:) = zst(:,:)*tmask(:,:,1)
             zsq(:,:) = zsq(:,:)*tmask(:,:,1)
@@ -577 +575 @@
 
       ! Tau i and j component on T-grid points, using array "Cd_atm" as a temporary array...
-      Cd_atm = 0._wp
-      WHERE ( wndm > 0._wp ) Cd_atm = taum / wndm
-      zwnd_i = Cd_atm * zwnd_i
-      zwnd_j = Cd_atm * zwnd_j
-
+      Cd_atm(:,:) = 0._wp
+      WHERE ( wndm(:,:) > 0._wp ) Cd_atm(:,:) = taum(:,:) / wndm(:,:)
+      zwnd_i(:,:) = Cd_atm(:,:) * zwnd_i(:,:)
+      zwnd_j(:,:) = Cd_atm(:,:) * zwnd_j(:,:)
+      
       !                          ! add the HF tau contribution to the wind stress module
       IF( lhftau )   taum(:,:) = taum(:,:) + sf(jp_tdif)%fnow(:,:,1)
@@ -661 +659 @@
          CALL iom_put( "dt_skin" , (zst - pst - rt0) * tmask(:,:,1) )     ! T_skin - SST temperature difference...
       ENDIF
-      !!#LB. ENDIF
       !
       IF(ln_ctl) THEN