Changeset 9853 for branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/IOM/restart.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/IOM/restart.F90 (modified) (5 diffs)

branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

@@ -26 +26 @@
    USE divcur          ! hor. divergence and curl      (div & cur routines)
    USE sbc_oce         ! for icesheet freshwater input variables
+   USE timing
 
    IMPLICIT NONE
@@ -134 +135 @@
       INTEGER, INTENT(in) ::   kt   ! ocean time-step
       !!----------------------------------------------------------------------
-
+                     IF(nn_timing == 2)  CALL timing_start('iom_rstput')
                      CALL iom_rstput( kt, nitrst, numrow, 'rdt'    , rdt       )   ! dynamics time step
                      CALL iom_rstput( kt, nitrst, numrow, 'rdttra1', rdttra(1) )   ! surface tracer time step
@@ -168 +169 @@
                      ENDIF
                      ENDIF
+                     IF(nn_timing == 2)  CALL timing_stop('iom_rstput')
 
       IF( kt == nitrst ) THEN
@@ -237 +239 @@
 
       ! Check dynamics and tracer time-step consistency and force Euler restart if changed
+      IF(nn_timing == 2)  CALL timing_start('iom_rstget')
       IF( iom_varid( numror, 'rdt', ldstop = .FALSE. ) > 0 )   THEN
          CALL iom_get( numror, 'rdt', zrdt )
@@ -300 +303 @@
          antarctica_icesheet_timelapsed = 0.0
       ENDIF
-
+      IF(nn_timing == 2)  CALL timing_stop('iom_rstget')
       IF( neuler == 0 ) THEN                                  ! Euler restart (neuler=0)
          tsb  (:,:,:,:) = tsn  (:,:,:,:)                             ! all before fields set to now values