Changeset 2350

Timestamp:

2010-11-01T17:44:01+01:00 (13 years ago)

Author:

rfurner

Message:

correction to river scheme to restore conservation of heat and salt

Location:

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC

Files:

• SBC/sbcrnf.F90 (modified) (4 diffs)
• TRA/trasbc.F90 (modified) (2 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -191 +191 @@
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   z1_rau0   ! local scalar
-      !!----------------------------------------------------------------------
+      REAL(wp) ::   zfact     ! local scalar
+      !!----------------------------------------------------------------------
+      !
+      zfact = 0.5e0
       !
       z1_rau0 = 1.e0 / rau0
@@ -204 +207 @@
                   !                          ! apply the runoff input flow
                   DO jk = 1, nk_rnf(ji,jj)
-                     phdivn(ji,jj,jk) = phdivn(ji,jj,jk) - rnf(ji,jj) * z1_rau0 / h_rnf(ji,jj)
+                     phdivn(ji,jj,jk) = phdivn(ji,jj,jk) - ( rnf(ji,jj) + rnf_b(ji,jj) ) * zfact * z1_rau0 / h_rnf(ji,jj)
                   END DO
                END DO
@@ -212 +215 @@
                DO ji = 1, jpi
                   DO jk = 1, nk_rnf(ji,jj)
-                     phdivn(ji,jj,jk) = phdivn(ji,jj,jk) - rnf(ji,jj) * z1_rau0 / h_rnf(ji,jj)
+                     phdivn(ji,jj,jk) = phdivn(ji,jj,jk) - ( rnf(ji,jj) + rnf_b(ji,jj) ) * zfact * z1_rau0 / h_rnf(ji,jj)
                   END DO
                END DO
@@ -218 +221 @@
          ENDIF
       ELSE                       !==   runoff put only at the surface   ==!
-         phdivn(:,:,1) = phdivn(:,:,1) - rnf(:,:) * z1_rau0 / fse3t(:,:,1)
+         IF( lk_vvl ) THEN              ! variable volume case
+            h_rnf(:,:) = fse3t(:,:,1)   ! recalculate h_rnf to be depth of top box
+         ENDIF
+         phdivn(:,:,1) = phdivn(:,:,1) - ( rnf(:,:) + rnf_b(:,:) ) * zfact * z1_rau0 / fse3t(:,:,1)
       ENDIF
       !

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -131 +131 @@
       ENDIF
 
+      !----------------------------------------
+      !        EMP, EMPS and QNS effects
+      !----------------------------------------
       !                                          Set before sbc tracer content fields
       !                                          ************************************
@@ -194 +197 @@
          CALL iom_rstput( kt, nitrst, numrow, 'sbc_sc_b', sbc_tsc(:,:,jp_sal) )
       ENDIF
-      !                             !==  Runoffs  ==!
+      !
+      !----------------------------------------
+      !        River Runoff effects
+      !----------------------------------------
+      !
+      zfact = 0.5e0
+
       ! Effect on (t,s) due to river runoff (dilution effect automatically applied via vertical tracer advection) 
       IF( ln_rnf ) THEN