Merge UKMO and NOC 2014 developments

Step 1. Copy UKMO2_ice_shelves branch to use as a base

svn copy svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_r4650_UKMO2_ice_shelves \
svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_r4879_UKMO_NOC_MERGE \
-m "Branch dev_r4879_UKMO_NOC_MERGE. Create branch for the merging of UKMO and NOC developments. Begin with UKMO2_ice_shelves as the base."

Committed revision 4925.

Step 2. Check out a working copy

svn co svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_r4879_UKMO_NOC_MERGE

Step 3. Merge in changes from OBSASM branch:

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4650 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM ./

svn status
 M      .
A  +    NEMOGCM/SETTE/input_ORCA2_LIM_OBS.cfg
?       NEMOGCM/SETTE/sette_rpt.working
?       NEMOGCM/SETTE/sette.sh.merge-right.r4926
C       NEMOGCM/SETTE/sette.sh
?       NEMOGCM/SETTE/sette_rpt.merge-right.r4926
C       NEMOGCM/SETTE/sette_rpt
?       NEMOGCM/SETTE/sette.sh.merge-left.r4650
      C NEMOGCM/SETTE/input_ORCA2_LIM3.cfg
      >   local add, incoming add upon merge
      C NEMOGCM/SETTE/BATCH_TEMPLATE/batch-XC_ARCHER_INTEL
      >   local add, incoming add upon merge
      C NEMOGCM/SETTE/BATCH_TEMPLATE/batch-x3750_ADA_O0
      >   local add, incoming add upon merge
      C NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_MOBILIS
      >   local add, incoming add upon merge
?       NEMOGCM/SETTE/sette.sh.working
?       NEMOGCM/SETTE/sette_rpt.merge-left.r4650
M       NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90
M       NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
?       NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90.merge-right.r4926
C       NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90
?       NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90.merge-left.r4650
?       NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90.working
?       NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90.merge-right.r4926
C       NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90
?       NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90.merge-left.r4650
?       NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90.working
M       NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_vel.F90
M       NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
M       NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sst.F90
M       NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sla.F90
M       NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_seaice.F90
M       NEMOGCM/NEMO/OPA_SRC/OBS/jul2greg.h90
M       NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90
M       NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90
M       NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90
?       NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90.working
?       NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90.merge-right.r4926
C       NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90
?       NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90.merge-left.r4650
?       NEMOGCM/NEMO/LIM_SRC_3/limistate.F90.merge-right.r4926
C       NEMOGCM/NEMO/LIM_SRC_3/limistate.F90
?       NEMOGCM/NEMO/LIM_SRC_3/limistate.F90.working
M       NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90
?       NEMOGCM/NEMO/LIM_SRC_3/limistate.F90.merge-left.r4650
A  +    NEMOGCM/TOOLS/OBSTOOLS/python
A  +    NEMOGCM/TOOLS/OBSTOOLS/src/ooo_data.F90
A  +    NEMOGCM/TOOLS/OBSTOOLS/src/test_fbgenerate.F90
A  +    NEMOGCM/TOOLS/OBSTOOLS/src/fbgenerate.F90
M       NEMOGCM/TOOLS/OBSTOOLS/src/date_utils.F90
A  +    NEMOGCM/TOOLS/OBSTOOLS/src/ooo_write.F90
A  +    NEMOGCM/TOOLS/OBSTOOLS/src/test_arrays_mod.F90
A  +    NEMOGCM/TOOLS/OBSTOOLS/src/fbgenerate_coords.F90
M       NEMOGCM/CONFIG/SHARED/1_namelist_ref
M       NEMOGCM/CONFIG/SHARED/namelist_ref
?       NEMOGCM/CONFIG/cfg.txt.merge-left.r4650
M       NEMOGCM/CONFIG/ORCA2_LIM3/cpp_ORCA2_LIM3.fcm
?       NEMOGCM/CONFIG/cfg.txt.working
      C NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_vardef.sh.pstar4-testht
      >   local add, incoming add upon merge
      C NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_MLD_ortho.pro
      >   local add, incoming add upon merge
M       NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg
M       NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg
M       NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm
?       NEMOGCM/CONFIG/cfg.txt.merge-right.r4926
CM      NEMOGCM/CONFIG/cfg.txt
 M      NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm
      C NEMOGCM/ARCH/arch-x3750_ADA_O0.fcm
      >   local add, incoming add upon merge
      C NEMOGCM/ARCH/arch-XC_ARCHER_INTEL.fcm
      >   local add, incoming add upon merge
 M      DOC
Summary of conflicts:
  Text conflicts: 7
  Tree conflicts: 8

Step 4. Resolve conflicts and submit

 svn ci -m "Branch dev_r4879_UKMO_NOC_MERGE, Check in merged UKMO_OBSASM branch; all conflicts resolved"
