Changeset 9282 for branches/UKMO/r6232_rnf_cplmask/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

Timestamp:

2018-01-24T17:10:24+01:00 (6 years ago)

Author:

jcastill

Message:

Implementation of the changes needed to use a mask for mixed forced/coupled river runoff independently of other coupling fields

File:

• branches/UKMO/r6232_rnf_cplmask/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (3 diffs)

branches/UKMO/r6232_rnf_cplmask/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -214 +214 @@
       INTEGER ::   ios  ! Local integer output status for namelist read
       INTEGER ::   inum 
+      NAMELIST/namsbc_cpl/  ln_usernfmask       ! moved here to allow merging with other coupling branches
       REAL(wp), POINTER, DIMENSION(:,:) ::   zacs, zaos
       !!
@@ -271 +272 @@
          WRITE(numout,*)'  nn_cplmodel                         = ', nn_cplmodel
          WRITE(numout,*)'  ln_usecplmask                       = ', ln_usecplmask
+         WRITE(numout,*)'  ln_usernfmask                       = ', ln_usernfmask
       ENDIF
 
@@ -403 +405 @@
       IF( TRIM( sn_rcv_rnf%cldes ) == 'coupled' ) THEN
          srcv(jpr_rnf)%laction = .TRUE.
-         l_rnfcpl              = .TRUE.                      ! -> no need to read runoffs in sbcrnf
+         l_rnfcpl              = .NOT. ln_usernfmask         ! -> no need to read runoffs in sbcrnf
          ln_rnf                = nn_components /= jp_iam_sas ! -> force to go through sbcrnf if not sas
          IF(lwp) WRITE(numout,*)