Changeset 4018 for branches/2013/dev_r3853_CNRS9_ConfSetting/NEMOGCM/NEMO/NST_SRC/agrif_user.F90

Timestamp:

2013-09-09T15:43:56+02:00 (11 years ago)

Author:

clevy

Message:

Configuration setting, bugfixes for AGRIF, see ticket:#1074

File:

• branches/2013/dev_r3853_CNRS9_ConfSetting/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) (3 diffs)

branches/2013/dev_r3853_CNRS9_ConfSetting/NEMOGCM/NEMO/NST_SRC/agrif_user.F90

@@ -31 +31 @@
       jpi     = ( jpiglo-2*jpreci + (jpni-1+0) ) / jpni + 2*jpreci
       jpj     = ( jpjglo-2*jprecj + (jpnj-1+0) ) / jpnj + 2*jprecj
-      jpk     = jpkdta
-      jpim1   = jpi-1
-      jpjm1   = jpj-1
-      jpkm1   = jpk-1                                        
-      jpij    = jpi*jpj
       jpidta  = jpiglo
       jpjdta  = jpjglo
@@ -63 +58 @@
    IMPLICIT NONE
    !!----------------------------------------------------------------------
-
    ! 0. Initializations
    !-------------------
-   IF( cp_cfg == 'orca' .AND. jp_cfg == 2 .OR. jp_cfg == 025 .OR. jp_cfg == 05 &
+   IF( cp_cfg == 'orca' ) then
+      IF ( jp_cfg == 2 .OR. jp_cfg == 025 .OR. jp_cfg == 05 &
   &                      .OR. jp_cfg == 4 ) THEN
-      jp_cfg = -1    ! set special value for jp_cfg on fine grids
-      cp_cfg = "default"
+         jp_cfg = -1    ! set special value for jp_cfg on fine grids
+         cp_cfg = "default"
+      ENDIF
    ENDIF
    ! Specific fine grid Initializations
@@ -78 +74 @@
    lk_bdy = .FALSE.
 
+
    CALL nemo_init  ! Initializations of each fine grid
+
    CALL agrif_nemo_init
    CALL Agrif_InitValues_cont_dom