Changeset 5104 for branches/2015/dev_r5094_UKMO_ISFCLEAN/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

Timestamp:

2015-02-23T17:07:54+01:00 (9 years ago)

Author:

mathiot

Message:

correction of minor bug with isf + add some extra test on ln_isfcav + restore ssu/ssv

File:

• branches/2015/dev_r5094_UKMO_ISFCLEAN/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) (1 diff)

branches/2015/dev_r5094_UKMO_ISFCLEAN/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

@@ -539 +539 @@
         ! Partial steps: before Horizontal DErivative
         ! only gtsu, gtsv, rhd, gru , grv are used 
-      IF( ln_zps )    CALL zps_hde    ( kt, jpts, pts, gtsu, gtsv,  &  ! Partial steps: before horizontal gradient
-        &                                         rhd, gru , grv    )  ! of t, s, rd at the last ocean level
-      IF( ln_zps .AND. ln_isfcav) &
+      IF( ln_zps  .AND. .NOT. ln_isfcav)                            &
+         &            CALL zps_hde    ( kt, jpts, pts, gtsu, gtsv,  &  ! Partial steps: before horizontal gradient
+         &                                        rhd, gru , grv    )  ! of t, s, rd at the last ocean level
+      IF( ln_zps .AND.        ln_isfcav)                            &
          &            CALL zps_hde_isf( kt, jpts, pts, gtsu, gtsv,  &    ! Partial steps for top cell (ISF)
          &                                        rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv ,   &