Changes between Version 12 and Version 13 of ticket/1611_is_oce_cpl

Timestamp:

2015-10-05T17:26:15+02:00 (9 years ago)

Author:

mathiot

Comment:

--

ticket/1611_is_oce_cpl

@@ -24 +24 @@
  * 'Dry a cell' case: set mask = 0, T/S = 0, U/V = 0, bt is corrected to keep bt_b = bt_n and ssh_b = ssh_n
  * 'Dry a column' case: set mask = 0, T/S = 0, U/V = 0 and ssh = 0
- * 'Wet a cell' case: set mask to 1, T/S = MEAN(T(ji+1,jj), T(ji-1,jj), T(ji,jj+1), T(ji,jj-1)) (if no neighbour along i/j axis check along the k axis), SSH unchanged, U/V = 0
- * 'Wet a column' case: set mask to 1, T/S = MEAN(T(ji+1,jj), T(ji-1,jj), T(ji,jj+1), T(ji,jj-1)) (if no neighbour along i/j axis check along the k axis), SSH unchanged, U/V = 0
+ * 'Wet a cell' case: set mask to 1, T/S = MEAN(T(ji+1,jj), T(ji-1,jj), T(ji,jj+1), T(ji,jj-1)) (if no neighbour along i/j axis check along the k axis), SSH unchanged, U/V = 0. If no neighbour, set mask to 0.
+ * 'Wet a column' case: set mask to 1, T/S = MEAN(T(ji+1,jj), T(ji-1,jj), T(ji,jj+1), T(ji,jj-1)) (if no neighbour along i/j axis check along the k axis), SSH unchanged, U/V = 0. If no neighbour, set mask to 0.
 
  As the before and now fields are not really compatible (modification of the geometry), the restart time step is prescribed to be an euler time step instead of a leap frog and fields_b = fields_n (only if coupling between ice sheet and ocean).
@@ -43 +43 @@
  * lbclnk.F90: add a routine to add correction term over the halo and afterward set the halo to 0. (Need to set a flag because not done for north fold but as the north fold do nut cut the Greenland, it is OK)
  * domngb.F90: I add an optional argument to be able to do this beneath the ice shelf (i.e. at level jk instead of 1).
+ * domain.F90: Call to domwri modified, because if coupling, mask could be change in iscpl routine (closed pool or other weird configuration due to the extrapolation process. (3 solutions: let as it is now, simplify it and move it to the end of istate.F90 or build a proper flood filling algorithm to apply in domzgr and keep the call to dom_wri as it is). 
  * + small modifications in order to have dev_r5589_is_oce_cpl branch compatible to dev_r5151_UKMO_ISF. Could leads to some issue during the merge of these 2 branches (modification of umask_i by ssumask ...).