Changeset 9778 for NEMO

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:

• LIM_SRC_2/limsbc_2.F90 (modified) (1 diff)
• LIM_SRC_3/limsbc.F90 (modified) (1 diff)

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

@@ -407 +407 @@
             DO ji = fs_2, fs_jpim1
                !                                            ! ocean area at u- & v-points
-               zfrldu  = 0.5_wp * ( frld(ji,jj) + frld(ji+1,jj) )
-               zfrldv  = 0.5_wp * ( frld(ji,jj) + frld(ji,jj+1) )
+               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  ))
+               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))
                !                                            ! quadratic drag formulation without rotation
                !                                            ! using instantaneous surface ocean current

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

@@ -279 +279 @@
       DO jj = 2, jpjm1                                !* update the stress WITHOUT a ice-ocean rotation angle
          DO ji = fs_2, fs_jpim1   ! Vect. Opt.
-            zat_u  = ( at_i(ji,jj) + at_i(ji+1,jj) ) * 0.5_wp   ! ice area at u and V-points
-            zat_v  = ( at_i(ji,jj) + at_i(ji,jj+1) ) * 0.5_wp
+            ! ice area at u and v-points
+            ! land values on u-, v- points along coastline set to adjacent t-point ocean value 
+            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  ))
+            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))
             !                                                   ! linearized quadratic drag formulation
             zutau_ice   = 0.5_wp * ( tmod_io(ji,jj) + tmod_io(ji+1,jj) ) * ( u_ice(ji,jj) - pu_oce(ji,jj) )