Ignore:
Timestamp:
2020-04-02T20:23:48+02:00 (8 months ago)
Author:
jcastill
Message:

Improve the fix so that it works properly in atm/ocn/wav coupled configurations

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/r12083_cpl-pressure/src/OCE/SBC/sbcmod.F90

    r12647 r12648  
    436436      CASE( jp_purecpl )   ;   CALL sbc_cpl_rcv   ( kt, nn_fsbc, nn_ice )   ! pure coupled formulation 
    437437      CASE( jp_none    ) 
    438          IF( ll_opa    )      CALL sbc_cpl_rcv   ( kt, nn_fsbc, nn_ice )   ! OPA-SAS coupling: OPA receiving fields from SAS 
     438         IF( .NOT. ln_mixcpl ) CALL sbc_cpl_rcv   ( kt, nn_fsbc, nn_ice )   ! OPA-SAS coupling: OPA receiving fields from SAS 
    439439      END SELECT 
    440440      ! 
    441       IF( ln_mixcpl .OR. ln_wave ) CALL sbc_cpl_rcv   ( kt, nn_fsbc, nn_ice )   ! forced-coupled mixed formulation after forcing 
     441      IF( ln_mixcpl .OR. ( ln_wave .AND. nsbc .NE. jp_purecpl .AND. nsbc .NE. jp_none ) ) & 
     442                               CALL sbc_cpl_rcv   ( kt, nn_fsbc, nn_ice )   ! forced-coupled mixed formulation after forcing 
    442443      IF( ln_bdy )             CALL bdy_dta ( kt, kt_offset=+1 )            ! update dynamic & tracer data at open boundaries  
    443444 
Note: See TracChangeset for help on using the changeset viewer.