# # ChangeLog for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zlim.F90 # # Generated by Trac 1.0.1 # 2024-05-12T16:24:00+02:00 Fri, 10 Sep 2010 10:32:58 GMT cetlod [2082] * branches/DEV_r2006_merge_TRA_TRC/NEMO/NST_SRC/agrif_user.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OFF_SRC/dtadyn.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OFF_SRC/istate.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OFF_SRC/opa.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/DIA/diaar5.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/IOM/restart.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_eiv.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_muscl.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_muscl2.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traldf.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traldf_bilap.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traldf_bilapg.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traldf_lap.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/tranpc.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/trazdf_exp.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/trazdf_imp.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/zpshde.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRD/trdicp.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/istate.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/oce.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/opa.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/step.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/step_oce.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/trc_oce.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcbio.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcexp.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcopt.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcsed.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zche.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zflx.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zint.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zlim.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zprod.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zrem.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zsed.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/SED/par_sed.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/SED/sed.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/SED/seddta.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/oce_trc.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trc.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcini.F90 (modified) Improve the merge of TRA-TRC, see ticket #717 Thu, 29 Jul 2010 10:27:39 GMT cetlod [2023] * branches/DEV_r2006_merge_TRA_TRC (copied) Create a specific branch for the merge of active and passive tracers ... Thu, 24 Jun 2010 15:27:10 GMT acc [1953] * branches/DEV_r1784_mid_year_merge_2010/AGRIF/AA_make (modified) * branches/DEV_r1784_mid_year_merge_2010/AGRIF/AA_make.ldef (modified) * branches/DEV_r1784_mid_year_merge_2010/AGRIF/AGRIF_FILES/modbc.F (modified) * branches/DEV_r1784_mid_year_merge_2010/AGRIF/AGRIF_FILES/modinterp.F (modified) * branches/DEV_r1784_mid_year_merge_2010/AGRIF/AGRIF_FILES/modlinktomodel.F (modified) * branches/DEV_r1784_mid_year_merge_2010/AGRIF/AGRIF_FILES/modmpp.F (modified) * branches/DEV_r1784_mid_year_merge_2010/AGRIF/AGRIF_FILES/modtypes.F (modified) * branches/DEV_r1784_mid_year_merge_2010/AGRIF/AGRIF_FILES/modupdate.F (modified) * branches/DEV_r1784_mid_year_merge_2010/AGRIF/AGRIF_FILES/modutil.F (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/GYRE/scripts/BB_make (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/GYRE/scripts/BB_make.ldef (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/GYRE_LOBSTER/EXP00/iodef.xml (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/GYRE_LOBSTER/scripts/BB_make (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/GYRE_LOBSTER/scripts/BB_make.ldef (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/EXP00/iodef.xml (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/IGCM00/COMP/opa9.card (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/IGCM00/COMP/opa9.driver (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/scripts/BB_make (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/scripts/BB_make.ldef (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_pisces (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM_PISCES/scripts/BB_make (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM_PISCES/scripts/BB_make.ldef (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_pisces (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_OFF_PISCES/IGCM00/COMP/pisces.card (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_OFF_PISCES/scripts/BB_make (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_OFF_PISCES/scripts/BB_make.ldef (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/POMME/scripts/BB_make (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/POMME/scripts/BB_make.ldef (modified) * branches/DEV_r1784_mid_year_merge_2010/EXTERNAL/XMLF90/AA_make (modified) * branches/DEV_r1784_mid_year_merge_2010/EXTERNAL/XMLF90/makemake_XMLF90.perl (modified) * branches/DEV_r1784_mid_year_merge_2010/EXTERNAL/XMLIO_SERVER/AA_make (modified) * branches/DEV_r1784_mid_year_merge_2010/EXTERNAL/XMLIO_SERVER/makemake_XMLIO.perl (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/LIM_SRC_2/limwri_2.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/NST_SRC/agrif2model.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OFF_SRC/DOM/domrea.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DIA/diadimg.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DIA/dianam.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DIA/diawri.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DOM/domain.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DOM/domhgr.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DYN/divcur.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/IOM/iom.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/OBC/obc_oce.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/OBC/obcini.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/OBC/obcrst.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/fldread.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SOL/solmat.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/lib_mpp.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/opa.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/step.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/C14b/trclsm_c14b.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/C14b/trcrst_c14b.F90 (copied) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/CFC/trcctl_cfc.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/CFC/trclsm_cfc.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/CFC/trcrst_cfc.F90 (copied) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/LOBSTER/trcbio.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/LOBSTER/trcexp.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/LOBSTER/trcini_lobster.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/LOBSTER/trcopt.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/LOBSTER/trcrst_lobster.F90 (copied) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/LOBSTER/trcsed.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/MY_TRC/trcrst_my_trc.F90 (copied) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/PISCES/p4zbio.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/PISCES/p4zche.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/PISCES/p4zflx.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/PISCES/p4zlim.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/PISCES/p4zmeso.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/PISCES/p4zmicro.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/PISCES/p4zmort.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/PISCES/p4zopt.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/PISCES/p4zprod.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/PISCES/p4zrem.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/PISCES/p4zsink.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/PISCES/sms_pisces.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/PISCES/trcini_pisces.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/PISCES/trclsm_pisces.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/PISCES/trcrst_pisces.F90 (copied) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/TRP/trczdf_imp.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/TRP/trczdf_iso.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/TRP/trczdf_iso_vopt.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/trcdta.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_GYRE (modified) * branches/DEV_r1784_mid_year_merge_2010/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_GYRE_LOBSTER (modified) * branches/DEV_r1784_mid_year_merge_2010/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ORCA2_LIM (modified) * branches/DEV_r1784_mid_year_merge_2010/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ORCA2_LIM3 (modified) * branches/DEV_r1784_mid_year_merge_2010/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ORCA2_LIM_PISCES (modified) * branches/DEV_r1784_mid_year_merge_2010/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ORCA2_OFF_PISCES (modified) * branches/DEV_r1784_mid_year_merge_2010/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ZAGRIF (modified) * branches/DEV_r1784_mid_year_merge_2010/NVTK/fait_AA_make (modified) * branches/DEV_r1784_mid_year_merge_2010/UTIL/CFG_TOOLS (copied) * branches/DEV_r1784_mid_year_merge_2010/UTIL/fait_AA_make (modified) ticket #684 step 3: Add in changes from the trunk between revisions 1784 ...