Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/NST_SRC

Timestamp:

2013-11-04T12:51:55+01:00 (11 years ago)

Author:

cetlod

Message:

merge in dev_LOCEAN_2013, the 1st development branch dev_r3853_CNRS9_Confsetting, from its starting point ( r3853 ) on the trunk: see ticket #1169

Location:

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/NST_SRC

Files:

• agrif_oce.F90 (modified) (1 diff)
• agrif_user.F90 (modified) (4 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90

@@ -19 +19 @@
 
    !                                              !!* Namelist namagrif: AGRIF parameters
-   LOGICAL , PUBLIC ::   ln_spc_dyn    = .FALSE.   !:
-   INTEGER , PUBLIC ::   nn_cln_update = 3         !: update frequency 
-   REAL(wp), PUBLIC ::   rn_sponge_tra = 2800.     !: sponge coeff. for tracers
-   REAL(wp), PUBLIC ::   rn_sponge_dyn = 2800.     !: sponge coeff. for dynamics
+   LOGICAL , PUBLIC ::   ln_spc_dyn      !:
+   INTEGER , PUBLIC ::   nn_cln_update   !: update frequency 
+   REAL(wp), PUBLIC ::   rn_sponge_tra   !: sponge coeff. for tracers
+   REAL(wp), PUBLIC ::   rn_sponge_dyn   !: sponge coeff. for dynamics
 
    !                                              !!! OLD namelist names

branches/2013/dev_LOCEAN_2013/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
+      jpk     = jpkdta 
+      jpim1   = jpi-1 
+      jpjm1   = jpj-1 
+      jpkm1   = jpk-1                                         
+      jpij    = jpi*jpj 
       jpidta  = jpiglo
       jpjdta  = jpjglo
@@ -63 +63 @@
    IMPLICIT NONE
    !!----------------------------------------------------------------------
-
    ! 0. Initializations
    !-------------------
-#if defined key_orca_r025 || defined key_orca_r05 || defined key_orca_r2 || defined key_orca_r4
-   jp_cfg = -1    ! set special value for jp_cfg on fine grids
-   cp_cfg = "default"
-#endif
-
+   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"
+      ENDIF
+   ENDIF
    ! Specific fine grid Initializations
    ! no tracer damping on fine grids
@@ -78 +79 @@
    lk_bdy = .FALSE.
 
+
    CALL nemo_init  ! Initializations of each fine grid
+
    CALL agrif_nemo_init
    CALL Agrif_InitValues_cont_dom
@@ -586 +589 @@
    IMPLICIT NONE
    !
+   INTEGER  ::   ios                 ! Local integer output status for namelist read
    NAMELIST/namagrif/ nn_cln_update, rn_sponge_tra, rn_sponge_dyn, ln_spc_dyn
    !!----------------------------------------------------------------------
    !
-   REWIND( numnam )                ! Read namagrif namelist
-   READ  ( numnam, namagrif )
+      REWIND( numnam_ref )              ! Namelist namagrif in reference namelist : AGRIF zoom
+      READ  ( numnam_ref, namagrif, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namagrif in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namagrif in configuration namelist : AGRIF zoom
+      READ  ( numnam_cfg, namagrif, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namagrif in configuration namelist', lwp )
+      WRITE ( numond, namagrif )
    !
    IF(lwp) THEN                    ! control print