Changeset 12618 for branches

Timestamp:

2020-03-27T10:03:48+01:00 (4 years ago)

Author:

jcastill

Message:

Changes as in the trunk version

Location:

branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils326/NEMOGCM/NEMO

Files:

• OPA_SRC/SBC/sbccpl.F90 (modified) (1 diff)
• TOP_SRC/trcini.F90 (modified) (1 diff)

branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils326/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -933 +933 @@
       IF( ln_dm2dc .AND. ln_cpl .AND. ncpl_qsr_freq /= 86400 )   &
          &   CALL ctl_stop( 'sbc_cpl_init: diurnal cycle reconstruction (ln_dm2dc) needs daily couping for solar radiation' )
-      IF( ln_dm2dc .AND. ln_cpl ) ncpl_qsr_freq = 86400 / ncpl_qsr_freq
+      IF( ncpl_qsr_freq /= 0) ncpl_qsr_freq = 86400 / ncpl_qsr_freq ! used by top
 
       CALL wrk_dealloc( jpi,jpj, zacs, zaos )

branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils326/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -81 +81 @@
       CALL top_alloc()              ! allocate TOP arrays
 
-      l_trcdm2dc = ln_dm2dc  .AND. .NOT. lk_offline
+      l_trcdm2dc = ln_dm2dc .OR. ( ln_cpl .AND. ncpl_qsr_freq /= 1 .AND. ncpl_qsr_freq /= 0)
+      l_trcdm2dc = l_trcdm2dc .AND. .NOT. lk_offline
       IF( l_trcdm2dc .AND. lwp ) &
          &   CALL ctl_warn(' Coupling with passive tracers and used of diurnal cycle. &