Changeset 9169 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC

Timestamp:

2017-12-26T17:32:56+01:00 (7 years ago)

Author:

gm

Message:

dev_merge_2017: all SRC: finalize the removal of useless warning when reading namelist_cfg + remove all nn_closea + nn_msh replaced by a logical

File:

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

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

@@ -24 +24 @@
    !
    IF( .NOT. Agrif_Root() ) THEN
-      jpni = Agrif_Parent(jpni)
-      jpnj = Agrif_Parent(jpnj)
+      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
+      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
@@ -36 +36 @@
 !     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
+      jpim1  = jpi-1 
+      jpjm1  = jpj-1 
+      jpkm1  = MAX( 1, jpk-1 )                                         
+      jpij   = jpi*jpj 
+      nperio = 0
+      jperio = 0
    ENDIF
    !
@@ -780 +780 @@
    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 )
-
+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 )
+902 IF( ios >  0 )   CALL ctl_nam ( ios , 'namagrif in configuration namelist', lwp )
    IF(lwm) WRITE ( numond, namagrif )
    !
@@ -796 +795 @@
       WRITE(numout,*) '      use special values for dynamics   ln_spc_dyn    = ', ln_spc_dyn
       WRITE(numout,*) '      check bathymetry                  ln_chk_bathy  = ', ln_chk_bathy
-      WRITE(numout,*) 
    ENDIF
    !