Changeset 6596 for branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90

Timestamp:

2016-05-22T20:11:06+02:00 (8 years ago)

Author:

gm

Message:

#1692 - branch SIMPLIF_2_usrdef: remove from namcfg and namdom many obsolete variables ; remove izoom/jzoom option

File:

• branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90 (modified) (6 diffs)

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90

@@ -95 +95 @@
          CALL hgr_read   ( glamt , glamu , glamv , glamf ,   &    ! geographic position (required)
             &              gphit , gphiu , gphiv , gphif ,   &    !     -        -
-            &              iff   , ff    ,                   &    ! Coriolis parameter (if not on the sphere)
+            &              iff   , ff_f  , ff_t  ,           &    ! Coriolis parameter (if not on the sphere)
             &              e1t   , e1u   , e1v   , e1f   ,   &    ! scale factors (required)
             &              e2t   , e2u   , e2v   , e2f   ,   &    !    -     -        -
@@ -106 +106 @@
          CALL usr_def_hgr( glamt , glamu , glamv , glamf ,   &    ! geographic position (required)
             &              gphit , gphiu , gphiv , gphif ,   &    !
-            &              iff   , ff    ,                   &    ! Coriolis parameter  (if domain not on the sphere)
+            &              iff   , ff_f  , ff_t  ,           &    ! Coriolis parameter  (if domain not on the sphere)
             &              e1t   , e1u   , e1v   , e1f   ,   &    ! scale factors       (required)
             &              e2t   , e2u   , e2v   , e2f   ,   &    !
@@ -116 +116 @@
       !
       IF( iff == 0 ) THEN                 ! Coriolis parameter has not been defined 
-         IF(lwp) WRITE(numout,*) '          Coriolis parameter calculated on the sphere from gphif'
-         ff(:,:) = 2. * omega * SIN( rad * gphif(:,:) )     ! compute it on the sphere
+         IF(lwp) WRITE(numout,*) '          Coriolis parameter calculated on the sphere from gphif & gphit'
+         ff_f(:,:) = 2. * omega * SIN( rad * gphif(:,:) )     ! compute it on the sphere at f-point
+         ff_t(:,:) = 2. * omega * SIN( rad * gphit(:,:) )     !    -        -       -    at t-point
       ELSE
          IF(lwp) WRITE(numout,*) '          Coriolis parameter have been read in "mesh_mask" file'
@@ -153 +154 @@
    SUBROUTINE hgr_read( plamt , plamu , plamv  , plamf  ,     &    ! gridpoints position (required)
       &                 pphit , pphiu , pphiv  , pphif  ,     &     
-      &                 kff   , pff   ,                       &    ! Coriolis parameter  (if not on the sphere)
+      &                 kff   , pff_f , pff_t  ,              &    ! Coriolis parameter  (if not on the sphere)
       &                 pe1t  , pe1u  , pe1v   , pe1f   ,     &    ! scale factors       (required)
       &                 pe2t  , pe2u  , pe2v   , pe2f   ,     &
@@ -166 +167 @@
       REAL(wp), DIMENSION(:,:), INTENT(out) ::   pphit, pphiu, pphiv, pphif   ! latitude outputs
       INTEGER                 , INTENT(out) ::   kff                          ! =1 Coriolis parameter read here, =0 otherwise
-      REAL(wp), DIMENSION(:,:), INTENT(out) ::   pff                          ! Coriolis factor at f-point (if found in file)
+      REAL(wp), DIMENSION(:,:), INTENT(out) ::   pff_f, pff_t                 ! Coriolis factor at f-point (if found in file)
       REAL(wp), DIMENSION(:,:), INTENT(out) ::   pe1t, pe1u, pe1v, pe1f       ! i-scale factors 
       REAL(wp), DIMENSION(:,:), INTENT(out) ::   pe2t, pe2u, pe2v, pe2f       ! j-scale factors
@@ -210 +211 @@
       CALL iom_get( inum, jpdom_data, 'e2f'  , pe2f  , lrowattr=ln_use_jattr )
       !
-      IF( iom_varid( inum, 'ff', ldstop = .FALSE. ) > 0 ) THEN
-         IF(lwp) WRITE(numout,*) '           ff read in mesh_mask file'
-         CALL iom_get( inum, jpdom_data, 'ff'  , ff  , lrowattr=ln_use_jattr )
+      IF(  iom_varid( inum, 'ff_f', ldstop = .FALSE. ) > 0  .AND.  &
+         & iom_varid( inum, 'ff_t', ldstop = .FALSE. ) > 0    ) THEN
+         IF(lwp) WRITE(numout,*) '           Coriolis factor at f- and t-points read in mesh_mask file'
+         CALL iom_get( inum, jpdom_data, 'ff_f'  , ff_f  , lrowattr=ln_use_jattr )
+         CALL iom_get( inum, jpdom_data, 'ff_t'  , ff_t  , lrowattr=ln_use_jattr )
          kff = 1
       ELSE