Changeset 3326 for branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD

Timestamp:

2012-03-14T10:19:21+01:00 (9 years ago)

Author:

gm

Message:

Ediag branche: #927 add Potential Energy trend diagnostics (trdpen.F90)

Location:

branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD

Files:

• trdken.F90 (modified) (1 diff)
• trdpen.F90 (added)
• trdtra.F90 (modified) (2 diffs)

branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90

@@ -88 +88 @@
       REAL(wp), POINTER, DIMENSION(:,:,:) ::   zke                 ! 3D workspace 
       !!----------------------------------------------------------------------
+      !
+      CALL wrk_alloc( jpi, jpj     , z2dx, z2dy, zke2d )
+      CALL wrk_alloc( jpi, jpj, jpk, zke )
       !
       CALL lbc_lnk( putrd, 'U', -1. )   ;   CALL lbc_lnk( pvtrd, 'V', -1. )      ! lateral boundary conditions

branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90

@@ -122 +122 @@
             END SELECT
          ELSE                            ! other trends: mask and send T & S trends to trd_tra_mng
-            ztrds(:,:,:) = ptrd(:,:,:) * tmask(:,:,:)
-            CALL trd_tra_mng( trdt, ztrds, ktrd, kt )  
-         ENDIF
-         !
-         IF( ktrd == jptra_zdfp ) THEN     ! diagnose the "PURE" Kz trend (here: just before the swap)
             !
-            IF( ln_traldf_iso ) THEN      ! iso-neutral diffusion only otherwise jptra_zdf is "PURE"
+            IF( ktrd == jptra_zdfp ) THEN     ! diagnose the "PURE" Kz trend (here: just before the swap)
                !
-               CALL wrk_alloc( jpi, jpj, jpk, zwt, zws, ztrdt )
+               IF( ln_traldf_iso ) THEN       ! iso-neutral diffusion only otherwise jptra_zdf is "PURE"
+                  !
+                  CALL wrk_alloc( jpi, jpj, jpk, zwt, zws, ztrdt )
+                  !
+                  zwt(:,:, 1 ) = 0._wp   ;   zws(:,:, 1 ) = 0._wp            ! vertical diffusive fluxes
+                  zwt(:,:,jpk) = 0._wp   ;   zws(:,:,jpk) = 0._wp
+                  DO jk = 2, jpk
+                     zwt(:,:,jk) =   avt(:,:,jk) * ( tsa(:,:,jk-1,jp_tem) - tsa(:,:,jk,jp_tem) ) / fse3w(:,:,jk) * tmask(:,:,jk)
+                     zws(:,:,jk) = fsavs(:,:,jk) * ( tsa(:,:,jk-1,jp_sal) - tsa(:,:,jk,jp_sal) ) / fse3w(:,:,jk) * tmask(:,:,jk)
+                  END DO
+                  !
+                  ztrdt(:,:,jpk) = 0._wp   ;   ztrds(:,:,jpk) = 0._wp
+                  DO jk = 1, jpkm1
+                     ztrdt(:,:,jk) = ( zwt(:,:,jk) - zwt(:,:,jk+1) ) / fse3t(:,:,jk)
+                     ztrds(:,:,jk) = ( zws(:,:,jk) - zws(:,:,jk+1) ) / fse3t(:,:,jk) 
+                  END DO
+                  CALL trd_tra_mng( ztrdt, ztrds, jptra_zdfp, kt )  
+                  !
+                  CALL wrk_dealloc( jpi, jpj, jpk, zwt, zws, ztrdt )
+                  !
+               ENDIF
                !
-               zwt(:,:, 1 ) = 0._wp   ;   zws(:,:, 1 ) = 0._wp            ! vertical diffusive fluxes
-               zwt(:,:,jpk) = 0._wp   ;   zws(:,:,jpk) = 0._wp
-               DO jk = 2, jpk
-                  zwt(:,:,jk) =   avt(:,:,jk) * ( tsa(:,:,jk-1,jp_tem) - tsa(:,:,jk,jp_tem) ) / fse3w(:,:,jk) * tmask(:,:,jk)
-                  zws(:,:,jk) = fsavs(:,:,jk) * ( tsa(:,:,jk-1,jp_sal) - tsa(:,:,jk,jp_sal) ) / fse3w(:,:,jk) * tmask(:,:,jk)
-               END DO
-               !
-               ztrdt(:,:,jpk) = 0._wp   ;   ztrds(:,:,jpk) = 0._wp
-               DO jk = 1, jpkm1
-                  ztrdt(:,:,jk) = ( zwt(:,:,jk) - zwt(:,:,jk+1) ) / fse3t(:,:,jk)
-                  ztrds(:,:,jk) = ( zws(:,:,jk) - zws(:,:,jk+1) ) / fse3t(:,:,jk) 
-               END DO
-               CALL trd_tra_mng( ztrdt, ztrds, jptra_zdfp, kt )  
-               !
-               CALL wrk_dealloc( jpi, jpj, jpk, zwt, zws, ztrdt )
-               !
+            ELSE                              ! 
+               ztrds(:,:,:) = ptrd(:,:,:) * tmask(:,:,:)
+               CALL trd_tra_mng( trdt, ztrds, ktrd, kt )  
             ENDIF
-            !
-         ENDIF
       ENDIF
 
@@ -305 +305 @@
       SELECT CASE( ktrd )
       CASE( jptra_xad  )   ;   CALL iom_put( "ttrd_xad" , ptrdx )        ! x- horizontal advection
-                                   CALL iom_put( "strd_xad" , ptrdy )
+                               CALL iom_put( "strd_xad" , ptrdy )
       CASE( jptra_yad  )   ;   CALL iom_put( "ttrd_yad" , ptrdx )        ! y- horizontal advection
-                                   CALL iom_put( "strd_yad" , ptrdy )
+                               CALL iom_put( "strd_yad" , ptrdy )
       CASE( jptra_zad  )   ;   CALL iom_put( "ttrd_zad" , ptrdx )        ! z- vertical   advection
                                CALL iom_put( "strd_zad" , ptrdy )