# # ChangeLog for branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/opa.F90 # # Generated by Trac 1.0.1 # 2024-06-13T21:37:10+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 Fri, 13 Aug 2010 09:15:17 GMT cetlod [2052] * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/trasbc.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/opa.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/C14b/par_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/trcini_cfc.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/par_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/PISCES/par_pisces.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trcsbc.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/TRP/trdmld_trc.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trdmld_trc_rst.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/top_substitute.h90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trc.F90 (modified) Improve the merge TRA-TRC, see ticket:701 Thu, 29 Jul 2010 11:33:05 GMT cetlod [2027] * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/DIA/diaar5.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/DYN/dynadv.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/DYN/dynldf.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/DYN/dynzdf.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/FLO/floats.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/ZDF/zdfkpp.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/ZDF/zdfric.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/ZDF/zdftke_old.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/ZDF/zdftmx.F90 (modified) * branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/cla.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 (added) Reorganisation of the initialisation phase, see ticket:695 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 ... Tue, 29 Jun 2010 15:41:10 GMT acc [1976] * branches/DEV_r1784_mid_year_merge_2010/CONFIG/GYRE/EXP00/namelist (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/GYRE_LOBSTER/EXP00/namelist (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/EXP00/1_namelist (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/POMME/EXP00/namelist (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/LIM_SRC_2/limdyn_2.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/LIM_SRC_3/limdyn.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/DYN/dynspg_flt.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcana.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/solpcg.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SOL/solsor.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SOL/solver.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) ticket #684 step 6: Add in changes between the head of the ...