Changeset 6717 for branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2016-06-17T12:00:46+02:00 (8 years ago)

Author:

gm

Message:

#1692 - branch SIMPLIF_2_usrdef: numerous improvement in the user defined interface

File:

• branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (5 diffs)

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -93 +93 @@
    USE dia25h         ! 25h mean output
    USE wet_dry        ! Wetting and drying setting   (wad_init routine)
-   USE usrdef         ! user defined configuration
+   USE usrdef_nam     ! user defined configuration
 
    IMPLICIT NONE
@@ -105 +105 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.7 , NEMO Consortium (2015)
+   !! NEMO/OPA 4.0 , NEMO Consortium (2016)
    !! $Id$
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
@@ -300 +300 @@
       ENDIF
       jpk    = jpkglo
-      jpidta = jpiglo         !!gm  jpidta, jpjdta : to be suppressed
-      jpjdta = jpjglo         !!gm   
-      jpkdta = jpkglo
       !
 #if defined key_agrif
@@ -310 +307 @@
          jpi     = ( jpiglo-2*jpreci + (jpni-1+0) ) / jpni + 2*jpreci
          jpj     = ( jpjglo-2*jprecj + (jpnj-1+0) ) / jpnj + 2*jprecj
-         jpidta  = jpiglo
-         jpjdta  = jpjglo
          nperio  = 0
          jperio  = 0
@@ -387 +382 @@
 #endif
       ENDIF
-               
-      jpk = jpkdta                                             ! third dim
-      
+
+!!gm ???    why here  it has already been done in line 301 !
+      jpk = jpkglo                                             ! third dim
+!!gm end
+
 #if defined key_agrif
       ! simple trick to use same vertical grid as parent but different number of levels: 
-      ! Save maximum number of levels in jpkdta, then define all vertical grids with this number.
+      ! Save maximum number of levels in jpkglo, 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())   jpkglo = Agrif_Parent( jpkglo )
 #endif
       jpim1 = jpi-1                                            ! inner domain indices