Changeset 15169 for NEMO/branches/UKMO/NEMO_4.0.4_momentum_trends/src

Timestamp:

2021-08-04T11:50:47+02:00 (3 years ago)

Author:

davestorkey

Message:

UKMO/NEMO_4.0.4_momentum_trends: Bug fix. Remove double counting of trends
due to top and bottom stress from barotropic currents in ZDF trend.

Location:

NEMO/branches/UKMO/NEMO_4.0.4_momentum_trends/src/OCE

Files:

• DYN/dynzdf.F90 (modified) (1 diff)
• TRD/trddyn.F90 (modified) (4 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_momentum_trends/src/OCE/DYN/dynzdf.F90

@@ -509 +509 @@
       IF( l_trddyn )   THEN      
          ! Save the vertical diffusive trends for further diagnostics
-         ! and calculate implicit drag trends
+         ! then calculate implicit drag trends
          ! (The order of operation is important here). 
          !

NEMO/branches/UKMO/NEMO_4.0.4_momentum_trends/src/OCE/TRD/trddyn.F90

@@ -40 +40 @@
    REAL(wp), ALLOCATABLE, DIMENSION(:,:,:), SAVE :: zutrd_hpg, zvtrd_hpg
    REAL(wp), ALLOCATABLE, DIMENSION(:,:,:), SAVE :: zutrd_pvo, zvtrd_pvo
+   REAL(wp), ALLOCATABLE, DIMENSION(:,:,:), SAVE :: zutrd_tfre, zvtrd_tfre
+   REAL(wp), ALLOCATABLE, DIMENSION(:,:,:), SAVE :: zutrd_bfre, zvtrd_bfre
    REAL(wp), ALLOCATABLE, DIMENSION(:,:,:), SAVE :: zutrd_tfr, zvtrd_tfr
    REAL(wp), ALLOCATABLE, DIMENSION(:,:,:), SAVE :: zutrd_bfr, zvtrd_bfr
@@ -100 +102 @@
          DEALLOCATE( zutrd_hpg, zvtrd_hpg )
 
-      CASE( jpdyn_tfre, jpdyn_tfre_bt, jpdyn_tfri )
+      CASE( jpdyn_tfre )
+         !
+         ! Explicit top drag trend calculated in zdf_drg. Save to add to 
+         ! ZDF trend later and add to 3D TFR trend. 
+         IF( .NOT. ALLOCATED(zutrd_tfre) ) THEN 
+            ALLOCATE( zutrd_tfr(jpi,jpj,jpk), zvtrd_tfr(jpi,jpj,jpk) )
+            zutrd_tfre(:,:,:) = putrd(:,:,:)
+            zvtrd_tfre(:,:,:) = pvtrd(:,:,:)
+         ENDIF
+         IF( .NOT. ALLOCATED(zutrd_tfr) ) THEN 
+            ALLOCATE( zutrd_tfr(jpi,jpj,jpk), zvtrd_tfr(jpi,jpj,jpk) )
+            zutrd_tfr(:,:,:) = 0.0
+            zvtrd_tfr(:,:,:) = 0.0
+         ENDIF
+         zutrd_tfr(:,:,:) = zutrd_tfr(:,:,:) + putrd(:,:,:) 
+         zvtrd_tfr(:,:,:) = zvtrd_tfr(:,:,:) + pvtrd(:,:,:)
+
+      CASE( jpdyn_tfre_bt, jpdyn_tfri )
          !
          ! Add various top friction terms for baroclinic trend to saved quantity.
@@ -112 +131 @@
          zvtrd_tfr(:,:,:) = zvtrd_tfr(:,:,:) + pvtrd(:,:,:)
 
-      CASE( jpdyn_bfre, jpdyn_bfre_bt, jpdyn_bfri )
+      CASE( jpdyn_bfre )
+         !
+         ! Explicit bottom drag trend calculated in zdf_drg. Save to add to 
+         ! ZDF trend later and add to 3D BFR trend. 
+         IF( .NOT. ALLOCATED(zutrd_bfre) ) THEN 
+            ALLOCATE( zutrd_bfr(jpi,jpj,jpk), zvtrd_bfr(jpi,jpj,jpk) )
+            zutrd_bfre(:,:,:) = putrd(:,:,:)
+            zvtrd_bfre(:,:,:) = pvtrd(:,:,:)
+         ENDIF
+         IF( .NOT. ALLOCATED(zutrd_bfr) ) THEN 
+            ALLOCATE( zutrd_bfr(jpi,jpj,jpk), zvtrd_bfr(jpi,jpj,jpk) )
+            zutrd_bfr(:,:,:) = 0.0
+            zvtrd_bfr(:,:,:) = 0.0
+         ENDIF
+         zutrd_bfr(:,:,:) = zutrd_bfr(:,:,:) + putrd(:,:,:) 
+         zvtrd_bfr(:,:,:) = zvtrd_bfr(:,:,:) + pvtrd(:,:,:)
+
+      CASE( jpdyn_bfre_bt, jpdyn_bfri )
          !
          ! Add various bottom friction terms for baroclinic trend to saved quantity.
@@ -129 +165 @@
          !            and add wind stress, and top and bottom friction trends from dynspg_ts.
          !
-         ! If TFR or BFR arrays allocated at this stage then they will contain trends due
+         ! If TFRE or BFRE arrays allocated at this stage then they will contain trends due
          ! to explicit top or bottom drag components which need to be added to the ZDF trend. 
-         IF( ALLOCATED( zutrd_tfr ) )THEN
+         IF( ALLOCATED( zutrd_tfre ) )THEN
             DO jk = 1, jpkm1
-               putrd(:,:,jk) = ( putrd(:,:,jk) + zutrd_tfr(:,:,jk) ) * umask(:,:,jk)
-               pvtrd(:,:,jk) = ( pvtrd(:,:,jk) + zvtrd_tfr(:,:,jk) ) * vmask(:,:,jk)
-            END DO
-         ENDIF
-         IF( ALLOCATED( zutrd_bfr ) )THEN
+               putrd(:,:,jk) = ( putrd(:,:,jk) + zutrd_tfre(:,:,jk) ) * umask(:,:,jk)
+               pvtrd(:,:,jk) = ( pvtrd(:,:,jk) + zvtrd_tfre(:,:,jk) ) * vmask(:,:,jk)
+            END DO
+            DEALLOCATE( zutrd_tfre, zvtrd_tfre )
+         ENDIF
+         IF( ALLOCATED( zutrd_bfre ) )THEN
             DO jk = 1, jpkm1
-               putrd(:,:,jk) = ( putrd(:,:,jk) + zutrd_bfr(:,:,jk) ) * umask(:,:,jk)
-               pvtrd(:,:,jk) = ( pvtrd(:,:,jk) + zvtrd_bfr(:,:,jk) ) * vmask(:,:,jk)
-            END DO
+               putrd(:,:,jk) = ( putrd(:,:,jk) + zutrd_bfre(:,:,jk) ) * umask(:,:,jk)
+               pvtrd(:,:,jk) = ( pvtrd(:,:,jk) + zvtrd_bfre(:,:,jk) ) * vmask(:,:,jk)
+            END DO
+            DEALLOCATE( zutrd_bfre, zvtrd_bfre )
          ENDIF
          IF( ln_dynspg_ts ) THEN