Changeset 9853 for branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/TRA

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

Location:

branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/TRA

Files:

• traadv_cen2.F90 (modified) (1 diff)
• traqsr.F90 (modified) (2 diffs)
• trasbc.F90 (modified) (2 diffs)

branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90

@@ -286 +286 @@
       ! avmb, avtb will be read in zdfini in restart case as they are used in zdftke, kpp etc...
       IF( lrst_oce .AND. cdtype == 'TRA' ) THEN
+         IF(nn_timing == 2)  CALL timing_start('iom_rstput')
          CALL iom_rstput( kt, nitrst, numrow, 'avmb', avmb )
          CALL iom_rstput( kt, nitrst, numrow, 'avtb', avtb )
+         IF(nn_timing == 2)  CALL timing_stop('iom_rstput')
       ENDIF
       !

branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90

@@ -368 +368 @@
             &                    'at it= ', kt,' date= ', ndastp
          IF(lwp) WRITE(numout,*) '~~~~'
+         IF(nn_timing == 2)  CALL timing_start('iom_rstput') 
          CALL iom_rstput( kt, nitrst, numrow, 'qsr_hc_b'   , qsr_hc      )
          CALL iom_rstput( kt, nitrst, numrow, 'fraqsr_1lev', fraqsr_1lev )   ! default definition in sbcssm 
+         IF(nn_timing == 2)  CALL timing_stop('iom_rstput')
          !
       ENDIF
@@ -607 +609 @@
       ! initialisation of fraqsr_1lev used in sbcssm
       IF( iom_varid( numror, 'fraqsr_1lev', ldstop = .FALSE. ) > 0 ) THEN
+         IF(nn_timing == 2)  CALL timing_start('iom_rstget')
          CALL iom_get( numror, jpdom_autoglo, 'fraqsr_1lev'  , fraqsr_1lev  )
+         IF(nn_timing == 2)  CALL timing_stop('iom_rstget')
       ELSE
          fraqsr_1lev(:,:) = 1._wp   ! default definition

branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -213 +213 @@
             &                    'at it= ', kt,' date= ', ndastp
          IF(lwp) WRITE(numout,*) '~~~~'
+         IF(nn_timing == 2)  CALL timing_start('iom_rstput')
          CALL iom_rstput( kt, nitrst, numrow, 'sbc_hc_b', sbc_tsc(:,:,jp_tem) )
          CALL iom_rstput( kt, nitrst, numrow, 'sbc_sc_b', sbc_tsc(:,:,jp_sal) )
+         IF(nn_timing == 2)  CALL timing_stop('iom_rstput')
       ENDIF
       !
@@ -257 +259 @@
                &                    'at it= ', kt,' date= ', ndastp
             IF(lwp) WRITE(numout,*) '~~~~'
+            IF(nn_timing == 2)  CALL timing_start('iom_rstput')
             CALL iom_rstput( kt, nitrst, numrow, 'fwf_isf_b', fwfisf(:,:)          )
             CALL iom_rstput( kt, nitrst, numrow, 'isf_hc_b' , risf_tsc(:,:,jp_tem) )
             CALL iom_rstput( kt, nitrst, numrow, 'isf_sc_b' , risf_tsc(:,:,jp_sal) )
+            IF(nn_timing == 2)  CALL timing_stop('iom_rstput')
          ENDIF
       END IF