Changeset 9299 for branches/UKMO/r6232_tracer_advection/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90

Timestamp:

2018-02-01T13:12:00+01:00 (6 years ago)

Author:

jcastill

Message:

First implementation of tracers - it has not been properly tested yet

File:

• branches/UKMO/r6232_tracer_advection/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) (1 diff)

branches/UKMO/r6232_tracer_advection/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90

@@ -94 +94 @@
 
       IF( l_trdtra )   THEN                      ! save the vertical diffusive trends for further diagnostics
-         DO jk = 1, jpkm1
-            ztrdt(:,:,jk) = ( ( tsa(:,:,jk,jp_tem) - tsb(:,:,jk,jp_tem) ) / r2dtra(jk) ) - ztrdt(:,:,jk)
-            ztrds(:,:,jk) = ( ( tsa(:,:,jk,jp_sal) - tsb(:,:,jk,jp_sal) ) / r2dtra(jk) ) - ztrds(:,:,jk)
-         END DO
+         ! G Nurser 23 Mar 2017. Recalculate trend as Delta(e3t*T)/e3tn. 
+         IF( lk_vvl ) THEN 
+            DO jk = 1, jpkm1 
+               ztrdt(:,:,jk) = ( ( tsa(:,:,jk,jp_tem)*fse3t_a(:,:,jk) - tsb(:,:,jk,jp_tem)*fse3t_b(:,:,jk) ) & 
+                    & / (fse3t_n(:,:,jk)*r2dtra(jk)) ) - ztrdt(:,:,jk) 
+               ztrds(:,:,jk) = ( ( tsa(:,:,jk,jp_sal)*fse3t_a(:,:,jk) - tsb(:,:,jk,jp_sal)*fse3t_b(:,:,jk) ) & 
+                    & / (fse3t_n(:,:,jk)*r2dtra(jk)) ) - ztrds(:,:,jk) 
+            END DO 
+         ELSE 
+            DO jk = 1, jpkm1 
+               ztrdt(:,:,jk) = ( ( tsa(:,:,jk,jp_tem) - tsb(:,:,jk,jp_tem) ) / r2dtra(jk) ) - ztrdt(:,:,jk) 
+               ztrds(:,:,jk) = ( ( tsa(:,:,jk,jp_sal) - tsb(:,:,jk,jp_sal) ) / r2dtra(jk) ) - ztrds(:,:,jk) 
+            END DO 
+         END IF 
          CALL lbc_lnk( ztrdt, 'T', 1. )
          CALL lbc_lnk( ztrds, 'T', 1. )