Changeset 9124 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/FLO

Timestamp:

2017-12-19T09:26:25+01:00 (7 years ago)

Author:

gm

Message:

dev_merge_2017: ln_timing instead of nn_timing + restricted timing to nemo_init and routine called by step in OPA_SRC

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/FLO

Files:

• flo_oce.F90 (modified) (2 diffs)
• floats.F90 (modified) (6 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/FLO/flo_oce.F90

@@ -7 +7 @@
    !!   NEMO      1.0  ! 2002-11  (G. Madec, A. Bozec)  F90: Free form and module
    !!----------------------------------------------------------------------
-#if   defined key_floats
+#if   defined   key_floats
    !!----------------------------------------------------------------------
    !!   'key_floats'                                        drifting floats
@@ -61 +61 @@
       !!----------------------------------------------------------------------
       ALLOCATE( wb(jpi,jpj,jpk) , nfloat(jpnfl) , nisobfl(jpnfl) , ngrpfl(jpnfl) , &
-                flxx(jpnfl)     , flyy(jpnfl)   , flzz(jpnfl)    ,                 & 
-                tpifl(jpnfl)    , tpjfl(jpnfl)  , tpkfl(jpnfl)   , STAT=flo_oce_alloc )
+         &      flxx(jpnfl)     , flyy(jpnfl)   , flzz(jpnfl)    ,                 & 
+         &      tpifl(jpnfl)    , tpjfl(jpnfl)  , tpkfl(jpnfl)   , STAT=flo_oce_alloc )
       !
       IF( lk_mpp             )   CALL mpp_sum ( flo_oce_alloc )

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90

@@ -7 +7 @@
    !!   NEMO     1.0  ! 2002-06  (A. Bozec)  F90, Free form and module
    !!----------------------------------------------------------------------
-#if   defined key_floats
+#if   defined   key_floats
    !!----------------------------------------------------------------------
    !!   'key_floats'                                     float trajectories
@@ -22 +22 @@
    USE flo4rk          ! Trajectories, Runge Kutta scheme (flo_4rk routine)
    USE floblk          ! Trajectories, Blanke scheme      (flo_blk routine)
+   !
    USE in_out_manager  ! I/O manager
    USE timing          ! preformance summary
@@ -52 +53 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )   CALL timing_start('flo_stp')
+      IF( ln_timing )   CALL timing_start('flo_stp')
       !
       IF( ln_flork4 ) THEN   ;   CALL flo_4rk( kt )        ! Trajectories using a 4th order Runge Kutta scheme
@@ -66 +67 @@
       wb(:,:,:) = wn(:,:,:)         ! Save the old vertical velocity field
       !
-      IF( nn_timing == 1 )   CALL timing_stop('flo_stp')
+      IF( ln_timing )   CALL timing_stop('flo_stp')
       !
    END SUBROUTINE flo_stp
@@ -77 +78 @@
       !! ** Purpose :   Read the namelist of floats
       !!----------------------------------------------------------------------
-      INTEGER :: jfl
-      INTEGER :: ios                 ! Local integer output status for namelist read
+      INTEGER ::   jfl
+      INTEGER ::   ios                 ! Local integer output status for namelist read
       !
       NAMELIST/namflo/ jpnfl, jpnnewflo, ln_rstflo, nn_writefl, nn_stockfl, ln_argo, ln_flork4, ln_ariane, ln_flo_ascii
       !!---------------------------------------------------------------------
-      !
-      IF( nn_timing == 1 )   CALL timing_start('flo_init')
       !
       IF(lwp) WRITE(numout,*)
@@ -125 +124 @@
       IF( flo_rst_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'flo_rst : unable to allocate arrays' )
       !
-      !memory allocation 
-      jpnrstflo = jpnfl-jpnnewflo
-
-      !vertical axe for netcdf IOM ouput
-      DO jfl=1,jpnfl ; nfloat(jfl)=jfl ; ENDDO
-
+      jpnrstflo = jpnfl-jpnnewflo   ! memory allocation 
+      !
+      DO jfl = 1, jpnfl             ! vertical axe for netcdf IOM ouput
+         nfloat(jfl) = jfl 
+      END DO
       !
       CALL flo_dom                  ! compute/read initial position of floats
-
+      !
       wb(:,:,:) = wn(:,:,:)         ! set wb for computation of floats trajectories at the first time step
-      !
-      IF( nn_timing == 1 )   CALL timing_stop('flo_init')
       !
    END SUBROUTINE flo_init