Changeset 8956 for branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/SBC

Timestamp:

2017-12-08T14:17:56+01:00 (6 years ago)

Author:

acc

Message:

Branch UKMO/ROMS_WAD_7832. Check in cosmetic changes made during review of code (to be verified). Still a few outstanding queries to be agreed before this branch is ready

File:

• branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) (2 diffs)

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

@@ -122 +122 @@
          IF( .NOT. l_rnfcpl )   rnf(:,:) = rn_rfact * ( sf_rnf(1)%fnow(:,:,1) )       ! updated runoff value at time step kt
          !
-         !                                                     ! set temperature & salinity content of runoffs
+         !                                                           ! set temperature & salinity content of runoffs
          IF( ln_rnf_tem ) THEN                                       ! use runoffs temperature data
             rnf_tsc(:,:,jp_tem) = ( sf_t_rnf(1)%fnow(:,:,1) ) * rnf(:,:) * r1_rau0
@@ -133 +133 @@
             END WHERE
          ELSE                                                        ! use SST as runoffs temperature
-         rnf_tsc(:,:,jp_tem) = MAX(sst_m(:,:),0.0_wp) * rnf(:,:) * r1_rau0 !CEOD River is fresh water so must at least be 0 unless we consider ice
+            !CEOD River is fresh water so must at least be 0 unless we consider ice
+            rnf_tsc(:,:,jp_tem) = MAX(sst_m(:,:),0.0_wp) * rnf(:,:) * r1_rau0
          ENDIF
          !                                                           ! use runoffs salinity data