Changeset 2127

Timestamp:

2010-09-28T13:54:33+02:00 (14 years ago)

Author:

rfurner

Message:

Changes to trasbc, rnf effects now dealt with correctly

Location:

branches/DEV_R1821_Rivers/NEMO/OPA_SRC

Files:

• SBC/sbcrnf.F90 (modified) (3 diffs)
• TRA/trasbc.F90 (modified) (1 diff)

branches/DEV_R1821_Rivers/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -84 +84 @@
       !!
       INTEGER  ::   ji, jj   ! dummy loop indices
-      INTEGER  ::   ierror   ! temporary integer
       !!----------------------------------------------------------------------
       !                                   
@@ -120 +119 @@
                rnf_tmp(:,:) = ( sf_tmp_rnf(1)%fnow(:,:) )  
             ELSE  
-               rnf_sal(:,:) = 0  
+               rnf_sal(:,:) = 0.0
                rnf_tmp(:,:) = -999  
             ENDIF  
@@ -142 +141 @@
       !!----------------------------------------------------------------------
       CHARACTER(len=32) ::   rn_dep_file   ! runoff file name  
+      INTEGER  ::   ierror   ! temporary integer
       !! 
       NAMELIST/namsbc_rnf/ cn_dir, ln_rnf_emp, sn_rnf, sn_cnf, sn_sal_rnf, sn_tmp_rnf, sn_dep_rnf,   &  

branches/DEV_R1821_Rivers/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -149 +149 @@
       END DO
 
-      IF ( ln_rnf .AND. ln_rnf_att ) THEN  
-      ! Concentration / dilution effect on (t,s) due to river runoff  
+      IF ( ln_rnf ) THEN  
+
+      ! Effect on (t,s) due to river runoff (dilution effect automatically applied via vertical tracer advection) 
         DO jj=1,jpj  
            DO ji=1,jpi  
               zdep = 1. / rnf_dep(ji,jj)  
               zse3t= 1. / fse3t(ji,jj,1)  
