Changeset 8882 for branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/OFF_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/OFF_SRC/nemogcm.F90 (modified) (5 diffs)

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

@@ -28 +28 @@
    USE trabbl          ! bottom boundary layer          (tra_bbl_init routine)
    USE traldf          ! lateral physics                (tra_ldf_init routine)
-   USE zdfini          ! vertical physics: initialization
-   USE sbcmod          ! surface boundary condition       (sbc_init     routine)
-   USE phycst          ! physical constant                  (par_cst routine)
+   USE sbcmod          ! surface boundary condition     (sbc_init     routine)
+   USE phycst          ! physical constant                   (par_cst routine)
    USE dtadyn          ! Lecture and Interpolation of the dynamical fields
    USE trcini          ! Initilization of the passive tracers
-   USE daymod          ! calendar                         (day     routine)
-   USE trcstp          ! passive tracer time-stepping      (trc_stp routine)
+   USE daymod          ! calendar                            (day     routine)
+   USE trcstp          ! passive tracer time-stepping        (trc_stp routine)
    USE dtadyn          ! Lecture and interpolation of the dynamical fields
    !              ! Passive tracers needs
@@ -158 +157 @@
       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
@@ -290 +289 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_init
+      IF( ln_timing    )   CALL timing_init
       !
 
       !                                      ! General initialization
-      IF( nn_timing == 1 )  CALL timing_start( 'nemo_init')
-      !
-                            CALL     phy_cst    ! Physical constants
-                            CALL     eos_init   ! Equation of state
-      IF( lk_c1d        )   CALL     c1d_init   ! 1D column configuration
-
-                            CALL     dom_init   ! Domain
-
-                            CALL  istate_init   ! ocean initial state (Dynamics and tracers)
-
-      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     sbc_init   ! Forcings : surface module
-
-                            CALL ldf_tra_init   ! Lateral ocean tracer physics
-                            CALL ldf_eiv_init   ! Eddy induced velocity param
-                            CALL tra_ldf_init   ! lateral mixing
-      IF( l_ldfslp )        CALL ldf_slp_init   ! slope of lateral mixing
-
-                            CALL tra_qsr_init   ! penetrative solar radiation qsr
-      IF( lk_trabbl     )   CALL tra_bbl_init   ! advective (and/or diffusive) bottom boundary layer scheme
-
-                            CALL trc_nam_run    ! Needed to get restart parameters for passive tracers
-                            CALL trc_rst_cal( nit000, 'READ' )   ! calendar
-                            CALL dta_dyn_init   ! Initialization for the dynamics
-
-                            CALL     trc_init   ! Passive tracers initialization
-                            CALL dia_ptr_init   ! Initialise diaptr as some variables are used 
+      IF( ln_timing    )   CALL timing_start( 'nemo_init')
+      !
+                           CALL     phy_cst    ! Physical constants
+                           CALL     eos_init   ! Equation of state
+      IF( lk_c1d       )   CALL     c1d_init   ! 1D column configuration
+
+                           CALL     dom_init   ! Domain
+
+                           CALL  istate_init   ! ocean initial state (Dynamics and tracers)
+
+      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     sbc_init   ! Forcings : surface module
+
+                           CALL ldf_tra_init   ! Lateral ocean tracer physics
+                           CALL ldf_eiv_init   ! Eddy induced velocity param
+                           CALL tra_ldf_init   ! lateral mixing
+      IF( l_ldfslp     )   CALL ldf_slp_init   ! slope of lateral mixing
+
+                           CALL tra_qsr_init   ! penetrative solar radiation qsr
+      IF( ln_trabbl    )   CALL tra_bbl_init   ! advective (and/or diffusive) bottom boundary layer scheme
+
+                           CALL trc_nam_run    ! Needed to get restart parameters for passive tracers
+                           CALL trc_rst_cal( nit000, 'READ' )   ! calendar
+                           CALL dta_dyn_init   ! Initialization for the dynamics
+
+                           CALL     trc_init   ! Passive tracers initialization
+                           CALL dia_ptr_init   ! Initialise diaptr as some variables are used 
       !                                         ! in various advection and diffusion routines
       IF(lwp) WRITE(numout,cform_aaa)           ! Flag AAAAAAA
       !
-      IF( nn_timing == 1 )  CALL timing_stop( 'nemo_init')
+      IF( ln_timing    )   CALL timing_stop( 'nemo_init')
       !
    END SUBROUTINE nemo_init
@@ -354 +353 @@
          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
       !
@@ -364 +364 @@
       isplt     = nn_isplt
       jsplt     = nn_jsplt
+!!gm to be remove at the end of the 2017 merge party
+      if( ln_timing ) then  ;  nn_timing = 1
+      else                  ;  nn_timing = 0
+      endif
+!!gm end