Changeset 8568 for branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90

Timestamp:

2017-09-27T16:29:24+02:00 (7 years ago)

Author:

gm

Message:

#1911 (ENHANCE-09): PART I.2 - _NONE option + remove zts + see associated wiki page

File:

• branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90 (modified) (5 diffs)

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90

@@ -136 +136 @@
       IF( .NOT. Agrif_Root() ) THEN
          CALL Agrif_ParentGrid_To_ChildGrid()
-         IF( nn_timing == 1 )   CALL timing_finalize
+         IF( ln_timing )   CALL timing_finalize
          CALL Agrif_ChildGrid_To_ParentGrid()
       ENDIF
 #endif
-      IF( nn_timing == 1 )   CALL timing_finalize
+      IF( ln_timing )   CALL timing_finalize
       !
       CALL nemo_closefile
@@ -172 +172 @@
       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
       !!----------------------------------------------------------------------
@@ -353 +353 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_init
+      IF( ln_timing    )   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 day_init   ! model calendar (using both namelist and restart infos)
-
-                            CALL sbc_init   ! Forcings : surface module 
+                           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 day_init   ! model calendar (using both namelist and restart infos)
+
+                           CALL sbc_init   ! Forcings : surface module 
 
       ! ==> clem: open boundaries init. is mandatory for LIM3 because ice BDY is not decoupled from  
       !           the environment of ocean BDY. Therefore bdy is called in both OPA and SAS modules. 
       !           This is not clean and should be changed in the future. 
-                            CALL bdy_init
+                           CALL bdy_init
       ! ==>
-                            CALL icb_init( rdt, nit000)   ! initialise icebergs instance
+                           CALL icb_init( rdt, nit000)   ! initialise icebergs instance
       
       IF(lwp) WRITE(numout,*) 'Euler time step switch is ', neuler
@@ -401 +401 @@
          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
       !
@@ -411 +412 @@
       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
 
       IF(lwp) THEN                  ! control print