New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 11949 for NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/usrdef_sbc.F90 – NEMO

Ignore:
Timestamp:
2019-11-22T15:29:17+01:00 (4 years ago)
Author:
acc
Message:

Merge in changes from 2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps. This just creates a fresh copy of this branch to use as the merge base. See ticket #2341

Location:
NEMO/branches/2019/dev_r11943_MERGE_2019/tests
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests

    • Property svn:mergeinfo deleted
  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/usrdef_sbc.F90

    r10074 r11949  
    4040CONTAINS 
    4141 
    42    SUBROUTINE usrdef_sbc_oce( kt ) 
     42   SUBROUTINE usrdef_sbc_oce( kt, Kmm, Kbb ) 
    4343      !!--------------------------------------------------------------------- 
    4444      !!                    ***  ROUTINE usr_def_sbc  *** 
     
    5454      !! 
    5555      !!---------------------------------------------------------------------- 
    56       INTEGER, INTENT(in) ::   kt   ! ocean time step 
    57        
     56      INTEGER, INTENT(in) ::   kt        ! ocean time step 
     57      INTEGER, INTENT(in) ::   Kbb, Kmm  ! ocean time index 
    5858      INTEGER  ::   ji, jj               ! dummy loop indices 
    5959      REAL(wp) :: zrhoair = 1.22     ! approximate air density [Kg/m3] 
     
    8888          
    8989         WHERE( ABS(gphit) <= rn_windszy/2. ) 
    90             zwndrel(:,:) = rn_u10 - rn_uofac * un(:,:,1) 
     90            zwndrel(:,:) = rn_u10 - rn_uofac * uu(:,:,1,Kmm) 
    9191         ELSEWHERE 
    92             zwndrel(:,:) =        - rn_uofac * un(:,:,1) 
     92            zwndrel(:,:) =        - rn_uofac * uu(:,:,1,Kmm) 
    9393         END WHERE 
    9494         utau(:,:) = zrhocd * zwndrel(:,:) * zwndrel(:,:) 
    9595 
    96          zwndrel(:,:) = - rn_uofac * vn(:,:,1) 
     96         zwndrel(:,:) = - rn_uofac * vv(:,:,1,Kmm) 
    9797         vtau(:,:) = zrhocd * zwndrel(:,:) * zwndrel(:,:) 
    9898 
     
    105105   END SUBROUTINE usrdef_sbc_ice_tau 
    106106 
    107    SUBROUTINE usrdef_sbc_ice_flx( kt ) 
     107 
     108   SUBROUTINE usrdef_sbc_ice_flx( kt, phs, phi ) 
    108109      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     110      REAL(wp), DIMENSION(:,:,:), INTENT(in)  ::   phs    ! snow thickness 
     111      REAL(wp), DIMENSION(:,:,:), INTENT(in)  ::   phi    ! ice thickness 
    109112   END SUBROUTINE usrdef_sbc_ice_flx 
    110113 
Note: See TracChangeset for help on using the changeset viewer.