Changeset 9466

Timestamp:

2018-04-09T15:45:36+02:00 (7 years ago)

Author:

jcastill

Message:

Move again some lines to allow merging with operational branches

File:

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

branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -467 +467 @@
                 &                        + fwfisf(:,:) + fwfisf_b(:,:)                     )
       ENDIF
+#if defined key_asminc
+      !                                         ! Include the IAU weighted SSH increment
+      IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau ) THEN
+         zssh_frc(:,:) = zssh_frc(:,:) - ssh_iau(:,:)
+      ENDIF
+#endif
       !                                   !* Fill boundary data arrays for AGRIF
       !                                   ! ------------------------------------
@@ -474 +480 @@
       !
       ! -----------------------------------------------------------------------
-      !  Phase 2 : Integration of the barotropic equations 
+      !  Phase 2 : Integration of the barotropic equations
       ! -----------------------------------------------------------------------
       !
-      ! 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 
-      ! 
-#if defined key_asminc
-      !                                         ! Include the IAU weighted SSH increment
-      IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau ) THEN
-         zssh_frc(:,:) = zssh_frc(:,:) - ssh_iau(:,:)
-      ENDIF
-#endif
       !                                             ! ==================== !
       !                                             !    Initialisations   !
-      !                                             ! ==================== !  
+      !                                             ! ==================== ! 
       ! Initialize barotropic variables:      
       IF( ll_init )THEN
@@ -500 +495 @@
          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 
       !
       IF (ln_bt_fw) THEN                  ! FORWARD integration: start from NOW fields