Changeset 8435 for branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2017-08-14T12:19:09+02:00 (7 years ago)

Author:

isabella

Message:

Added changes after review.

File:

• branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -273 +273 @@
                              CALL tra_nxt( kstp )                ! tracer fields at next time step
             IF( ln_sto_eos ) CALL sto_pts( tsn )                 ! Random T/S fluctuations
-                             CALL eos    ( tsa, rhd, rhop, fsdept_n(:,:,:) )  ! Time-filtered in situ density for hpg computation
-                             CALL lbc_lnk( rhd, 'T', 1.0_wp )
+            CALL eos    ( tsa, rhd, rhop, fsdept_n(:,:,:) )  ! Time-filtered in situ density for hpg computation
+            CALL lbc_lnk( rhd, 'T', 1.0_wp )
             IF( ln_zps .AND. .NOT. ln_isfcav)                                &
                &             CALL zps_hde    ( kstp, jpts, tsa, gtsu, gtsv,  &    ! Partial steps: before horizontal gradient
@@ -283 +283 @@
                &                                    gtui, gtvi, grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi    ) ! of t, s, rd at the last ocean level
             IF( ln_bias )    CALL dyn_bias( kstp )
-      ELSE                                                  ! centered hpg  (eos then time stepping)
-         IF ( .NOT. lk_dynspg_ts ) THEN                     ! eos already called in time-split case
-            IF( ln_sto_eos ) CALL sto_pts( tsn )    ! Random T/S fluctuations
-                             CALL eos    ( tsn, rhd, rhop, fsdept_n(:,:,:) )  ! now in situ density for hpg computation
-                             CALL lbc_lnk( rhd, 'T', 1.0_wp )
+      ELSE                                                   ! centered hpg  (eos then time stepping)
+         IF ( .NOT. lk_dynspg_ts ) THEN                      ! eos already called in time-split case
+            IF( ln_sto_eos ) CALL sto_pts( tsn )             ! Random T/S fluctuations
+            CALL eos    ( tsn, rhd, rhop, fsdept_n(:,:,:) )  ! now in situ density for hpg computation
+            CALL lbc_lnk( rhd, 'T', 1.0_wp )
          IF( ln_zps .AND. .NOT. ln_isfcav)                                   &
                &             CALL zps_hde    ( kstp, jpts, tsn, gtsu, gtsv,  &    ! Partial steps: before horizontal gradient