Changeset 15184

Timestamp:

2021-08-12T16:07:18+02:00 (3 years ago)

Author:

davestorkey

Message:

UKMO/NEMO_4.0.4_momentum_trends: bug fix.

Location:

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

Files:

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

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

@@ -516 +516 @@
          CALL trd_dyn( ztrdu, ztrdv, jpdyn_zdf, kt )
          !
-         !                             ! trends due to ice-ocean drag in surface layer
-         ztrdu_fr(:,:,:) = 0._wp    ;   ztrdv_fr(:,:,:) = 0._wp
-         ztrdu_fr(:,:,1) = ( uiceoc_b(:,:) + uiceoc(:,:) ) / ( e3u_n(:,:,1) * rau0 )
-         ztrdv_fr(:,:,1) = ( viceoc_b(:,:) + viceoc(:,:) ) / ( e3v_n(:,:,1) * rau0 )
-         CALL trd_dyn( ztrdu_fr(:,:,1), ztrdv_fr(:,:,1), jpdyn_iceoc, kt )
+         IF( nn_ice == 2 ) THEN
+            !                             ! trends due to ice-ocean drag in surface layer
+            ztrdu_fr(:,:,:) = 0._wp    ;   ztrdv_fr(:,:,:) = 0._wp
+            ztrdu_fr(:,:,1) = ( uiceoc_b(:,:) + uiceoc(:,:) ) / ( e3u_n(:,:,1) * rau0 )
+            ztrdv_fr(:,:,1) = ( viceoc_b(:,:) + viceoc(:,:) ) / ( e3v_n(:,:,1) * rau0 )
+            CALL trd_dyn( ztrdu_fr(:,:,1), ztrdv_fr(:,:,1), jpdyn_iceoc, kt )
+         ENDIF
          !
          !                             ! wind stress trends in surface layer

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

@@ -153 +153 @@
          !
          ! Add various bottom friction terms for baroclinic trend to saved quantity.
-         ! Any depth-mean component removed later when TFR trend written out. 
+         ! Any depth-mean component removed later when BFR trend written out. 
          IF( .NOT. ALLOCATED(zutrd_bfr) ) THEN 
             ALLOCATE( zutrd_bfr(jpi,jpj,jpk), zvtrd_bfr(jpi,jpj,jpk) )