Changeset 7069 for branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2016-10-21T19:24:28+02:00 (8 years ago)

Author:

clem

Message:

agrif+lim3 update + trunk update

Location:

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC

Files:

• DOM/domhgr.F90 (modified) (1 diff)
• DOM/domzgr.F90 (modified) (3 diffs)
• IOM/iom.F90 (modified) (3 diffs)
• ZDF/zdfric.F90 (modified) (1 diff)

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

@@ -451 +451 @@
          e1v(:,:) =  ze1     ;      e2v(:,:) = ze1
          e1f(:,:) =  ze1     ;      e2f(:,:) = ze1
+
+      CASE ( 6 )                   ! clem: f-plane with irregular grid-spacing
+
+         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*) '          f-plane with irregular grid-spacing (+- 10%)'
+         IF(lwp) WRITE(numout,*) '          the max is given by ppe1_m and ppe2_m' 
+
+         ! Position coordinates (in kilometers)
+         !                          ==========
+         glam0 = 0._wp
+         gphi0 = 0._wp
+         
+         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
+
+               glamt(ji,jj) = glam0 + ppe1_m * 1.e-5 * zti
+               glamu(ji,jj) = glam0 + ppe1_m * 1.e-5 * zui
+               glamv(ji,jj) = glam0 + ppe1_m * 1.e-5 * zvi
+               glamf(ji,jj) = glam0 + ppe1_m * 1.e-5 * zfi
+   
+               gphit(ji,jj) = gphi0 + ppe2_m * 1.e-5 * ztj
+               gphiu(ji,jj) = gphi0 + ppe2_m * 1.e-5 * zuj
+               gphiv(ji,jj) = gphi0 + ppe2_m * 1.e-5 * zvj
+               gphif(ji,jj) = gphi0 + ppe2_m * 1.e-5 * zfj
+            END DO
+         END DO
+         
+         ! Horizontal scale factors (in meters)
+         !                              ======
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               e1t(ji,jj) = ppe1_m * EXP(-0.8/REAL(jpiglo**2)*(mi0(ji)-REAL(jpiglo+1)*0.5)**2)
+               e2t(ji,jj) = ppe2_m * EXP(-0.8/REAL(jpjglo**2)*(mj0(jj)-REAL(jpjglo+1)*0.5)**2)
+            END DO
+         END DO
+         e1u(:,:) = e1t(:,:)      ;      e2u(:,:) = e2t(:,:)
+         e1v(:,:) = e1t(:,:)      ;      e2v(:,:) = e2t(:,:)
+         e1f(:,:) = e1t(:,:)      ;      e2f(:,:) = e2t(:,:)
 
       CASE DEFAULT

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -135 +135 @@
       ! Build the vertical coordinate system
       ! ------------------------------------
+#if defined key_sas2D
+      WRITE(numout,*) ' domzgr: we use SAS2D (i.e. no ocean) with jpk=',jpk
+      mbathy(:,:) = 1   ;   bathy(:,:) = rn_hmin
+
+      gdept_0 (:,:,:) = rn_hmin
+      gdepw_0 (:,:,:) = rn_hmin   ;   gdep3w_0(:,:,:) = rn_hmin
+      gdept_1d(:)     = rn_hmin   ;   gdepw_1d(:)     = rn_hmin
+
+      e3t_0 (:,:,:) = rn_hmin
+      e3u_0 (:,:,:) = rn_hmin   ;   e3v_0 (:,:,:) = rn_hmin
+      e3f_0 (:,:,:) = rn_hmin   ;   e3w_0 (:,:,:) = rn_hmin
+      e3uw_0(:,:,:) = rn_hmin   ;   e3vw_0(:,:,:) = rn_hmin
+      e3t_1d(:)     = rn_hmin   ;   e3w_1d(:)     = rn_hmin
+
+      mikt(:,:) = 1   ;   mikv(:,:) = 1
+      miku(:,:) = 1   ;   mikf(:,:) = 1
+#else
                           CALL zgr_z            ! Reference z-coordinate system (always called)
                           CALL zgr_bat          ! Bathymetry fields (levels and meters)
@@ -154 +171 @@
       END IF
       !
+#endif
+      
       IF( nprint == 1 .AND. lwp )   THEN
          WRITE(numout,*) ' MIN val mbathy ', MINVAL( mbathy(:,:) ), ' MAX ', MAXVAL( mbathy(:,:) )
@@ -174 +193 @@
       !
    END SUBROUTINE dom_zgr
-
 
    SUBROUTINE zgr_z

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -102 +102 @@
 #endif
       CHARACTER(len=10)   :: clname
-      INTEGER             :: ji
+      INTEGER             :: ji, jkmin
       !
       REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: z_bnds
@@ -190 +190 @@
 
       ! Add vertical grid bounds
+      jkmin = MIN(2,jpk)  ! in case jpk=1 (i.e. sas2D)
 #if ! defined key_xios2
       z_bnds(:      ,1) = gdepw_1d(:)
-      z_bnds(1:jpkm1,2) = gdepw_1d(2:jpk)
+      z_bnds(1:jpkm1,2) = gdepw_1d(jkmin:jpk)
       z_bnds(jpk:   ,2) = gdepw_1d(jpk) + e3t_1d(jpk)
 #else
       z_bnds(1      ,:) = gdepw_1d(:)
-      z_bnds(2,1:jpkm1) = gdepw_1d(2:jpk)
+      z_bnds(2,1:jpkm1) = gdepw_1d(jkmin:jpk)
       z_bnds(2,jpk:   ) = gdepw_1d(jpk) + e3t_1d(jpk)
 #endif
@@ -205 +206 @@
 
 #if ! defined key_xios2
-      z_bnds(:    ,2)  = gdept_1d(:)
-      z_bnds(2:jpk,1)  = gdept_1d(1:jpkm1)
-      z_bnds(1    ,1)  = gdept_1d(1) - e3w_1d(1)
-#else
-      z_bnds(2,:    )  = gdept_1d(:)
-      z_bnds(1,2:jpk)  = gdept_1d(1:jpkm1)
-      z_bnds(1,1    )  = gdept_1d(1) - e3w_1d(1)
+      z_bnds(:        ,2) = gdept_1d(:)
+      z_bnds(jkmin:jpk,1) = gdept_1d(1:jpkm1)
+      z_bnds(1        ,1) = gdept_1d(1) - e3w_1d(1)
+#else
+      z_bnds(2,:        ) = gdept_1d(:)
+      z_bnds(1,jkmin:jpk) = gdept_1d(1:jpkm1)
+      z_bnds(1,1        ) = gdept_1d(1) - e3w_1d(1)
 #endif
       CALL iom_set_axis_attr( "depthw", bounds=z_bnds )
-
 
 # if defined key_floats

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90

@@ -162 +162 @@
                   &                               + avmv(ji,jj,jk) + avmv(ji,jj-1,jk)  )   &
                   &          + avtb(jk) * tmask(ji,jj,jk)
-               !                                            ! Add the background coefficient on eddy viscosity
+            END DO
+         END DO
+         DO jj = 2, jpjm1                                   ! Add the background coefficient on eddy viscosity
+            DO ji = 2, jpim1
                avmu(ji,jj,jk) = avmu(ji,jj,jk) + avmb(jk) * umask(ji,jj,jk)
                avmv(ji,jj,jk) = avmv(ji,jj,jk) + avmb(jk) * vmask(ji,jj,jk)