# # ChangeLog for trunk/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90 # # Generated by Trac 1.0.1 # 2024-05-17T15:37:00+02:00 Tue, 24 Nov 2015 13:57:12 GMT jchanut [5913] * trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90 (modified) Correct time arguments for tidal forcing, ticket #1633 Wed, 15 Apr 2015 16:11:56 GMT nicolasmartin [5215] * trunk/NEMOGCM/NEMO/LIM_SRC_2/limrhg.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limupdate1.F90 (modified) * trunk/NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90 (modified) * trunk/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified) * trunk/NEMOGCM/NEMO/OOO_SRC/dtadyn.F90 (modified) * trunk/NEMOGCM/NEMO/OOO_SRC/obs_fbm.F90 (modified) * trunk/NEMOGCM/NEMO/OOO_SRC/ooo_data.F90 (modified) * trunk/NEMOGCM/NEMO/OOO_SRC/ooo_intp.F90 (modified) * trunk/NEMOGCM/NEMO/OOO_SRC/ooo_read.F90 (modified) * trunk/NEMOGCM/NEMO/OOO_SRC/ooo_utils.F90 (modified) * trunk/NEMOGCM/NEMO/OOO_SRC/ooo_write.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdylib.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/C1D/c1d.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/C1D/dtauvd.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/C1D/dyncor_c1d.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/C1D/dyndmp.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/C1D/dynnxt_c1d.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crs.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crsdomwri.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crsfld.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/CRS/crslbclnk.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbdia.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbtrj.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_smag.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_smag.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/OBS/julian.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/cyclone.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_mfs.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trd_oce.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdglo.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdini.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_oce.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_rst.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/TRD/trdtrc.F90 (modified) * trunk/NEMOGCM/NEMO/OPA_SRC/wrk_nemo.F90 (modified) * trunk/NEMOGCM/NEMO/SAS_SRC/daymod.F90 (modified) * trunk/NEMOGCM/NEMO/SAS_SRC/diawri.F90 (modified) * trunk/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90 (modified) * trunk/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90 (modified) * trunk/NEMOGCM/NEMO/SAS_SRC/step.F90 (modified) * trunk/NEMOGCM/NEMO/SAS_SRC/stpctl.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zbio.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zexp.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zopt.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsed.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsms.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zche.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zflx.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zint.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmort.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/par_sed.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sed.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedadv.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedarr.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedbtb.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedchem.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedco3.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/seddsr.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/seddta.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedini.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedmat.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedmbc.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedmodel.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedrst.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedsfc.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedstp.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedwri.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc_rst.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc_oce.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/trcbc.F90 (modified) * trunk/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified) SVN keywords tag inconsistencies resolution Fri, 14 Mar 2014 11:25:49 GMT smasson [4528] * trunk (moved) move dev_MERGE_2013 for 3.6 alpha onto the trunk, see #1257 Wed, 20 Nov 2013 16:28:04 GMT cetlod [4292] * branches/2013/dev_MERGE_2013 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/CONFIG/SHARED/1_namelist_ref (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/CONFIG/cfg.txt (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OFF_SRC/domain.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OFF_SRC/domrea.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_par.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90 (copied) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim2.F90 (deleted) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdylib.F90 (copied) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diadimg.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diahth.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domstp.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr_substitute.h90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_oce.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/IOM/iom_ioipsl.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/IOM/iom_nf90.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_vel.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/SBC/tide.h90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilap.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilapg.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfini.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/SAS_SRC/diawri.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/TOP_SRC/C14b/trcwri_c14b.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/TOP_SRC/CFC/trcwri_cfc.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcwri_my_trc.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zopt.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sed.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/TOP_SRC/PISCES/SED/sedini.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/TOP_SRC/PISCES/trcwri_pisces.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/TOP_SRC/trcdia.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/TOP_SRC/trcdta.F90 (modified) * branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified) dev_MERGE_2013 : 1st step of the merge, see ticket #1185