Changeset 7825

Timestamp:

2017-03-23T14:24:56+01:00 (7 years ago)

Author:

timgraham

Message:

Extra temporary change in domzgr for my GYRE_AGRIF config
Commented out Jerome's old hack for different jpk in nemogcm.F90

Location:

branches/2015/dev_r5803_UKMO_AGRIF_Vert_interp/NEMOGCM/NEMO/OPA_SRC

Files:

• DOM/domzgr.F90 (modified) (1 diff)
• nemogcm.F90 (modified) (2 diffs)

branches/2015/dev_r5803_UKMO_AGRIF_Vert_interp/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -299 +299 @@
                e3t_1d  (jk) =          za0      + za1        * TANH(       (zt-zkth) / zacr   )
             END DO
+!TG - TODO - This is a hack to allow testing of GYRE config with a 41 layer nest
+!TG - Must be removed once I've worked out how to calculate the layer thicknesses properly
+            IF( .NOT. Agrif_Root() ) THEN
+               e3t_1d(:) = (/5.69226657,    5.7282521 ,    5.78191354,    5.86191665, &
+                  &          5.98115529,    6.15878971,    6.42323703,    6.81652219, &
+                  &          7.40052684,    8.26578541,    9.54347568,   11.42091507, &
+                  &          14.159753  ,   18.11336216,   23.7346412 ,   31.55708058, &
+                  &          42.12315778,   55.83521536,   72.73436197,   92.28447941, &
+                  &          95.91317061,  116.83091109,  136.08249632,  152.57360642, &
+                  &         165.85363829,  176.02574366,  183.52253918,  188.89206423,&
+                  &         192.65975729,  195.26553066,  197.04974008,  198.26304644,&
+                  &         199.08427365,  199.63836316,  200.01141353,  200.26221456,&
+                  &         200.43066431,  288.88936333,  288.90927064,  288.92261642,&
+                  &         302.17593646 /)
+            ENDIF
 ! MODIFY THE COMPUTATION OF GDEPW_1D - Laurent Debreu Change for Agrif Vertical interpolation
             gdepw_1d(1) = 0.
+            gdept_1d(1) = e3t_1d(1)/2.
             do jk=2,jpk
             gdepw_1d(jk) = gdepw_1d(jk-1)+e3t_1d(jk-1)
+            gdept_1d(jk) = gdepw_1d(jk) + e3t_1d(jk)/2.
             enddo
          ELSE

branches/2015/dev_r5803_UKMO_AGRIF_Vert_interp/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -358 +358 @@
          ! Save maximum number of levels in jpkdta, then define all vertical grids with this number.
          ! Suppress once vertical online interpolation is ok
-         IF(.NOT.Agrif_Root())   jpkdta = Agrif_Parent( jpkdta )
+!         IF(.NOT.Agrif_Root())   jpkdta = Agrif_Parent( jpkdta )
 #endif
          jpim1 = jpi-1                                            ! inner domain indices
@@ -504 +504 @@
                             CALL dia_tmb_init  ! TMB outputs
                             CALL dia_25h_init  ! 25h mean  outputs
-
       !
    END SUBROUTINE nemo_init