Changeset 9150

Timestamp:

2017-12-21T12:03:00+01:00 (6 years ago)

Author:

deazer

Message:

Sign fix and deal with bdy corner points.

Location:

branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC

Files:

• BDY/bdydyn2d.F90 (modified) (1 diff)
• DYN/dynnxt.F90 (modified) (2 diffs)

branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90

@@ -292 +292 @@
 !                 &           zssh(ii  ,ij-1) * tmask(ii  ,ij-1,1) + &
 !                 &           zssh(ii  ,ij+1) * tmask(ii  ,ij+1,1)
-               zcoef = bdytmask(ii-1,ij) + bdytmask(ii+1,ij) +  bdytmask(ii,ij-1) +  bdytmask(ii,ij+1)
-               zssh(ii,ij) = zssh(ii-1,ij  ) * bdytmask(ii-1,ij  ) + &
-                 &           zssh(ii+1,ij  ) * bdytmask(ii+1,ij  ) + &
-                 &           zssh(ii  ,ij-1) * bdytmask(ii  ,ij-1) + &
-                 &           zssh(ii  ,ij+1) * bdytmask(ii  ,ij+1)
-               zssh(ii,ij) = ( zssh(ii,ij) / MAX( 1, zcoef) ) * tmask(ii,ij,1)
+!CEODORIG               zcoef = bdytmask(ii-1,ij) + bdytmask(ii+1,ij) +  bdytmask(ii,ij-1) +  bdytmask(ii,ij+1)
+!CEODORIG               zssh(ii,ij) = zssh(ii-1,ij  ) * bdytmask(ii-1,ij  ) + &
+!CEODORIG                 &           zssh(ii+1,ij  ) * bdytmask(ii+1,ij  ) + &
+!CEODORIG                 &           zssh(ii  ,ij-1) * bdytmask(ii  ,ij-1) + &
+!CEODORIG                 &           zssh(ii  ,ij+1) * bdytmask(ii  ,ij+1)
+!CEODORIG               zssh(ii,ij) = ( zssh(ii,ij) / MAX( 1, zcoef) ) * tmask(ii,ij,1)
+!CEOD Just look at diagonals bdytmaks will only be non zero for point required.
+               zssh(ii,ij) = zssh( ii-1, ij-1 ) * bdytmask( ii-1, ij-1) + &
+                 &           zssh( ii+1, ij+1 ) * bdytmask( ii+1, ij+1) + &
+                 &           zssh( ii+1, ij-1 ) * bdytmask( ii+1, ij-1) + &
+                 &           zssh( ii-1, ij+1 ) * bdytmask( ii-1, ij+1)
             ELSE
                ip = bdytmask(ii+1,ij  ) - bdytmask(ii-1,ij  )

branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

@@ -227 +227 @@
                            DO ji = 1, jpi
                               IF( mikt(ji,jj) <= jk .and. jk <=  nk_rnf(ji,jj)  ) THEN
-                                 e3t_b(ji,jj,jk) = e3t_b(ji,jj,jk) - zcoef *  (rnf_b(ji,jj) - rnf(ji,jj))*(e3t_n(ji,jj,jk)/h_rnf(ji,jj)  )*tmask(ji,jj,jk)
+                                 e3t_b(ji,jj,jk) = e3t_b(ji,jj,jk) - zcoef *  (-rnf_b(ji,jj) + rnf(ji,jj))*(e3t_n(ji,jj,jk)/h_rnf(ji,jj)  )*tmask(ji,jj,jk)
                               ENDIF
                            ENDDO
@@ -233 +233 @@
                      ENDDO
                   ELSE
-                      e3t_b(:,:,1) = e3t_b(:,:,1) - zcoef *  (rnf_b(ji,jj) - rnf(ji,jj))*tmask(ji,jj,1)
+                      e3t_b(:,:,1) = e3t_b(:,:,1) - zcoef *  (-rnf_b(:,:) + rnf(:,:))*tmask(:,:,1)
                   ENDIF
                ELSE                     ! if ice shelf melting