Changeset 14072 for NEMO/trunk/tests/STATION_ASF/MY_SRC/usrdef_hgr.F90

Timestamp:

2020-12-04T08:48:38+01:00 (3 years ago)

Author:

laurent

Message:

Merging branch "2020/dev_r13648_ASINTER-04_laurent_bulk_ice", ticket #2369

File:

• NEMO/trunk/tests/STATION_ASF/MY_SRC/usrdef_hgr.F90 (modified) (8 diffs)

NEMO/trunk/tests/STATION_ASF/MY_SRC/usrdef_hgr.F90

@@ -12 +12 @@
 
    !!----------------------------------------------------------------------
-   !!   usr_def_hgr   : initialize the horizontal mesh 
+   !!   usr_def_hgr   : initialize the horizontal mesh
    !!----------------------------------------------------------------------
+   USE dom_oce  , ONLY: nimpp, njmpp       ! ocean space and time domain
    USE c1d      ,  ONLY: rn_lon1d, rn_lat1d ! ocean lon/lat define by namelist
    USE par_oce        ! ocean space and time domain
@@ -21 +22 @@
    USE in_out_manager ! I/O manager
    USE lib_mpp        ! MPP library
-   
+
    IMPLICIT NONE
    PRIVATE
@@ -29 +30 @@
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
-   !! $Id: usrdef_hgr.F90 12489 2020-02-28 15:55:11Z davestorkey $ 
+   !! $Id: usrdef_hgr.F90 13216 2020-07-02 09:25:49Z rblod $
    !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
@@ -48 +49 @@
       !!
       !!                Here STATION_ASF configuration :
-      !!          Rectangular 3x3 domain 
+      !!          Rectangular 3x3 domain
       !!          - Located at 150E-50N
-      !!          - a constant horizontal resolution  
+      !!          - a constant horizontal resolution
       !!
-      !! ** Action  : - define longitude & latitude of t-, u-, v- and f-points (in degrees) 
+      !! ** Action  : - define longitude & latitude of t-, u-, v- and f-points (in degrees)
       !!              - define coriolis parameter at f-point if the domain in not on the sphere (on beta-plane)
       !!              - define i- & j-scale factors at t-, u-, v- and f-points (in meters)
@@ -63 +64 @@
       REAL(wp), DIMENSION(:,:), INTENT(out) ::   pe1t, pe1u, pe1v, pe1f       ! i-scale factors                             [m]
       REAL(wp), DIMENSION(:,:), INTENT(out) ::   pe2t, pe2u, pe2v, pe2f       ! j-scale factors                             [m]
-      INTEGER                 , INTENT(out) ::   ke1e2u_v                     ! =1 u- & v-surfaces computed here, =0 otherwise 
+      INTEGER                 , INTENT(out) ::   ke1e2u_v                     ! =1 u- & v-surfaces computed here, =0 otherwise
       REAL(wp), DIMENSION(:,:), INTENT(out) ::   pe1e2u, pe1e2v               ! u- & v-surfaces (if reduction in strait)   [m2]
       !
@@ -77 +78 @@
       !                       ! longitude
       plamt(:,:) = rn_lon1d
-      plamu(:,:) = rn_lon1d 
+      plamu(:,:) = rn_lon1d
       plamv(:,:) = rn_lon1d
       plamf(:,:) = rn_lon1d
@@ -93 +94 @@
       pe1f(:,:) = 100.  ;   pe2f(:,:) = 100.
       !
-      !                                         ! NO reduction of grid size in some straits 
+      !                                         ! NO reduction of grid size in some straits
       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
@@ -100 +101 @@
       !
       !                       !==  Coriolis parameter  ==!
-      zf0   = 2._wp * omega * SIN( rad * rn_lat1d )      
+      zf0   = 2._wp * omega * SIN( rad * rn_lat1d )
       pff_f(:,:) = zf0
-      pff_t(:,:) = zf0      
+      pff_t(:,:) = zf0
       kff = 1                 !  indicate to skip computing Coriolis parameter afterward
       !