Changeset 10478 for branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

Timestamp:

2019-01-09T12:11:55+01:00 (5 years ago)

Author:

jcastill

Message:

Merged branch UKMO/r6232_HZG_WAVE-coupling@9868

File:

• branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (3 diffs)

branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -470 +470 @@
                 &                        + fwfisf(:,:) + fwfisf_b(:,:)                     )
       ENDIF
-      !  
-      IF( ln_sdw ) THEN                         ! Stokes drift divergence added if necessary  
-         zssh_frc(:,:) = zssh_frc(:,:) + div_sd(:,:)  
-      ENDIF  
-      !  
 #if defined key_asminc
       !                                         ! Include the IAU weighted SSH increment
@@ -488 +483 @@
       !
       ! -----------------------------------------------------------------------
-      !  Phase 2 : Integration of the barotropic equations 
+      !  Phase 2 : Integration of the barotropic equations
       ! -----------------------------------------------------------------------
       !
       !                                             ! ==================== !
       !                                             !    Initialisations   !
-      !                                             ! ==================== !  
+      !                                             ! ==================== !
       ! Initialize barotropic variables:      
       IF( ll_init )THEN
@@ -502 +497 @@
          ub_e   (:,:) = 0._wp
          vb_e   (:,:) = 0._wp
+      ENDIF
+      ! 
+      ! Moved here to allow merging with other branch  
+      IF( ln_sdw ) THEN                         ! Stokes drift divergence added if necessary  
+         zssh_frc(:,:) = zssh_frc(:,:) + div_sd(:,:)  
       ENDIF
       !