Changeset 1998 for branches/DEV_R1821_Rivers/NEMO/OPA_SRC/TRA/trasbc.F90

Timestamp:

2010-07-08T17:12:21+02:00 (14 years ago)

Author:

acc

Message:

ticket #465_Rivers tidied code and added namelist changes in preparation for mid-year merge

File:

• branches/DEV_R1821_Rivers/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) (7 diffs)

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

@@ -107 +107 @@
       INTEGER  ::   ji, jj, jk           ! dummy loop indices  
       REAL(wp) ::   zta, zsa             ! temporary scalars, adjustment to temperature and salinity  
-      REAL(wp) ::   azta, azsa           ! temporary scalars, calculations of automatic change to temp & sal due to vvl (done elsewhere)  
+      REAL(wp) ::   zata, zasa           ! temporary scalars, calculations of automatic change to temp & sal due to vvl (done elsewhere)  
       REAL(wp) ::   zsrau, zse3t, zdep   ! temporary scalars, 1/density, 1/height of box, 1/height of effected water column  
-      REAL(wp) ::   dheat, dsalt          ! total change of temperature and salinity  
-      REAL(wp) ::   tot_sal1, tot_tmp1  
+      REAL(wp) ::   zdheat, zdsalt       ! total change of temperature and salinity  
       !!----------------------------------------------------------------------
 
@@ -131 +130 @@
       IF( .NOT.ln_traqsr )   qsr(:,:) = 0.e0   ! no solar radiation penetration
 
-      ! Concentration dillution effect on (t,s) due to evapouration, precipitation and qns, but not river runoff  
+      ! Concentration dilution effect on (t,s) due to evapouration, precipitation and qns, but not river runoff  
       DO jj = 2, jpj
          DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -150 +149 @@
       END DO
 
-      IF ( ln_rnf ) THEN  
+      IF ( ln_rnf .AND. ln_rnf_att ) THEN  
       ! Concentration / dilution effect on (t,s) due to river runoff  
         DO jj=1,jpj  
@@ -167 +166 @@
                   !!!indirect flux, concentration or dilution effect  
                   !!!force a dilution effect in all levels;  
-                  dheat=0.0  
-                  dsalt=0.0  
+                  zdheat=0.0  
+                  zdsalt=0.0  
                   DO jk=1, rnf_mod_dep(ji,jj)  
                     zta = -tn(ji,jj,jk) * rnf(ji,jj) * zsrau * zdep  
@@ -174 +173 @@
                     ta(ji,jj,jk)=ta(ji,jj,jk)+zta  
                     sa(ji,jj,jk)=sa(ji,jj,jk)+zsa  
-                    dheat=dheat+zta*fse3t(ji,jj,jk)  
-                    dsalt=dsalt+zsa*fse3t(ji,jj,jk)  
+                    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=-dheat*zse3t  
-                  zsa=-dsalt*zse3t  
+                  zta=-zdheat*zse3t  
+                  zsa=-zdsalt*zse3t  
                   ta(ji,jj,1)=ta(ji,jj,1)+zta  
                   sa(ji,jj,1)=sa(ji,jj,1)+zsa  
@@ -205 +204 @@
                 IF( lk_vvl) THEN  
                   !calculate automatic adjustment to sal and temp due to dilution/concentraion effect   
-                  azta = -tn(ji,jj,1) * rnf(ji,jj) * zsrau * zse3t  
-                  azsa = -sn(ji,jj,1) * rnf(ji,jj) * zsrau * zse3t  
-                  !!!negate this change in sal and temp   
-                  ta(ji,jj,1)=ta(ji,jj,1)-azta  
-                  sa(ji,jj,1)=sa(ji,jj,1)-azsa  
+                  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  
   
@@ -216 +214 @@
            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