Changeset 15185

Timestamp:

2021-08-12T17:38:36+02:00 (3 years ago)

Author:

davestorkey

Message:

UKMO/NEMO_4.0.4_momentum_trends: bug fixes.

Location:

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

Files:

• DYN/dynzdf.F90 (modified) (3 diffs)
• ZDF/zdfdrg.F90 (modified) (2 diffs)

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

@@ -119 +119 @@
       !
       IF( l_trddyn )   THEN         !* temporary save of after velocities
-         ALLOCATE( ztrdu(jpi,jpj,jpk), ztrdv(jpi,jpj,jpk) ) 
+         ALLOCATE( ztrdu(jpi,jpj,jpk), ztrdv(jpi,jpj,jpk), ztrdu_fr(jpi,jpj,jpk), ztrdv_fr(jpi,jpj,jpk) ) 
          ztrdu(:,:,:) = ua(:,:,:)
          ztrdv(:,:,:) = va(:,:,:)
@@ -135 +135 @@
          END DO
          IF( l_trddyn )   THEN         !* temporary save of ta and sa trends
-            ALLOCATE( ztrdu_fr(jpi,jpj,jpk), ztrdv_fr(jpi,jpj,jpk) ) 
             ztrdu_fr(:,:,:) = ua(:,:,:)
             ztrdv_fr(:,:,:) = va(:,:,:)
@@ -561 +560 @@
          ENDIF
          !
-         IF( ALLOCATED(ztrdu_fr) ) DEALLOCATE( ztrdu_fr, ztrdv_fr ) 
-         DEALLOCATE( ztrdu, ztrdv ) 
+         DEALLOCATE( ztrdu, ztrdv, ztrdu_fr, ztrdv_fr ) 
       ENDIF
       !                                          ! print mean trends (used for debugging)

NEMO/branches/UKMO/NEMO_4.0.4_momentum_trends/src/OCE/ZDF/zdfdrg.F90

@@ -195 +195 @@
          ztrdv(:,:,:) = pva(:,:,:) - ztrdv(:,:,:)
          CALL trd_dyn( ztrdu(:,:,:), ztrdv(:,:,:), jpdyn_bfre, kt )
-         DEALLOCATE( ztrdu, ztrdv )
       ENDIF
       !
@@ -222 +221 @@
          ENDIF
       ENDIF
+      IF( l_trddyn )  DEALLOCATE( ztrdu, ztrdv )
       !
       !                                          ! print mean trends (used for debugging)