Changeset 9089 for branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_hgr.F90

Timestamp:

2017-12-15T18:00:09+01:00 (6 years ago)

Author:

gm

Message:

dev_merge_2017: bug correction in zdfdrg + ISOMIP cfg

File:

• branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_hgr.F90 (modified) (6 diffs)

branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_hgr.F90

@@ -17 +17 @@
    USE par_oce         ! ocean space and time domain
    USE phycst          ! physical constants
-   USE usrdef_nam, ONLY: rn_lam0, rn_phi0, rn_e1deg, rn_e2deg   ! horizontal resolution in meters
+   USE usrdef_nam, ONLY: rn_e1deg, rn_e2deg   ! horizontal resolution in meters
    !
    USE in_out_manager  ! I/O manager
    USE lib_mpp         ! MPP library
-   USE timing          ! Timing
    
    IMPLICIT NONE
@@ -29 +28 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 4.0 , NEMO Consortium (2016)
+   !! NEMO/OPA 4.0 , NEMO Consortium (2017)
    !! $Id$ 
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
@@ -66 +65 @@
       !!-------------------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('usr_def_hgr')
-      !
       IF(lwp) THEN
          WRITE(numout,*)
@@ -79 +76 @@
       !                       !==  grid point position  ==!   (in degrees)
       DO jj = 1, jpj
+         DO ji = 1, jpi             ! longitude   (west coast at lon=0°)
+            plamt(ji,jj) = rn_e1deg * (  - 0.5 + REAL( ji-1 + nimpp-1 , wp )  )  
+            plamu(ji,jj) = rn_e1deg * (          REAL( ji-1 + nimpp-1 , wp )  )
+            plamv(ji,jj) = plamt(ji,jj)
+            plamf(ji,jj) = plamu(ji,jj)
+            !                       ! latitude   (south coast at lat= 81°)
+            pphit(ji,jj) = rn_e2deg * (  - 0.5 + REAL( jj-1 + njmpp-1 , wp )  ) - 80._wp
+            pphiu(ji,jj) = pphit(ji,jj)
+            pphiv(ji,jj) = rn_e2deg * (          REAL( jj-1 + njmpp-1 , wp )  ) - 80_wp
+            pphif(ji,jj) = pphiv(ji,jj)
+         END DO
+      END DO
+      !
+      !                       !==  Horizontal scale factors  ==!   (in meters)
+      DO jj = 1, jpj
          DO ji = 1, jpi
-            zti = FLOAT( ji - 1 + nimpp - 1 )         ;   ztj = FLOAT( jj - 1 + njmpp - 1 )
-            zui = FLOAT( ji - 1 + nimpp - 1 ) + 0.5   ;   zuj = FLOAT( jj - 1 + njmpp - 1 )
-            zvi = FLOAT( ji - 1 + nimpp - 1 )         ;   zvj = FLOAT( jj - 1 + njmpp - 1 ) + 0.5
-            zfi = FLOAT( ji - 1 + nimpp - 1 ) + 0.5   ;   zfj = FLOAT( jj - 1 + njmpp - 1 ) + 0.5
-     ! Longitude
-            plamt(ji,jj) = rn_lam0 + rn_e1deg * zti
-            plamu(ji,jj) = rn_lam0 + rn_e1deg * zui
-            plamv(ji,jj) = rn_lam0 + rn_e1deg * zvi
-            plamf(ji,jj) = rn_lam0 + rn_e1deg * zfi
-     ! Latitude
-            pphit(ji,jj) = rn_phi0 + rn_e2deg * ztj
-            pphiu(ji,jj) = rn_phi0 + rn_e2deg * zuj
-            pphiv(ji,jj) = rn_phi0 + rn_e2deg * zvj
-            pphif(ji,jj) = rn_phi0 + rn_e2deg * zfj
-            
-     !                       !==  Horizontal scale factors  ==!   (in meters)
-     ! e1
+            !                       ! e1   (zonal)
             pe1t(ji,jj) = ra * rad * COS( rad * pphit(ji,jj) ) * rn_e1deg
             pe1u(ji,jj) = ra * rad * COS( rad * pphiu(ji,jj) ) * rn_e1deg
             pe1v(ji,jj) = ra * rad * COS( rad * pphiv(ji,jj) ) * rn_e1deg
             pe1f(ji,jj) = ra * rad * COS( rad * pphif(ji,jj) ) * rn_e1deg
-     ! e2
+            !                       ! e2   (meridional)
             pe2t(ji,jj) = ra * rad * rn_e2deg
             pe2u(ji,jj) = ra * rad * rn_e2deg
@@ -109 +105 @@
       END DO
       !                             ! NO reduction of grid size in some straits 
-      ke1e2u_v = 0                  !    ==>> u_ & v_surfaces will be computed in dom_ghr routine
+      ke1e2u_v    = 0               !    ==>> u_ & v_surfaces will be computed in dom_ghr routine
       pe1e2u(:,:) = 0._wp           !    CAUTION: set to zero to avoid error with some compilers that
       pe1e2v(:,:) = 0._wp           !             require an initialization of INTENT(out) arguments
@@ -116 +112 @@
       !                       !==  Coriolis parameter  ==!
       kff = 0                       ! Coriolis parameter calculated on the sphere
-      !
-      !
       pff_f(:,:) = 0._wp            ! CAUTION: set to zero to avoid error with some compilers that
       pff_t(:,:) = 0._wp            !             require an initialization of INTENT(out) arguments
-      !
-      IF( nn_timing == 1 )  CALL timing_stop('usr_def_hgr')
       !
    END SUBROUTINE usr_def_hgr