Changeset 6894 for branches/2016/dev_r6409_SIMPLIF_2_usrdef

Timestamp:

2016-08-26T15:17:07+02:00 (8 years ago)

Author:

flavoni

Message:

#1764, correction in domhgr, in SIMPLIF2 branch

File:

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

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

@@ -161 +161 @@
       &                 pe1t  , pe1u  , pe1v   , pe1f   ,   &    ! scale factors       (required)
       &                 pe2t  , pe2u  , pe2v   , pe2f   ,   &
-      &                 ke1e2u_v      , pe2_e1u, pe1_e2v    )    ! u- & v-surfaces (if gridsize reduction in some straits)
+      &                 ke1e2u_v      , pe1e2u , pe1e2v     )    ! u- & v-surfaces (if gridsize reduction in some straits)
       !!---------------------------------------------------------------------
       !!              ***  ROUTINE hgr_read  ***
@@ -175 +175 @@
       REAL(wp), DIMENSION(:,:), INTENT(out) ::   pe2t, pe2u, pe2v, pe2f       ! j-scale factors
       INTEGER                 , INTENT(out) ::   ke1e2u_v                     ! =1 u- & v-surfaces read here, =0 otherwise 
-      REAL(wp), DIMENSION(:,:), INTENT(out) ::   pe2_e1u, pe1_e2v             ! u- & v-surfaces (if found in file)
+      REAL(wp), DIMENSION(:,:), INTENT(out) ::   pe1e2u, pe1e2v              ! u- & v-surfaces (if found in file)
       !
       INTEGER  ::   inum                  ! logical unit
@@ -211 +211 @@
          & iom_varid( inum, 'ff_t', ldstop = .FALSE. ) > 0    ) THEN
          IF(lwp) WRITE(numout,*) '           Coriolis factor at f- and t-points read in domain_cfg 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 )
+         CALL iom_get( inum, jpdom_data, 'ff_f'  , pff_f  , lrowattr=ln_use_jattr )
+         CALL iom_get( inum, jpdom_data, 'ff_t'  , pff_t  , lrowattr=ln_use_jattr )
          kff = 1
       ELSE
@@ -220 +220 @@
       IF( iom_varid( inum, 'e1e2u', ldstop = .FALSE. ) > 0 ) THEN
          IF(lwp) WRITE(numout,*) '           e1e2u & e1e2v read in domain_cfg file'
-         CALL iom_get( inum, jpdom_data, 'e1e2u'  , e1e2u  , lrowattr=ln_use_jattr )
-         CALL iom_get( inum, jpdom_data, 'e1e2v'  , e1e2v  , lrowattr=ln_use_jattr )
+         CALL iom_get( inum, jpdom_data, 'e1e2u'  , pe1e2u  , lrowattr=ln_use_jattr )
+         CALL iom_get( inum, jpdom_data, 'e1e2v'  , pe1e2v  , lrowattr=ln_use_jattr )
          ke1e2u_v = 1
       ELSE