Changeset 12362 for branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

Timestamp:

2020-02-10T10:52:54+01:00 (4 years ago)

Author:

kingr

Message:

Minor edit to allow merging of obs branch with (amm15 and GO6) package branches.

File:

• branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (1 diff)

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

@@ -454 +454 @@
       ELSE
          zssh_frc(:,:) = zraur * z1_2 * (  emp(:,:) + emp_b(:,:) - rnf(:,:) - rnf_b(:,:)   &
-                &                        + rdivisf * ( fwfisf(:,:) + fwfisf_b(:,:) )       )
-      ENDIF
-      !                                   !* Fill boundary data arrays for AGRIF
-      !                                   ! ------------------------------------
+                &                        + fwfisf(:,:) + fwfisf_b(:,:)                     )
+      ENDIF
+      !                                   !* Fill boundary data arrays with AGRIF
+      !                                   ! -------------------------------------
 #if defined key_agrif
          IF( .NOT.Agrif_Root() ) CALL agrif_dta_ts( kt )