Changeset 11917 for NEMO/branches/UKMO/NEMO_4.0_momentum_trends/src/OCE/DYN/dynspg_ts.F90

Timestamp:

2019-11-15T16:56:18+01:00 (4 years ago)

Author:

davestorkey

Message:

UKMO/NEMO_4.0_momentum_trends :

1. Refactor so that ZDF trend always includes all bottom friction contributions. The budget can now be closed by including the ZDF trend without any BFR trends.

2. Some tidying of trddyn.F90.

File:

• NEMO/branches/UKMO/NEMO_4.0_momentum_trends/src/OCE/DYN/dynspg_ts.F90 (modified) (7 diffs)

NEMO/branches/UKMO/NEMO_4.0_momentum_trends/src/OCE/DYN/dynspg_ts.F90

@@ -175 +175 @@
       REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: zuwdav2, zvwdav2    ! averages over the sub-steps of zuwdmask and zvwdmask
       REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: zspgtrdu, zspgtrdv, zpvotrdu, zpvotrdv  ! SPG and PVO trends (if l_trddyn)
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: zbfrtrdu, zbfrtrdv                      ! BFR trends (if l_trddyn)
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: ztautrdu, ztautrdv, zbfrtrdu, zbfrtrdv  ! TAU and BFR trends (if l_trddyn)
       !!----------------------------------------------------------------------
       !
@@ -183 +183 @@
       !
       IF( l_trddyn ) THEN
-          ALLOCATE( zspgtrdu(jpi,jpj), zspgtrdv(jpi,jpj), zpvotrdu(jpi,jpj), zpvotrdv(jpi,jpj), zbfrtrdu(jpi,jpj), zbfrtrdv(jpi,jpj) )
+          ALLOCATE( zspgtrdu(jpi,jpj), zspgtrdv(jpi,jpj), zpvotrdu(jpi,jpj), zpvotrdv(jpi,jpj), &
+         &          ztautrdu(jpi,jpj), ztautrdv(jpi,jpj), zbfrtrdu(jpi,jpj), zbfrtrdv(jpi,jpj) )
           zspgtrdu(:,:) = 0._wp
           zspgtrdv(:,:) = 0._wp
           zpvotrdu(:,:) = 0._wp
           zpvotrdv(:,:) = 0._wp
+          ztautrdu(:,:) = 0._wp
+          ztautrdv(:,:) = 0._wp
           zbfrtrdu(:,:) = 0._wp
           zbfrtrdv(:,:) = 0._wp
@@ -573 +576 @@
       !
       ! Note that the "unclipped" bottom friction parameter is used even with explicit drag
+      IF( l_trddyn ) THEN
+         zbfrtrdu(:,:) = zu_frc(:,:)
+         zbfrtrdv(:,:) = zv_frc(:,:)
+      ENDIF
+      !
       IF( ln_wd_il ) THEN
          zztmp = -1._wp / rdtbt
@@ -592 +600 @@
       END IF
       !
+      IF( l_trddyn ) THEN
+         ! bottom friction trend diagnostic: bottom friction due to baroclinic currents
+         zbfrtrdu(:,:) = zu_frc(:,:) - zbfrtrdu(:,:)
+         zbfrtrdv(:,:) = zv_frc(:,:) - zbfrtrdv(:,:) 
+      ENDIF
+      !
       IF( ln_isfcav ) THEN       ! Add TOP stress contribution from baroclinic velocities:      
          IF( ln_bt_fw ) THEN
@@ -622 +636 @@
       ENDIF
       !       
+      IF( l_trddyn ) THEN
+         ztautrdu(:,:) = zu_frc(:,:)
+         ztautrdv(:,:) = zv_frc(:,:)
+      ENDIF
+      !
       IF( ln_bt_fw ) THEN                        ! Add wind forcing
          DO jj = 2, jpjm1
@@ -638 +657 @@
          END DO
       ENDIF  
+      !
+      IF( l_trddyn ) THEN
+         ! wind stress trend diagnostic
+         ztautrdu(:,:) = zu_frc(:,:) - ztautrdu(:,:)
+         ztautrdv(:,:) = zv_frc(:,:) - ztautrdv(:,:) 
+      ENDIF
       !
       IF( ln_apr_dyn ) THEN                     ! Add atm pressure forcing
@@ -1357 +1382 @@
          CALL trd_dyn( zspgtrdu, zspgtrdv, jpdyn_spg, kt )
          CALL trd_dyn( zpvotrdu, zpvotrdv, jpdyn_pvo, kt )
+         CALL trd_dyn( ztautrdu, ztautrdv, jpdyn_tau, kt )
          CALL trd_dyn( zbfrtrdu, zbfrtrdv, jpdyn_bfr, kt )
-         DEALLOCATE( zspgtrdu, zspgtrdv, zpvotrdu, zpvotrdv, zbfrtrdu, zbfrtrdv )
+         DEALLOCATE( zspgtrdu, zspgtrdv, zpvotrdu, zpvotrdv, ztautrdu, ztautrdv, zbfrtrdu, zbfrtrdv )
       ENDIF
       !