Changeset 2113 for branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/TRA

Timestamp:

2010-09-22T21:20:46+02:00 (14 years ago)

Author:

cetlod

Message:

phasing DEV_r2106_LOCEAN2010 with DEV_r1821_Rivers branch

File:

• branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) (3 diffs)

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

@@ -152 +152 @@
         DO jj = 1, jpj  
            DO ji = 1, jpi  
-              rnf_dep(ji,jj) = 0.e0 
-              DO jk = 1, rnf_mod_dep(ji,jj)                          ! recalculates rnf_dep to be the depth  
-                rnf_dep(ji,jj) = rnf_dep(ji,jj) + fse3t(ji,jj,jk)    ! in metres to the bottom of the relevant grid box  
-              END DO  
               zdep = 1. / rnf_dep(ji,jj)  
               zse3t= 1. / fse3t(ji,jj,1)  
-              IF( rnf_tmp(ji,jj) == -999 )   rnf_tmp(ji,jj) = tsn(ji,jj,1,jp_tem)   ! if not specified set runoff temp to be sst  
+              IF( rnf_tem(ji,jj) == -999 )   rnf_tem(ji,jj) = tsn(ji,jj,1,jp_tem)   ! if not specified set runoff temp to be sst  
   
               IF( rnf(ji,jj) > 0.e0 ) THEN  
@@ -181 +177 @@
     
                   ! direct flux  
-                  zta = rnf_tmp(ji,jj) * rnf(ji,jj) * zsrau * zdep  
+                  zta = rnf_tem(ji,jj) * rnf(ji,jj) * zsrau * zdep  
                   zsa = rnf_sal(ji,jj) * rnf(ji,jj) * zsrau * zdep  
     
@@ -190 +186 @@
                 ELSE  
                   DO jk = 1, rnf_mod_dep(ji,jj)  
-                    zta = ( rnf_tmp(ji,jj) - tsn(ji,jj,jk,jp_tem) ) * rnf(ji,jj) * zsrau * zdep  
+                    zta = ( rnf_tem(ji,jj) - tsn(ji,jj,jk,jp_tem) ) * rnf(ji,jj) * zsrau * zdep  
                     zsa = ( rnf_sal(ji,jj) - tsn(ji,jj,jk,jp_sal) ) * rnf(ji,jj) * zsrau * zdep  
                     tsa(ji,jj,jk,jp_tem) = tsa(ji,jj,jk,jp_tem) + zta        ! add the trend to the general tracer trend