Changeset 13284 for NEMO/releases/r4.0/r4.0-HEAD/tests/CANAL/MY_SRC/usrdef_zgr.F90

Timestamp:

2020-07-09T17:12:23+02:00 (4 years ago)

Author:

smasson

Message:

4.0-HEAD: merge 4.0-HEAD_r12713_clem_dan_fixcpl into 4.0-HEAD

File:

• NEMO/releases/r4.0/r4.0-HEAD/tests/CANAL/MY_SRC/usrdef_zgr.F90 (modified) (1 diff)

NEMO/releases/r4.0/r4.0-HEAD/tests/CANAL/MY_SRC/usrdef_zgr.F90

@@ -199 +199 @@
          zmaxlam = MAXVAL(glamt)
          CALL mpp_max( 'usrdef_zgr', zmaxlam )                 ! max over the global domain
-         zscl = rpi / zmaxlam
-         z2d(:,:) = 0.5 * ( 1. - COS( glamt(:,:) * zscl ) )
-         z2d(:,:) = REAL(jpkm1 - NINT( 0.75 * REAL(jpkm1,wp) * z2d(:,:) ), wp)
+         zscl = 0.5 * rpi / zmaxlam
+         z2d(:,:) = COS( glamt(:,:) * zscl )
+         z2d(:,:) = REAL(jpkm1 - NINT( 0.5 * REAL(jpkm1,wp) * z2d(:,:) ), wp)
       END SELECT
       !