Changeset 11277 for branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

Timestamp:

2019-07-17T15:29:15+02:00 (5 years ago)

Author:

kingr

Message:

Merged Juan's changes for running AMM15 woth wave coupling.
Corrected minor logic error to allow AMM7-uncoupled to reproduce earlier results.
Few line spacing changes to allow merging with OBS br and trunk rvn 5518.

File:

• branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) (3 diffs)

branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -82 +82 @@
       ALLOCATE( rnfmsk(jpi,jpj)         , rnfmsk_z(jpk)          ,     &
          &      h_rnf (jpi,jpj)         , nk_rnf  (jpi,jpj)      ,     &
-         &      rnf_tsc_b(jpi,jpj,jpts) , rnf_tsc (jpi,jpj,jpts) , STAT=sbc_rnf_alloc )
+         &      rnf_tsc_b(jpi,jpj,jpts) , rnf_tsc (jpi,jpj,jpts) ,     & 
+         &      xrnfmask(jpi,jpj,1)     , STAT=sbc_rnf_alloc )
          !
       IF( lk_mpp            )   CALL mpp_sum ( sbc_rnf_alloc )
@@ -128 +129 @@
       IF( MOD( kt - 1, nn_fsbc ) == 0 ) THEN
          !
-         IF( .NOT. l_rnfcpl )   rnf(:,:) = rn_rfact * ( sf_rnf(1)%fnow(:,:,1) )       ! updated runoff value at time step kt
+         IF( .NOT. l_rnfcpl )   & 
+             rnf(:,:) = rnf(:,:) * (1. - xrnfmask(:,:,1)) + rn_rfact * sf_rnf(1)%fnow(:,:,1) * xrnfmask(:,:,1)  ! updated runoff value at time step kt
          !
          !                                                     ! set temperature & salinity content of runoffs
@@ -442 +444 @@
       ENDIF
       !
+      xrnfmask(:,:,:) = 1.    ! default value for points using river forcing 
+      IF (ln_usernfmask) THEN 
+         IF(lwp) WRITE(numout,*) 
+         IF(lwp) WRITE(numout,*) '          runoff mask read in a file' 
+         CALL iom_open( 'rnfmask', inum ) 
+         CALL iom_get( inum, jpdom_data, 'rnfmask', xrnfmask(:,:,1), 1) 
+         CALL iom_close( inum ) 
+      ENDIF 
+      !
       rnf(:,:) =  0._wp                         ! runoff initialisation
       rnf_tsc(:,:,:) = 0._wp                    ! runoffs temperature & salinty contents initilisation