Changeset 15170

Timestamp:

2021-08-04T12:42:44+02:00 (3 years ago)

Author:

davestorkey

Message:

UKMO/NEMO_4.0.4_momentum_trends:

1. Bug fix for the last bug fix.
2. Remove l_drgexp from trddyn.F90.
3. Correct calculation of HPG trend for fully explicit case.

File:

• NEMO/branches/UKMO/NEMO_4.0.4_momentum_trends/src/OCE/TRD/trddyn.F90 (modified) (5 diffs)

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

@@ -70 +70 @@
       REAL(wp), ALLOCATABLE, DIMENSION(:,:)     ::   zue, zve       ! temporary 2D arrays
       INTEGER                                   ::   jk
-      LOGICAL, SAVE                             ::   l_drgexp       ! local logical to flag explicit friction
       !!----------------------------------------------------------------------
       !
@@ -98 +97 @@
          ! Add SPG trend to 3D HPG trend and also output as 2D diagnostic in own right.
          CALL trd_dyn_iom_2d( putrd(:,:,1), pvtrd(:,:,1), jpdyn_spg, kt ) 
-         putrd(:,:,:) = putrd(:,:,:) + zutrd_hpg(:,:,:) 
-         pvtrd(:,:,:) = pvtrd(:,:,:) + zvtrd_hpg(:,:,:) 
+         zutrd_hpg(:,:,:) = zutrd_hpg(:,:,:) + putrd(:,:,:)  
+         zvtrd_hpg(:,:,:) = zvtrd_hpg(:,:,:) + pvtrd(:,:,:)  
+         CALL trd_dyn_iom_3d( zvtrd_hpg, zvtrd_hpg, jpdyn_hpg, kt ) 
          DEALLOCATE( zutrd_hpg, zvtrd_hpg )
 
@@ -107 +107 @@
          ! 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) )
+            ALLOCATE( zutrd_tfre(jpi,jpj,jpk), zvtrd_tfre(jpi,jpj,jpk) )
             zutrd_tfre(:,:,:) = putrd(:,:,:)
             zvtrd_tfre(:,:,:) = pvtrd(:,:,:)
@@ -136 +136 @@
          ! 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) )
+            ALLOCATE( zutrd_bfre(jpi,jpj,jpk), zvtrd_bfre(jpi,jpj,jpk) )
             zutrd_bfre(:,:,:) = putrd(:,:,:)
             zvtrd_bfre(:,:,:) = pvtrd(:,:,:)
@@ -152 +152 @@
          ! Add various bottom friction terms for baroclinic trend to saved quantity.
          ! Any depth-mean component removed later when TFR trend written out. 
-         l_drgexp = .false.
          IF( .NOT. ALLOCATED(zutrd_bfr) ) THEN 
             ALLOCATE( zutrd_bfr(jpi,jpj,jpk), zvtrd_bfr(jpi,jpj,jpk) )