# # ChangeLog for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zflx.F90 # # Generated by Trac 1.0.1 # 2024-05-18T05:35:40+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 Mon, 02 Aug 2010 10:57:40 GMT cetlod [2038] * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/C14b/par_c14b.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/C14b/trcctl_c14b.F90 (deleted) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/C14b/trcini_c14b.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/C14b/trclsm_c14b.F90 (deleted) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/C14b/trcnam_c14b.F90 (added) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/par_cfc.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trcctl_cfc.F90 (deleted) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trcini_cfc.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trclsm_cfc.F90 (deleted) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 (added) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/par_lobster.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/trcctl_lobster.F90 (deleted) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcexp.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcini_lobster.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trclsm_lobster.F90 (deleted) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcnam_lobster.F90 (added) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcopt.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcrst_lobster.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcsed.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcsms_lobster.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/MY_TRC/par_my_trc.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/MY_TRC/trcctl_my_trc.F90 (deleted) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/MY_TRC/trclsm_my_trc.F90 (deleted) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/MY_TRC/trcnam_my_trc.F90 (added) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.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/p4zlys.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zmeso.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zmicro.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zmort.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zopt.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/PISCES/p4zsink.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/par_pisces.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/sms_pisces.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/trcctl_pisces.F90 (deleted) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/trcini_pisces.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/trclsm_pisces.F90 (deleted) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90 (added) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/trcrst_pisces.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/oce_trc.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/par_trc.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trc.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcctl.F90 (deleted) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcdia.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcini.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trclec.F90 (deleted) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcnam.F90 (added) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcsms.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcstp.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcwri.F90 (modified) Apply the merge to passive tracers, see ticket:693 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 ... Fri, 25 Jun 2010 14:58:03 GMT acc [1970] * 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_PISCES/EXP00/iodef.xml (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_OFF_PISCES/EXP00/iodef.xml (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/POMME/EXP00/namelist (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/POMME/scripts/BB_make (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/NST_SRC/agrif_user.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OFF_SRC/trc_oce.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DIA/diaptr.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/phycst.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DYN/dynnxt.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/OBC/obc_par.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/OBC/obc_par_EEL_R5.h90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/OBC/obc_par_POMME_R025.h90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/OBC/obcdta.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/geo2ocean.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcfwb.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/TRA/traadv_tvd.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/TRA/tranxt.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/par_POMME_R025.h90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/trc_oce.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/p4zlys.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/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/p4zsed.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/trcrst_pisces.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/par_trc.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/trcdia.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/trcini.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/trcrst.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/TOP_SRC/trcwri.F90 (modified) ticket #684 step 5: Add in changes from the trunk between revisions 1821 ...