Changeset 12618


Ignore:
Timestamp:
2020-03-27T10:03:48+01:00 (7 months ago)
Author:
jcastill
Message:

Changes as in the trunk version

Location:
branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils326/NEMOGCM/NEMO
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils326/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r12434 r12618  
    933933      IF( ln_dm2dc .AND. ln_cpl .AND. ncpl_qsr_freq /= 86400 )   & 
    934934         &   CALL ctl_stop( 'sbc_cpl_init: diurnal cycle reconstruction (ln_dm2dc) needs daily couping for solar radiation' ) 
    935       IF( ln_dm2dc .AND. ln_cpl ) ncpl_qsr_freq = 86400 / ncpl_qsr_freq 
     935      IF( ncpl_qsr_freq /= 0) ncpl_qsr_freq = 86400 / ncpl_qsr_freq ! used by top 
    936936 
    937937      CALL wrk_dealloc( jpi,jpj, zacs, zaos ) 
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils326/NEMOGCM/NEMO/TOP_SRC/trcini.F90

    r12432 r12618  
    8181      CALL top_alloc()              ! allocate TOP arrays 
    8282 
    83       l_trcdm2dc = ln_dm2dc  .AND. .NOT. lk_offline 
     83      l_trcdm2dc = ln_dm2dc .OR. ( ln_cpl .AND. ncpl_qsr_freq /= 1 .AND. ncpl_qsr_freq /= 0) 
     84      l_trcdm2dc = l_trcdm2dc .AND. .NOT. lk_offline 
    8485      IF( l_trcdm2dc .AND. lwp ) & 
    8586         &   CALL ctl_warn(' Coupling with passive tracers and used of diurnal cycle. & 
Note: See TracChangeset for help on using the changeset viewer.