Changeset 1025 for trunk/NEMO/OPA_SRC/SBC/sbcblk_core.F90

Timestamp:

2008-05-30T13:26:09+02:00 (16 years ago)

Author:

cetlod

Message:

adding wind speed module variable, see ticket 172

File:

• trunk/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/SBC/sbcblk_core.F90

@@ -227 +227 @@
       REAL(wp) ::   zcoef_qsatw
       REAL(wp), DIMENSION(jpi,jpj) ::   zwnd_i, zwnd_j    ! wind speed components at T-point
-      REAL(wp), DIMENSION(jpi,jpj) ::   zwind_speed_t     ! wind speed module     at T-point ( = | U10m - Uoce | )
       REAL(wp), DIMENSION(jpi,jpj) ::   zqsatw            ! specific humidity at pst
       REAL(wp), DIMENSION(jpi,jpj) ::   zqlw, zqsb        ! long wave and sensible heat fluxes
@@ -247 +246 @@
       !      0   Wind components and module at T-point relative to the moving ocean   !
       ! ----------------------------------------------------------------------------- !
-
-      ! Store the wind speed U10m
-!CDIR NOVERRCHK
-!CDIR COLLAPSE
-      DO jj = 1, jpj
-         DO ji = 1, jpi   ! vect. opt.
-            wndm(ji,jj) = SQRT(  sf(jp_wndi)%fnow(ji,jj) * sf(jp_wndi)%fnow(ji,jj)   &
-         &                     + sf(jp_wndj)%fnow(ji,jj) * sf(jp_wndj)%fnow(ji,jj) )
-         ENDDO
-      ENDDO
 
       ! ... components ( U10m - U_oce ) at T-point (unmasked)
@@ -275 +264 @@
 !CDIR NOVERRCHK
 !CDIR COLLAPSE
-      zwind_speed_t(:,:) = SQRT(  zwnd_i(:,:) * zwnd_i(:,:)   &
-         &                      + zwnd_j(:,:) * zwnd_j(:,:)  ) * tmask(:,:,1)
+      wndm(:,:) = SQRT(  zwnd_i(:,:) * zwnd_i(:,:)   &
+         &             + zwnd_j(:,:) * zwnd_j(:,:)  ) * tmask(:,:,1)
 
       ! ----------------------------------------------------------------------------- !
@@ -300 +289 @@
       IF( ln_2m ) THEN
          !! If air temp. and spec. hum. are given at different height (2m) than wind (10m) :
-         CALL TURB_CORE_2Z(2.,10., zst   , sf(jp_tair)%fnow,                  &
-            &                      zqsatw, sf(jp_humi)%fnow, zwind_speed_t,   &
-            &                      Cd, Ch, Ce, zt_zu, zq_zu )
+         CALL TURB_CORE_2Z(2.,10., zst   , sf(jp_tair)%fnow,         &
+            &                      zqsatw, sf(jp_humi)%fnow, wndm,   &
+            &                      Cd    , Ch              , Ce  ,   &
+            &                      zt_zu , zq_zu                   )
       ELSE
          !! If air temp. and spec. hum. are given at same height than wind (10m) :
 !gm bug?  at the compiling phase, add a copy in temporary arrays...  ==> check perf
-!         CALL TURB_CORE_1Z( 10., zst   (:,:), sf(jp_tair)%fnow(:,:),                       &
-!            &                    zqsatw(:,:), sf(jp_humi)%fnow(:,:), zwind_speed_t(:,:),   &
-!            &                    Cd(:,:), Ch(:,:), Ce(:,:) )
+!         CALL TURB_CORE_1Z( 10., zst   (:,:), sf(jp_tair)%fnow(:,:),              &
+!            &                    zqsatw(:,:), sf(jp_humi)%fnow(:,:), wndm(:,:),   &
+!            &                    Cd    (:,:),             Ch  (:,:), Ce  (:,:)  )
 !gm bug
-         CALL TURB_CORE_1Z( 10., zst   , sf(jp_tair)%fnow,                  &
-            &                    zqsatw, sf(jp_humi)%fnow, zwind_speed_t,   &
-            &                    Cd, Ch, Ce )
+         CALL TURB_CORE_1Z( 10., zst   , sf(jp_tair)%fnow,         &
+            &                    zqsatw, sf(jp_humi)%fnow, wndm,   &
+            &                    Cd    , Ch              , Ce    )
       ENDIF
 
       ! ... utau, vtau at U- and V_points, resp.
       !     Note the use of 0.5*(2-umask) in order to unmask the stress along coastlines
