Changeset 6237 for branches/UKMO/nemo_v3_6_STABLE_copy/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

Timestamp:

2016-01-13T15:47:26+01:00 (9 years ago)

Author:

davestorkey

Message:

Update UKMO/nemo_v_3_6_STABLE_copy branch to revision 6228 of nemo_v_3_6_STABLE.
NB. Involved copying in new AGRIF directory (because that is what was done in the nemo_v_3_6_STABLE branch) so some continuity lost.
Custom merge into /branches/UKMO/nemo_v3_6_STABLE_copy/NEMOGCM: r6228 cf. r5767 of /branches/2015/nemo_v3_6_STABLE/NEMOGCM@6231

File:

• branches/UKMO/nemo_v3_6_STABLE_copy/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) (1 diff)

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

@@ -126 +126 @@
       IF(   ln_rnf_sal   )   CALL fld_read ( kt, nn_fsbc, sf_s_rnf )    ! idem for runoffs salinity    if required
       !
-      ! Runoff reduction only associated to the ORCA2_LIM configuration
-      ! when reading the NetCDF file runoff_1m_nomask.nc
-      IF( cp_cfg == 'orca' .AND. jp_cfg == 2 .AND. .NOT. l_rnfcpl )   THEN
-         WHERE( 40._wp < gphit(:,:) .AND. gphit(:,:) < 65._wp )
-            sf_rnf(1)%fnow(:,:,1) = 0.85 * sf_rnf(1)%fnow(:,:,1)
-         END WHERE
-      ENDIF
-      !
       IF( MOD( kt - 1, nn_fsbc ) == 0 ) THEN
          !