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 9783 – NEMO

Changeset 9783


Ignore:
Timestamp:
2018-06-12T17:36:37+02:00 (5 years ago)
Author:
mathiot
Message:

correcting bug introduced this morning (tmask(ji,jj) instead of tmask(ji,jj,1))

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

    r9778 r9783  
    407407            DO ji = fs_2, fs_jpim1 
    408408               !                                            ! ocean area at u- & v-points 
    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)) 
     409               zfrldu = ( frld(ji,jj) * tmask(ji,jj,1) + frld (ji+1,jj) * tmask(ji+1,jj,1) ) & 
     410                  &     / MAX( 1.0_wp , tmask(ji,jj,1) + tmask(ji+1,jj,1)) 
     411               zfrldv = ( frld(ji,jj) * tmask(ji,jj,1) + frld (ji,jj+1) * tmask(ji,jj+1,1) ) & 
     412                  &     / MAX( 1.0_wp , tmask(ji,jj,1) + tmask(ji,jj+1,1)) 
    411413               !                                            ! quadratic drag formulation without rotation 
    412414               !                                            ! using instantaneous surface ocean current 

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

    r9778 r9783  
    281281            ! ice area at u and v-points 
    282282            ! 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)) 
     283            zat_u = ( at_i(ji,jj) * tmask(ji,jj,1) + at_i (ji+1,jj) * tmask(ji+1,jj,1) ) & 
     284               &    / MAX( 1.0_wp , tmask(ji,jj,1) + tmask(ji+1,jj,1)) 
     285            zat_v = ( at_i(ji,jj) * tmask(ji,jj,1) + at_i (ji,jj+1) * tmask(ji,jj+1,1) ) & 
     286               &    / MAX( 1.0_wp , tmask(ji,jj,1) + tmask(ji,jj+1,1)) 
    285287            !                                                   ! linearized quadratic drag formulation 
    286288            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.