Changeset 12648

Timestamp:

2020-04-02T20:23:48+02:00 (4 years ago)

Author:

jcastill

Message:

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

File:

• NEMO/branches/UKMO/r12083_cpl-pressure/src/OCE/SBC/sbcmod.F90 (modified) (1 diff)

NEMO/branches/UKMO/r12083_cpl-pressure/src/OCE/SBC/sbcmod.F90

@@ -436 +436 @@
       CASE( jp_purecpl )   ;   CALL sbc_cpl_rcv   ( kt, nn_fsbc, nn_ice )   ! pure coupled formulation
       CASE( jp_none    )
-         IF( ll_opa    )       CALL sbc_cpl_rcv   ( kt, nn_fsbc, nn_ice )   ! OPA-SAS coupling: OPA receiving fields from SAS
+         IF( .NOT. ln_mixcpl ) CALL sbc_cpl_rcv   ( kt, nn_fsbc, nn_ice )   ! OPA-SAS coupling: OPA receiving fields from SAS
       END SELECT
       !
-      IF( ln_mixcpl .OR. ln_wave ) CALL sbc_cpl_rcv   ( kt, nn_fsbc, nn_ice )   ! forced-coupled mixed formulation after forcing
+      IF( ln_mixcpl .OR. ( ln_wave .AND. nsbc .NE. jp_purecpl .AND. nsbc .NE. jp_none ) ) &
+                               CALL sbc_cpl_rcv   ( kt, nn_fsbc, nn_ice )   ! forced-coupled mixed formulation after forcing
       IF( ln_bdy )             CALL bdy_dta ( kt, kt_offset=+1 )            ! update dynamic & tracer data at open boundaries