Changeset 15194

Timestamp:

2021-08-13T17:14:10+02:00 (3 years ago)

Author:

davestorkey

Message:

UKMO/NEMO_4.0.4_momentum_trends: Bug fixes so that it works with explicit friction (ln_drgimp=F).

Location:

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

Files:

• DYN/dynspg_ts.F90 (modified) (1 diff)
• TRD/trddyn.F90 (modified) (1 diff)

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

@@ -392 +392 @@
                END DO
             ENDIF
-            CALL trd_dyn( ztautrdu, ztautrdv, jpdyn_iceoc2d, kt )
+            IF( ln_isfcav.OR.ln_drgice_imp ) THEN
+               ! Save this part of the ice-ocean drag as the first installment of top friction
+               CALL trd_dyn( ztautrdu, ztautrdv, jpdyn_iceoc2d, kt )
+            ELSE
+               ! In this case this is the whole top friction trend
+               CALL trd_dyn( ztautrdu, ztautrdv, jpdyn_tfr, kt )
+            ENDIF
          ENDIF
          ! initialise fields for wind stress trends

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

@@ -209 +209 @@
          ! write out total top and bottom friction "trends" for the surface / bottom layers after 
          ! removing any depth-mean component.
-         IF( ALLOCATED( zutrd_tfr ) ) THEN
+         IF( ALLOCATED( zutrd_tfr ) .OR. ALLOCATED( zutrd_iceoc ) ) THEN
+            ! With explicit top and bottom friction, the top friction diagnostic
+            ! is initialised here.
+            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   
             IF( ALLOCATED( zutrd_iceoc ) ) THEN
                ! Add trend due to ice-ocean stress at the surface