Changeset 9853 for branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

Timestamp:

2018-06-28T15:00:26+02:00 (6 years ago)

Author:

mathiot

Message:

update to dev_r5518_GO6_package@9321 to avoid conflict during merge

File:

• branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (3 diffs)

branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -1019 +1019 @@
       !
       IF( TRIM(cdrw) == 'READ' ) THEN
+         IF(nn_timing == 2)  CALL timing_start('iom_rstget')
          CALL iom_get( numror, jpdom_autoglo, 'ub2_b'  , ub2_b  (:,:) )   
          CALL iom_get( numror, jpdom_autoglo, 'vb2_b'  , vb2_b  (:,:) ) 
@@ -1036 +1037 @@
          ENDIF
 #endif
+      IF(nn_timing == 2)  CALL timing_stop('iom_rstget')
       !
       ELSEIF( TRIM(cdrw) == 'WRITE' ) THEN
+         IF(nn_timing == 2)  CALL timing_start('iom_rstput')
          CALL iom_rstput( kt, nitrst, numrow, 'ub2_b'   , ub2_b  (:,:) )
          CALL iom_rstput( kt, nitrst, numrow, 'vb2_b'   , vb2_b  (:,:) )
@@ -1056 +1059 @@
          ENDIF
 #endif
+         IF(nn_timing == 2)  CALL timing_stop('iom_rstput')
       ENDIF
       !