Changeset 9821


Ignore:
Timestamp:
2018-06-21T15:44:35+02:00 (2 years ago)
Author:
lovato
Message:

trunk : apply tmask after fldread update of wave external forcing

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/OCE/SBC/sbcwave.F90

    r9598 r9821  
    321321      IF( ln_cdgw .AND. .NOT. cpl_wdrag ) THEN     !==  Neutral drag coefficient  ==! 
    322322         CALL fld_read( kt, nn_fsbc, sf_cd )             ! read from external forcing 
    323          cdn_wave(:,:) = sf_cd(1)%fnow(:,:,1) 
     323         cdn_wave(:,:) = sf_cd(1)%fnow(:,:,1) * tmask(:,:,1) 
    324324      ENDIF 
    325325 
    326326      IF( ln_tauwoc .AND. .NOT. cpl_tauwoc ) THEN  !==  Wave induced stress  ==! 
    327327         CALL fld_read( kt, nn_fsbc, sf_tauwoc )         ! read wave norm stress from external forcing 
    328          tauoc_wave(:,:) = sf_tauwoc(1)%fnow(:,:,1) 
     328         tauoc_wave(:,:) = sf_tauwoc(1)%fnow(:,:,1) * tmask(:,:,1) 
    329329      ENDIF 
    330330 
    331331      IF( ln_tauw .AND. .NOT. cpl_tauw ) THEN      !==  Wave induced stress  ==! 
    332332         CALL fld_read( kt, nn_fsbc, sf_tauw )           ! read ocean stress components from external forcing (T grid) 
    333          tauw_x(:,:) = sf_tauw(1)%fnow(:,:,1) 
    334          tauw_y(:,:) = sf_tauw(2)%fnow(:,:,1) 
     333         tauw_x(:,:) = sf_tauw(1)%fnow(:,:,1) * tmask(:,:,1) 
     334         tauw_y(:,:) = sf_tauw(2)%fnow(:,:,1) * tmask(:,:,1) 
    335335      ENDIF 
    336336 
     
    339339         IF( jpfld > 0 ) THEN                            ! Read from file only if the field is not coupled 
    340340            CALL fld_read( kt, nn_fsbc, sf_sd )          ! read wave parameters from external forcing 
    341             IF( jp_hsw > 0 )   hsw  (:,:) = sf_sd(jp_hsw)%fnow(:,:,1)   ! significant wave height 
    342             IF( jp_wmp > 0 )   wmp  (:,:) = sf_sd(jp_wmp)%fnow(:,:,1)   ! wave mean period 
    343             IF( jp_wfr > 0 )   wfreq(:,:) = sf_sd(jp_wfr)%fnow(:,:,1)   ! Peak wave frequency 
    344             IF( jp_usd > 0 )   ut0sd(:,:) = sf_sd(jp_usd)%fnow(:,:,1)   ! 2D zonal Stokes Drift at T point 
    345             IF( jp_vsd > 0 )   vt0sd(:,:) = sf_sd(jp_vsd)%fnow(:,:,1)   ! 2D meridional Stokes Drift at T point 
     341            IF( jp_hsw > 0 )   hsw  (:,:) = sf_sd(jp_hsw)%fnow(:,:,1) * tmask(:,:,1)  ! significant wave height 
     342            IF( jp_wmp > 0 )   wmp  (:,:) = sf_sd(jp_wmp)%fnow(:,:,1) * tmask(:,:,1)  ! wave mean period 
     343            IF( jp_wfr > 0 )   wfreq(:,:) = sf_sd(jp_wfr)%fnow(:,:,1) * tmask(:,:,1)  ! Peak wave frequency 
     344            IF( jp_usd > 0 )   ut0sd(:,:) = sf_sd(jp_usd)%fnow(:,:,1) * tmask(:,:,1)  ! 2D zonal Stokes Drift at T point 
     345            IF( jp_vsd > 0 )   vt0sd(:,:) = sf_sd(jp_vsd)%fnow(:,:,1) * tmask(:,:,1)  ! 2D meridional Stokes Drift at T point 
    346346         ENDIF 
    347347         ! 
     
    349349         IF( ln_zdfswm .AND. .NOT.cpl_wnum ) THEN 
    350350            CALL fld_read( kt, nn_fsbc, sf_wn )          ! read wave parameters from external forcing 
    351             wnum(:,:) = sf_wn(1)%fnow(:,:,1) 
     351            wnum(:,:) = sf_wn(1)%fnow(:,:,1) * tmask(:,:,1) 
    352352         ENDIF 
    353353            
Note: See TracChangeset for help on using the changeset viewer.