Changeset 9031 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_lim3_update.F90

Timestamp:

2017-12-14T11:10:02+01:00 (6 years ago)

Author:

timgraham

Message:

Resolved AGRIF conflicts

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_lim3_update.F90 (modified) (1 diff)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_lim3_update.F90

@@ -59 +59 @@
       Agrif_UseSpecialValueInUpdate = .TRUE.
 # if defined TWO_WAY
-      IF( MOD(nbcline,nbclineupdate) == 0) THEN ! update the whole basin at each nbclineupdate (=nn_cln_update) baroclinic parent time steps
-                                                ! nbcline is incremented (+1) at the end of each parent time step from 0 (1st time step)
-         CALL Agrif_Update_Variable( tra_ice_id , procname = update_tra_ice  )
-         CALL Agrif_Update_Variable( u_ice_id   , procname = update_u_ice    )
-         CALL Agrif_Update_Variable( v_ice_id   , procname = update_v_ice    )
-      ELSE                                      ! update only the boundaries defined par locupdate
-         CALL Agrif_Update_Variable( tra_ice_id , locupdate=(/0,2/), procname = update_tra_ice  )
-         CALL Agrif_Update_Variable( u_ice_id   , locupdate=(/0,1/), procname = update_u_ice    )
-         CALL Agrif_Update_Variable( v_ice_id   , locupdate=(/0,1/), procname = update_v_ice    )
-      ENDIF
+      CALL Agrif_Update_Variable( tra_ice_id , procname = update_tra_ice  )
+      CALL Agrif_Update_Variable( u_ice_id   , procname = update_u_ice    )
+      CALL Agrif_Update_Variable( v_ice_id   , procname = update_v_ice    )
+
+!      CALL Agrif_Update_Variable( tra_ice_id , locupdate=(/0,2/), procname = update_tra_ice  )
+!      CALL Agrif_Update_Variable( u_ice_id   , locupdate=(/0,1/), procname = update_u_ice    )
+!      CALL Agrif_Update_Variable( v_ice_id   , locupdate=(/0,1/), procname = update_v_ice    )
 # endif
       Agrif_SpecialValueFineGrid    = 0.