Password: 
Sending        .
Sending        DOC
Sending        NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm
Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg
Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg
Sending        NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm
Sending        NEMOGCM/CONFIG/ORCA2_LIM3/cpp_ORCA2_LIM3.fcm
Sending        NEMOGCM/CONFIG/SHARED/1_namelist_ref
Sending        NEMOGCM/CONFIG/SHARED/namelist_ref
Sending        NEMOGCM/CONFIG/cfg.txt
Sending        NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90
Sending        NEMOGCM/NEMO/LIM_SRC_3/limistate.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90
Sending        NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
Sending        NEMOGCM/NEMO/OPA_SRC/OBS/jul2greg.h90
Sending        NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90
Sending        NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90
Sending        NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_seaice.F90
Sending        NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sla.F90
Sending        NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sst.F90
Sending        NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_vel.F90
Sending        NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90
Adding         NEMOGCM/SETTE/input_ORCA2_LIM_OBS.cfg
Sending        NEMOGCM/SETTE/sette.sh
Sending        NEMOGCM/SETTE/sette_rpt
Adding         NEMOGCM/TOOLS/OBSTOOLS/python
Sending        NEMOGCM/TOOLS/OBSTOOLS/src/date_utils.F90
Adding         NEMOGCM/TOOLS/OBSTOOLS/src/fbgenerate.F90
Adding         NEMOGCM/TOOLS/OBSTOOLS/src/fbgenerate_coords.F90
Adding         NEMOGCM/TOOLS/OBSTOOLS/src/ooo_data.F90
Adding         NEMOGCM/TOOLS/OBSTOOLS/src/ooo_write.F90
Adding         NEMOGCM/TOOLS/OBSTOOLS/src/test_arrays_mod.F90
Adding         NEMOGCM/TOOLS/OBSTOOLS/src/test_fbgenerate.F90
Transmitting file data .......................
Committed revision 4932.

Step 5. Merge in changes from the NOCS_ZTS branch

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4743 \
                svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_r4743_NOC2_ZTS ./

--- Merging differences between repository URLs into '.':
 G   DOC
   C NEMOGCM/SETTE/input_ORCA2_LIM3.cfg
   C NEMOGCM/SETTE/BATCH_TEMPLATE/batch-XC_ARCHER_INTEL
   C NEMOGCM/SETTE/BATCH_TEMPLATE/batch-x3750_ADA_O0
Conflict discovered in '/Users/omfman/Desktop/MERGE2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/SETTE/sette.sh'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C    NEMOGCM/SETTE/sette.sh
U    NEMOGCM/CONFIG/makenemo
A    NEMOGCM/CONFIG/uspcfg.txt
U    NEMOGCM/CONFIG/SHARED/namelist_ref
   C NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_MLD_ortho.pro
   C NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_vardef.sh.pstar4-testht
 G   NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm
   C NEMOGCM/ARCH/arch-x3750_ADA_O0.fcm
U    NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90
Conflict discovered in '/Users/omfman/Desktop/MERGE2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C    NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90
U    NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
U    NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90
U    NEMOGCM/NEMO/OPA_SRC/oce.F90
U    NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90
U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90
U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90
U    NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90
U    NEMOGCM/NEMO/OPA_SRC/step.F90
U    NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90
U    NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90
U    NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90
U    NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90
U    NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90
U    NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90
U    NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90
U    NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90
U    NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90
U    NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90
U    NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90
U    NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90
U    NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90
U    NEMOGCM/NEMO/LIM_SRC_3/par_ice.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limwri.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limcons.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limthd.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limthd_ent.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limvar.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limistate.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90
U    NEMOGCM/NEMO/LIM_SRC_3/thd_ice.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90
U    NEMOGCM/NEMO/LIM_SRC_3/ice.F90
U    NEMOGCM/NEMO/LIM_SRC_3/iceini.F90
A    NEMOGCM/TOOLS/COMPILE/Fcopy_extdir.sh
U    NEMOGCM/TOOLS/COMPILE/Fclean_var.sh
U    NEMOGCM/TOOLS/COMPILE/Fdel_keys.sh
U    NEMOGCM/TOOLS/COMPILE/Fcheck_config.sh
U    NEMOGCM/TOOLS/COMPILE/Fcopy_dir.sh
A    NEMOGCM/TOOLS/COMPILE/Ffetch_extdir.sh
U    NEMOGCM/TOOLS/COMPILE/Fmake_WORK.sh
A    NEMOGCM/TOOLS/COMPILE/Fmake_extconfig.sh
U    NEMOGCM/TOOLS/COMPILE/Fadd_keys.sh
A    NEMOGCM/TOOLS/MISCELLANEOUS/icb_pp.py
 G   .
--- Recording mergeinfo for merge between repository URLs into '.':

 U   .
 U   DOC
 U   NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm
Summary of conflicts:
  Text conflicts: 2
  Tree conflicts: 6

Step 6. Resolve conflicts and check in

svn ci -m 'Branch dev_r4879_UKMO_NOC_MERGE, Check in merged changes from NOC_ZTS branch; all conflicts resolved'
Password: 
Sending        .
Sending        DOC
Sending        NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm
Sending        NEMOGCM/CONFIG/SHARED/namelist_ref
Sending        NEMOGCM/CONFIG/makenemo
Adding         NEMOGCM/CONFIG/uspcfg.txt
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90
Sending        NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90
Sending        NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90
Sending        NEMOGCM/TOOLS/COMPILE/Fadd_keys.sh
Sending        NEMOGCM/TOOLS/COMPILE/Fcheck_config.sh
Sending        NEMOGCM/TOOLS/COMPILE/Fclean_var.sh
Sending        NEMOGCM/TOOLS/COMPILE/Fcopy_dir.sh
Adding         NEMOGCM/TOOLS/COMPILE/Fcopy_extdir.sh
Sending        NEMOGCM/TOOLS/COMPILE/Fdel_keys.sh
Adding         NEMOGCM/TOOLS/COMPILE/Ffetch_extdir.sh
Sending        NEMOGCM/TOOLS/COMPILE/Fmake_WORK.sh
Adding         NEMOGCM/TOOLS/COMPILE/Fmake_extconfig.sh
Adding         NEMOGCM/TOOLS/MISCELLANEOUS/icb_pp.py
Transmitting file data ......................
Committed revision 4934.