Changeset 5758 for branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90

Timestamp:

2015-09-24T08:31:40+02:00 (9 years ago)

Author:

gm

Message:

#1593: LDF-ADV, step II.1: phasing the improvements/simplifications of diffusive trend (see wiki)

File:

• branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90 (modified) (7 diffs)

branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90

@@ -14 +14 @@
    !!                            use of parameters in par_CONFIG-Rxx.h90, not in namelist
    !!             -   ! 2004-05  (A. Koch-Larrouy) Add Gyre configuration 
-   !!            3.7  ! 2015-09  (G. Madec) add cell surface and their inverse
+   !!            3.7  ! 2015-09  (G. Madec, S. Flavoni) add cell surface and their inverse
    !!                                       add optional read of e1e2u & e1e2v
    !!----------------------------------------------------------------------
@@ -126 +126 @@
       ENDIF
       !
-      ie1e2u_v = 0               !  set to unread e1e2u and e1e2v
       !
       SELECT CASE( jphgr_msh )   !  type of horizontal mesh  
@@ -135 +134 @@
          IF(lwp) WRITE(numout,*) '          curvilinear coordinate on the sphere read in "coordinate" file'
          !
-         CALL hgr_read( ie1e2u_v )
+         ie1e2u_v = 0                  ! set to unread e1e2u and e1e2v
+         !
+         CALL hgr_read( ie1e2u_v )     ! read the coordinate.nc file
          !
          IF( ie1e2u_v == 0 ) THEN      ! e1e2u and e1e2v have not been read: compute them
@@ -141 +142 @@
             e1e2u (:,:) = e1u(:,:) * e2u(:,:)   
             e1e2v (:,:) = e1v(:,:) * e2v(:,:) 
-
-         !
-         !                                                ! =====================
-            IF( ie1e2u_v == 0 )   CALL dom_wri_coordinate
-            !
-            !
          ENDIF
-
-
-         !
-         ! N.B. :  General case, lat and long function of both i and j indices:
-         !     e1t(ji,jj) = ra * rad * SQRT(  ( cos( rad*gphit(ji,jj) ) * fsdila( zti, ztj ) )**2   &
-         !                                  + (                           fsdiph( zti, ztj ) )**2  )
-         !     e1u(ji,jj) = ra * rad * SQRT(  ( cos( rad*gphiu(ji,jj) ) * fsdila( zui, zuj ) )**2   &
-         !                                  + (                           fsdiph( zui, zuj ) )**2  )
-         !     e1v(ji,jj) = ra * rad * SQRT(  ( cos( rad*gphiv(ji,jj) ) * fsdila( zvi, zvj ) )**2   &
-         !                                  + (                           fsdiph( zvi, zvj ) )**2  )
-         !     e1f(ji,jj) = ra * rad * SQRT(  ( cos( rad*gphif(ji,jj) ) * fsdila( zfi, zfj ) )**2   &
-         !                                  + (                           fsdiph( zfi, zfj ) )**2  )
-         !
-         !     e2t(ji,jj) = ra * rad * SQRT(  ( cos( rad*gphit(ji,jj) ) * fsdjla( zti, ztj ) )**2   &
-         !                                  + (                           fsdjph( zti, ztj ) )**2  )
-         !     e2u(ji,jj) = ra * rad * SQRT(  ( cos( rad*gphiu(ji,jj) ) * fsdjla( zui, zuj ) )**2   &
-         !                                  + (                           fsdjph( zui, zuj ) )**2  )
-         !     e2v(ji,jj) = ra * rad * SQRT(  ( cos( rad*gphiv(ji,jj) ) * fsdjla( zvi, zvj ) )**2   &
-         !                                  + (                           fsdjph( zvi, zvj ) )**2  )
-         !     e2f(ji,jj) = ra * rad * SQRT(  ( cos( rad*gphif(ji,jj) ) * fsdjla( zfi, zfj ) )**2   &
-         !                                  + (                           fsdjph( zfi, zfj ) )**2  )
-         !
          !
       CASE ( 1 )                     !==  geographical mesh on the sphere with regular (in degree) grid-spacing  ==!
@@ -214 +187 @@
          ! Position coordinates (in kilometers)
          !                          ==========
-         glam0 = 0.e0
+         glam0 = 0._wp
          gphi0 = - ppe2_m * 1.e-3
          !
@@ -309 +282 @@
          ze1 = 106000. / REAL( jp_cfg , wp )            
          ! benchmark: forced the resolution to be about 100 km
-         IF( nbench /= 0 )   ze1 = 106000.e0     
+         IF( nbench /= 0 )   ze1 = 106000._wp     
          zsin_alpha = - SQRT( 2._wp ) * 0.5_wp
          zcos_alpha =   SQRT( 2._wp ) * 0.5_wp
@@ -444 +417 @@
          !
          zbeta = 2. * omega * COS( rad * ppgphi0 ) / ra                     ! beta at latitude ppgphi0
-         zphi0 = 15.e0                                                      ! latitude of the first row F-points
+         zphi0 = 15._wp                                                     ! latitude of the first row F-points
          zf0   = 2. * omega * SIN( rad * zphi0 )                            ! compute f0 1st point south
          !