Changeset 9449 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_user.F90

Timestamp:

2018-03-30T17:37:02+02:00 (6 years ago)

Author:

smasson

Message:

dev_merge_2017: agrif bugfix for non-constant jpi/jpj + some cleaning...

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) (3 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_user.F90

@@ -19 +19 @@
    USE dom_oce
    USE nemogcm
+   USE mppini
    !!
    IMPLICIT NONE
@@ -24 +25 @@
    !
    IF( .NOT. Agrif_Root() ) THEN
-      jpni  = Agrif_Parent(jpni)
-      jpnj  = Agrif_Parent(jpnj)
-      jpnij = Agrif_Parent(jpnij)
-      jpiglo = nbcellsx + 2 + 2*nbghostcells
-      jpjglo = nbcellsy + 2 + 2*nbghostcells
-      jpi    = ( jpiglo-2*nn_hls + (jpni-1+0) ) / jpni + 2*nn_hls
-      jpj    = ( jpjglo-2*nn_hls + (jpnj-1+0) ) / jpnj + 2*nn_hls
-! JC: change to allow for different vertical levels
-!     jpk is already set
-!     keep it jpk possibly different from jpkglo which 
-!     hold parent grid vertical levels number (set earlier)
-!      jpk     = jpkglo 
-      jpim1  = jpi-1 
-      jpjm1  = jpj-1 
-      jpkm1  = MAX( 1, jpk-1 )                                         
-      jpij   = jpi*jpj 
-      nperio = 0
-      jperio = 0
+      ! no more static variables
+!!$! JC: change to allow for different vertical levels
+!!$!     jpk is already set
+!!$!     keep it jpk possibly different from jpkglo which 
+!!$!     hold parent grid vertical levels number (set earlier)
+!!$!      jpk     = jpkglo 
    ENDIF
    !
@@ -63 +52 @@
    !!----------------------------------------------------------------------
    !
-!!gm  I think this is now useless ...   nn_cfg & cn_cfg are set to -999999 and "UNKNOWN" 
-!!gm                                    when reading the AGRIF domain configuration file
-   IF( cn_cfg == 'orca' ) THEN
-      IF ( nn_cfg == 2 .OR. nn_cfg == 025 .OR. nn_cfg == 05  .OR. nn_cfg == 4 ) THEN
-         nn_cfg = -1    ! set special value for nn_cfg on fine grids
-         cn_cfg = "default"
-      ENDIF
-   ENDIF
-   !                    !* Specific fine grid Initializations
-   ln_tradmp = .FALSE.        ! no tracer damping on fine grids
-   !
-   ln_bdy    = .FALSE.        ! no open boundary on fine grids
-
    CALL nemo_init       !* Initializations of each fine grid