Changeset 9264


Ignore:
Timestamp:
2018-01-19T11:33:48+01:00 (3 years ago)
Author:
dancopsey
Message:

Added option to turn off coupling of old river runoff coupling and just use the new one.

Location:
branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_rnf_1d.F90

    r9242 r9264  
    164164         WRITE(numout,*)' narea = ', narea 
    165165         WRITE(numout,*)' kstep = ', kstep 
    166          WRITE(numout,*)' River runoff of river number 1 is ', runoff_1d(1) 
    167          WRITE(numout,*)' River runoff of river number 10 is ', runoff_1d(10) 
     166         WRITE(numout,*)' River runoff = ', runoff_1d(1:10) 
    168167         WRITE(numout,*)' kinfo = ', kinfo 
    169168         WRITE(numout,*)' llaction = ', llaction 
  • branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r9242 r9264  
    402402      !                                                      ! ------------------------- ! 
    403403      srcv(jpr_rnf   )%clname = 'O_Runoff' 
    404       IF( TRIM( sn_rcv_rnf%cldes ) == 'coupled' ) THEN 
    405          srcv(jpr_rnf)%laction = .TRUE. 
     404      IF( TRIM( sn_rcv_rnf%cldes ) == 'coupled' .OR. TRIM( sn_rcv_rnf%cldes ) == 'coupled1d' ) THEN 
     405         IF( TRIM( sn_rcv_rnf%cldes ) == 'coupled' ) srcv(jpr_rnf)%laction = .TRUE. 
    406406         l_rnfcpl              = .TRUE.                      ! -> no need to read runoffs in sbcrnf 
    407407         ln_rnf                = nn_components /= jp_iam_sas ! -> force to go through sbcrnf if not sas 
Note: See TracChangeset for help on using the changeset viewer.