-              IF ( rnf_tmp(ji,jj) == -999 )   rnf_tmp(ji,jj)=tn(ji,jj,1)        ! if not specified set runoff temp to be sst  
-  
-              IF ( rnf(ji,jj) .gt. 0.0 ) THEN  
-  
-                IF( lk_vvl) THEN  
-                  !!!indirect flux, concentration or dilution effect  
-                  !!!force a dilution effect in all levels;  
-                  zdheat=0.0  
-                  zdsalt=0.0  
-                  DO jk=1, rnf_mod_dep(ji,jj)  
-                    zta = -tn(ji,jj,jk) * rnf(ji,jj) * zsrau * zdep  
-                    zsa = -sn(ji,jj,jk) * rnf(ji,jj) * zsrau * zdep  
-                    ta(ji,jj,jk)=ta(ji,jj,jk)+zta  
-                    sa(ji,jj,jk)=sa(ji,jj,jk)+zsa  
-                    zdheat=zdheat+zta*fse3t(ji,jj,jk)  
-                    zdsalt=zdsalt+zsa*fse3t(ji,jj,jk)  
-                  ENDDO  
-                  !!!negate this total change in heat and salt content from top level  
-                  zta=-zdheat*zse3t  
-                  zsa=-zdsalt*zse3t  
-                  ta(ji,jj,1)=ta(ji,jj,1)+zta  
-                  sa(ji,jj,1)=sa(ji,jj,1)+zsa  
-    
-                  !!!direct flux  
-                  zta = rnf_tmp(ji,jj) * rnf(ji,jj) * zsrau * zdep  
-                  zsa = rnf_sal(ji,jj) * rnf(ji,jj) * zsrau * zdep  
-    
-                  DO jk=1, rnf_mod_dep(ji,jj)  
-                    ta(ji,jj,jk) = ta(ji,jj,jk) + zta  
-                    sa(ji,jj,jk) = sa(ji,jj,jk) + zsa  
-                  ENDDO  
-   
-                ELSE  
-                  DO jk=1, rnf_mod_dep(ji,jj)  
-                    zta = ( rnf_tmp(ji,jj)-tn(ji,jj,jk) ) * rnf(ji,jj) * zsrau * zdep  
-                    zsa = ( rnf_sal(ji,jj)-sn(ji,jj,jk) ) * rnf(ji,jj) * zsrau * zdep  
-                    ta(ji,jj,jk) = ta(ji,jj,jk) + zta  
-                    sa(ji,jj,jk) = sa(ji,jj,jk) + zsa  
-                  ENDDO  
-                ENDIF  
-  
-              ELSEIF (rnf(ji,jj) .lt. 0.) THEN   !! for use in baltic when flow is out of domain, want no change in temp and sal  
-  
-                IF( lk_vvl) THEN  
-                  !calculate automatic adjustment to sal and temp due to dilution/concentraion effect   
-                  zata = tn(ji,jj,1) * rnf(ji,jj) * zsrau * zse3t  
-                  zasa = sn(ji,jj,1) * rnf(ji,jj) * zsrau * zse3t  
-                  ta(ji,jj,1)=ta(ji,jj,1) + zata  
-                  sa(ji,jj,1)=sa(ji,jj,1) + zasa  
-                ENDIF  
-  
-              ENDIF  
-  
+
+              IF ( rnf(ji,jj) .gt. 0.0 ) THEN
+                 ! ammend t and s due to direct tracer flux
+                 IF ( rnf_tmp(ji,jj) == -999 )   rnf_tmp(ji,jj)=tn(ji,jj,1)        ! if not specified set runoff temp to be sst
+                 DO jk=1, rnf_mod_dep(ji,jj)
+                    ta(ji,jj,jk) = ta(ji,jj,jk) + rnf_tmp(ji,jj) * rnf(ji,jj) * zsrau * zdep
+                    sa(ji,jj,jk) = sa(ji,jj,jk) + rnf_sal(ji,jj) * rnf(ji,jj) * zsrau * zdep
+                 ENDDO
+              ELSEIF (rnf(ji,jj) .lt. 0.) THEN   !! for use in baltic when flow is out of domain, want no change in temp and sal
+                 ! negate concentration/dilution effect from traadv, as the tracer leaves domain
+                 DO jk=1, rnf_mod_dep(ji,jj)
+                    ta(ji,jj,jk) = ta(ji,jj,jk) + tn(ji,jj,jk) * rnf(ji,jj) * zsrau * zdep
+                    sa(ji,jj,jk) = sa(ji,jj,jk) + sn(ji,jj,jk) * rnf(ji,jj) * zsrau * zdep
+                 ENDDO
+              ENDIF
+
            ENDDO  
         ENDDO  
 
-      ELSE IF( ln_rnf ) THEN
-
-      ! Concentration dilution effect on (t,s) due to runoff without temperatue, salinity and depth attributes
-        DO jj = 2, jpj
-           DO ji = fs_2, fs_jpim1   ! vector opt.
-#if ! defined key_zco
-              zse3t = 1. / fse3t(ji,jj,1)
-#endif
-              IF( lk_vvl) THEN
-                 zta =  rnf(ji,jj) * zsrau * tn(ji,jj,1) * zse3t       ! & cooling/heating effect of runoff
-                 zsa = 0.e0                                            ! No salinity concent./dilut. effect
-              ELSE
-                 zta =  0.0                                            ! temperature : heat flux 
-                 zsa =  - rnf(ji,jj) * zsrau * sn(ji,jj,1) * zse3t     ! salinity :  concent./dilut. effect
-              ENDIF
-              ta(ji,jj,1) = ta(ji,jj,1) + zta                          ! add the trend to the general tracer trend
-              sa(ji,jj,1) = sa(ji,jj,1) + zsa
-           END DO
-        END DO
- 
       ENDIF