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 9778 for NEMO/releases – NEMO

Changeset 9778 for NEMO/releases


Ignore:
Timestamp:
2018-06-12T11:26:43+02:00 (6 years ago)
Author:
mathiot
Message:

v3.6 correction of ticket #2096

Location:
NEMO/releases/release-3.6/NEMOGCM/NEMO
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/releases/release-3.6/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90

    r5407 r9778  
    407407            DO ji = fs_2, fs_jpim1 
    408408               !                                            ! ocean area at u- & v-points 
    409                zfrldu  = 0.5_wp * ( frld(ji,jj) + frld(ji+1,jj) ) 
    410                zfrldv  = 0.5_wp * ( frld(ji,jj) + frld(ji,jj+1) ) 
     409               zfrldu  = ( frld(ji,jj) * tmask(ji,jj) + frld(ji+1,jj) * tmask(ji+1,jj  ) ) / MAX(1.0_wp,tmask(ji,jj)+tmask(ji+1,jj  )) 
     410               zfrldv  = ( frld(ji,jj) * tmask(ji,jj) + frld(ji,jj+1) * tmask(ji  ,jj+1) ) / MAX(1.0_wp,tmask(ji,jj)+tmask(ji  ,jj+1)) 
    411411               !                                            ! quadratic drag formulation without rotation 
    412412               !                                            ! using instantaneous surface ocean current 

  • NEMO/releases/release-3.6/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90

    r6963 r9778  
    279279      DO jj = 2, jpjm1                                !* update the stress WITHOUT a ice-ocean rotation angle 
    280280         DO ji = fs_2, fs_jpim1   ! Vect. Opt. 
    281             zat_u  = ( at_i(ji,jj) + at_i(ji+1,jj) ) * 0.5_wp   ! ice area at u and V-points 
    282             zat_v  = ( at_i(ji,jj) + at_i(ji,jj+1) ) * 0.5_wp 
     281            ! ice area at u and v-points 
     282            ! land values on u-, v- points along coastline set to adjacent t-point ocean value  
     283            zat_u = ( at_i(ji,jj) * tmask(ji,jj) + at_i(ji+1,jj  ) * tmask(ji+1,jj  ) ) / MAX(1.0_wp,tmask(ji,jj)+tmask(ji+1,jj  )) 
     284            zat_v = ( at_i(ji,jj) * tmask(ji,jj) + at_i(ji  ,jj+1) * tmask(ji  ,jj+1) ) / MAX(1.0_wp,tmask(ji,jj)+tmask(ji  ,jj+1)) 
    283285            !                                                   ! linearized quadratic drag formulation 
    284286            zutau_ice   = 0.5_wp * ( tmod_io(ji,jj) + tmod_io(ji+1,jj) ) * ( u_ice(ji,jj) - pu_oce(ji,jj) ) 
Note: See TracChangeset for help on using the changeset viewer.