Changeset 3764 for branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

Timestamp:

2013-01-23T15:33:04+01:00 (11 years ago)

Author:

smasson

Message:

dev_MERGE_2012: report bugfixes done in the trunk from r3555 to r3763 into dev_MERGE_2012

File:

• branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) (3 diffs)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

@@ -455 +455 @@
       NAMELIST/namptr/ ln_diaptr, ln_diaznl, ln_subbas, ln_ptrcomp, nn_fptr, nn_fwri
       !!----------------------------------------------------------------------
-      IF( nn_timing == 1 )   CALL timing_start('dia_ptr_init')
 
       REWIND( numnam )                 ! Read Namelist namptr : poleward transport parameters
@@ -474 +473 @@
       
       IF( ln_diaptr) THEN  
+     
+         IF( nn_timing == 1 )   CALL timing_start('dia_ptr_init')
       
          IF( ln_subbas ) THEN   ;   nptr = 5       ! Global, Atlantic, Pacific, Indian, Indo-Pacific
@@ -528 +529 @@
          nidom_ptr = FLIO_DOM_NONE
 #endif
+      IF( nn_timing == 1 )   CALL timing_stop('dia_ptr_init')
+      !
       ENDIF 
-      ! 
-      IF( nn_timing == 1 )   CALL timing_stop('dia_ptr_init')
       ! 
    END SUBROUTINE dia_ptr_init