Changeset 9237 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO

Timestamp:

2018-01-15T16:58:44+01:00 (6 years ago)

Author:

frrh

Message:

Merge changes from M Stringer's Met Office GMED ticket number 366
to improve robustness of MEDUSA restart handling of qsr_* fields.
Merge command issued:
svn merge -r 9164:9165 ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/dev_r5518_GO6_fix_trc_restart

File:

• branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/trcstp.F90

@@ -178 +178 @@
          !
          !                                            !* Restart: read in restart file
-         IF( ln_rsttr .AND. iom_varid( numrtr, 'qsr_mean' , ldstop = .FALSE. ) > 0 .AND. &
-                            iom_varid( numrtr, 'qsr_arr_1', ldstop = .FALSE. ) > 0 .AND. &
-                            iom_varid( numrtr, 'zsecfst'  , ldstop = .FALSE. ) > 0 ) THEN 
+         IF( ln_rsttr .AND. nn_rsttr /= 0 .AND. iom_varid( numrtr, 'qsr_mean' , ldstop = .FALSE. ) > 0 &
+                                          .AND. iom_varid( numrtr, 'qsr_arr_1', ldstop = .FALSE. ) > 0 &
+                                          .AND. iom_varid( numrtr, 'zsecfst'  , ldstop = .FALSE. ) > 0 ) THEN
             IF(lwp) WRITE(numout,*) 'trc_qsr_mean:   qsr_mean read in the restart file'
             CALL iom_get( numrtr, jpdom_autoglo, 'qsr_mean', qsr_mean )   !  A mean of qsr