Changeset 8882 for branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/SAO_SRC/nemogcm.F90

Timestamp:

2017-12-01T18:44:09+01:00 (6 years ago)

Author:

flavoni

Message:

dev_CNRS_2017 branch: merged dev_r7881_ENHANCE09_RK3 with trunk r8864

File:

• branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/SAO_SRC/nemogcm.F90 (modified) (3 diffs)

branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/SAO_SRC/nemogcm.F90

@@ -97 +97 @@
       NAMELIST/namctl/ ln_ctl   , nn_print, nn_ictls, nn_ictle,   &
          &             nn_isplt , nn_jsplt, nn_jctls, nn_jctle,   &
-         &             nn_timing, nn_diacfl
+         &             ln_timing, ln_diacfl
       NAMELIST/namcfg/ ln_read_cfg, cn_domcfg, ln_write_cfg, cn_domcfg_out, ln_use_jattr
       !!----------------------------------------------------------------------
@@ -259 +259 @@
       !                             !-------------------------------!
 
-      CALL nemo_ctl                          ! Control prints & Benchmark
-
-      !                                      ! Domain decomposition
+      CALL nemo_ctl                             ! Control prints & Benchmark
+
+      !                                         ! Domain decomposition
       IF( jpni*jpnj == jpnij ) THEN   ;   CALL mpp_init      ! standard cutting out
       ELSE                            ;   CALL mpp_init2     ! eliminate land processors
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_init
-      !
-      !                                      ! General initialization
-                            CALL     phy_cst    ! Physical constants
-                            CALL     eos_init   ! Equation of state
-                            CALL     dom_init   ! Domain
-
-      IF( ln_nnogather )    CALL nemo_northcomms   ! Initialise the northfold neighbour lists (must be done after the masks are defined)
-
-      IF( ln_ctl        )   CALL prt_ctl_init   ! Print control
-
-                            CALL  istate_init   ! ocean initial state (Dynamics and tracers)
+      IF( ln_timing    )   CALL timing_init     ! timing by routine
+      !
+      !                                         ! General initialization
+                           CALL phy_cst            ! Physical constants
+                           CALL eos_init           ! Equation of state
+                           CALL dom_init           ! Domain
+
+      IF( ln_nnogather )   CALL nemo_northcomms ! Initialise the northfold neighbour lists (must be done after the masks are defined)
+
+      IF( ln_ctl       )   CALL prt_ctl_init    ! Print control
+
+                           CALL istate_init     ! ocean initial state (Dynamics and tracers)
    END SUBROUTINE nemo_init
 
@@ -303 +303 @@
          WRITE(numout,*) '      number of proc. following i     nn_isplt   = ', nn_isplt
          WRITE(numout,*) '      number of proc. following j     nn_jsplt   = ', nn_jsplt
-         WRITE(numout,*) '      timing activated    (0/1)       nn_timing  = ', nn_timing
+         WRITE(numout,*) '      timing by routine               ln_timing  = ', ln_timing
+         WRITE(numout,*) '      CFL diagnostics                 ln_diacfl  = ', ln_diacfl
       ENDIF
       !