Changeset 12666 for NEMO/branches/UKMO

Timestamp:

2020-04-03T16:09:42+02:00 (4 years ago)

Author:

jcastill

Message:

Final changes to make the code more general and working in all cases

File:

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

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

@@ -284 +284 @@
 !!gm abusive use of jp_none ??   ===>>> need to be check and changed by adding a jp_sas parameter
          CASE( jp_none    )   ;   WRITE(numout,*) '   ==>>>   OPA coupled to SAS via oasis'
-            IF( ln_mixcpl )       WRITE(numout,*) '               + forced-coupled mixed formulation'
          END SELECT
+         IF( ln_mixcpl    )       WRITE(numout,*) '               + forced-coupled mixed formulation'
          IF( ll_not_nemo  )       WRITE(numout,*) '               + OASIS coupled SAS'
+         IF( ln_wave      )       WRITE(numout,*) '               + wave copling'
       ENDIF
       !
@@ -385 +386 @@
       !
       LOGICAL ::   ll_sas, ll_opa   ! local logical
+      LOGICAL ::   ll_wav, ll_rcv   ! local logical
       !
       REAL(wp) ::     zthscl        ! wd  tanh scale
@@ -419 +421 @@
       ll_sas = nn_components == jp_iam_sas               ! component flags
       ll_opa = nn_components == jp_iam_opa
+      ll_wav = ln_cdgw .OR. ln_sdw .OR. ln_tauwoc .OR. ln_stcor
+      ll_rcv = ( ln_mixcpl .OR. ( ll_wav .AND. nsbc /= jp_purecpl .AND. nsbc /= jp_none ) ) .AND. &
+               .NOT. ( nsbc == jp_blk .AND. ll_sas )
       !
       IF( .NOT.ll_sas )   CALL sbc_ssm ( kt )            ! mean ocean sea surface variables (sst_m, sss_m, ssu_m, ssv_m)
       IF( ln_wave     )   CALL sbc_wave( kt )            ! surface waves
-
       !
       !                                            !==  sbc formulation  ==!
@@ -439 +443 @@
       END SELECT
       !
-      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( ll_rcv )             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