-      zwnd_i(:,:) = rhoa * zwind_speed_t(:,:) * Cd(:,:) * zwnd_i(:,:)
-      zwnd_j(:,:) = rhoa * zwind_speed_t(:,:) * Cd(:,:) * zwnd_j(:,:)
+      zwnd_i(:,:) = rhoa * wndm(:,:) * Cd(:,:) * zwnd_i(:,:)
+      zwnd_j(:,:) = rhoa * wndm(:,:) * Cd(:,:) * zwnd_j(:,:)
       DO jj = 1, jpjm1
          DO ji = 1, fs_jpim1
@@ -332 +322 @@
       IF( ln_2m ) THEN
          ! Values of temp. and hum. adjusted to 10m must be used instead of 2m values
-         zevap(:,:) = MAX( 0.e0, rhoa    *Ce(:,:)*( zqsatw(:,:) - zq_zu(:,:) ) * zwind_speed_t(:,:) )   ! Evaporation
-         zqsb (:,:) =            rhoa*cpa*Ch(:,:)*( zst   (:,:) - zt_zu(:,:) ) * zwind_speed_t(:,:)     ! Sensible Heat
+         zevap(:,:) = MAX( 0.e0, rhoa    *Ce(:,:)*( zqsatw(:,:) - zq_zu(:,:) ) * wndm(:,:) )   ! Evaporation
+         zqsb (:,:) =            rhoa*cpa*Ch(:,:)*( zst   (:,:) - zt_zu(:,:) ) * wndm(:,:)     ! Sensible Heat
       ELSE
 !CDIR COLLAPSE
-         zevap(:,:) = MAX( 0.e0, rhoa    *Ce(:,:)*( zqsatw(:,:) - sf(jp_humi)%fnow(:,:) ) * zwind_speed_t(:,:) )   ! Evaporation
-!CDIR COLLAPSE
-         zqsb (:,:) =            rhoa*cpa*Ch(:,:)*( zst   (:,:) - sf(jp_tair)%fnow(:,:) ) * zwind_speed_t(:,:)     ! Sensible Heat
+         zevap(:,:) = MAX( 0.e0, rhoa    *Ce(:,:)*( zqsatw(:,:) - sf(jp_humi)%fnow(:,:) ) * wndm(:,:) )   ! Evaporation
+!CDIR COLLAPSE
+         zqsb (:,:) =            rhoa*cpa*Ch(:,:)*( zst   (:,:) - sf(jp_tair)%fnow(:,:) ) * wndm(:,:)     ! Sensible Heat
       ENDIF
 !CDIR COLLAPSE
@@ -344 +334 @@
 
       IF(ln_ctl) THEN
-         CALL prt_ctl( tab2d_1=zqla   , clinfo1=' blk_oce_core: zqla   : ', tab2d_2=Ce , clinfo2=' Ce  : ' )
-         CALL prt_ctl( tab2d_1=zqsb   , clinfo1=' blk_oce_core: zqsb   : ', tab2d_2=Ch , clinfo2=' Ch  : ' )
-         CALL prt_ctl( tab2d_1=zqlw   , clinfo1=' blk_oce_core: zqlw   : ', tab2d_2=qsr, clinfo2=' qsr : ' )
-         CALL prt_ctl( tab2d_1=zqsatw , clinfo1=' blk_oce_core: zqsatw : ', tab2d_2=zst, clinfo2=' zst : ' )
-         CALL prt_ctl( tab2d_1=utau   , clinfo1=' blk_oce_core: utau   : ', mask1=umask,   &
-            &          tab2d_2=vtau   , clinfo2=' vtau : ', mask2=vmask )
-         CALL prt_ctl( tab2d_1=zwind_speed_t, clinfo1=' blk_oce_core: zwind_speed_t : ')
-         CALL prt_ctl( tab2d_1=zst    , clinfo1=' blk_oce_core: zst    : ')
+         CALL prt_ctl( tab2d_1=zqla  , clinfo1=' blk_oce_core: zqla   : ', tab2d_2=Ce , clinfo2=' Ce  : ' )
+         CALL prt_ctl( tab2d_1=zqsb  , clinfo1=' blk_oce_core: zqsb   : ', tab2d_2=Ch , clinfo2=' Ch  : ' )
+         CALL prt_ctl( tab2d_1=zqlw  , clinfo1=' blk_oce_core: zqlw   : ', tab2d_2=qsr, clinfo2=' qsr : ' )
+         CALL prt_ctl( tab2d_1=zqsatw, clinfo1=' blk_oce_core: zqsatw : ', tab2d_2=zst, clinfo2=' zst : ' )
+         CALL prt_ctl( tab2d_1=utau  , clinfo1=' blk_oce_core: utau   : ', mask1=umask,   &
+            &          tab2d_2=vtau  , clinfo2=              ' vtau : '  , mask2=vmask )
+         CALL prt_ctl( tab2d_1=wndm  , clinfo1=' blk_oce_core: wndm   : ')
+         CALL prt_ctl( tab2d_1=zst   , clinfo1=' blk_oce_core: zst    : ')
       ENDIF