Changeset 14701 for NEMO/branches/2021/ENHANCE-01_davestorkey_fix_3D_momentum_trends/src/OCE/DYN/dynspg.F90

Timestamp:

2021-04-13T15:59:31+02:00 (3 years ago)

Author:

davestorkey

Message:

2021/ENHANCE-01_davestorkey_fix_3D_momentum_trends : science changes

File:

• NEMO/branches/2021/ENHANCE-01_davestorkey_fix_3D_momentum_trends/src/OCE/DYN/dynspg.F90 (modified) (2 diffs)

NEMO/branches/2021/ENHANCE-01_davestorkey_fix_3D_momentum_trends/src/OCE/DYN/dynspg.F90

@@ -90 +90 @@
       IF( ln_timing )   CALL timing_start('dyn_spg')
       !
-      IF( l_trddyn )   THEN                      ! temporary save of ta and sa trends
+      IF( l_trddyn .AND. nspg == np_EXP )   THEN   ! temporary save of ta and sa trends
          ALLOCATE( ztrdu(jpi,jpj,jpk) , ztrdv(jpi,jpj,jpk) )
          ztrdu(:,:,:) = puu(:,:,:,Krhs)
@@ -170 +170 @@
       END SELECT
       !
-      IF( l_trddyn )   THEN                  ! save the surface pressure gradient trends for further diagnostics
+      IF( l_trddyn .AND. nspg == np_EXP )   THEN   ! save the surface pressure gradient trends for further diagnostics
          ztrdu(:,:,:) = puu(:,:,:,Krhs) - ztrdu(:,:,:)
          ztrdv(:,:,:) = pvv(:,:,:,Krhs) - ztrdv(:,:,:)
          CALL trd_dyn( ztrdu, ztrdv, jpdyn_spg, kt, Kmm )
+         ! In this case we also need to finalise the write-out of the PVO 3D diagnostic with zero correction
+         ztrdu(:,:,1) = 0._wp
+         ztrdv(:,:,1) = 0._wp
+         CALL trd_dyn( ztrdu(:,:,1), ztrdv(:,:,1), jpdyn_pvo, kt, Kmm )
          DEALLOCATE( ztrdu , ztrdv )
       ENDIF