# # ChangeLog for branches/DEV_r1784_mid_year_merge_2010 # # Generated by Trac 1.0.1 # 2024-04-27T20:52:01+02:00 Fri, 09 Jul 2010 15:07:57 GMT acc [2006] * 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/SBC/sbcrnf.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/lib_fortran.F90 (copied) ticket #684 step 9a: Code fixes to achieve first successful compilation ... Fri, 09 Jul 2010 12:40:45 GMT acc [2004] * branches/DEV_r1784_mid_year_merge_2010/CONFIG/GYRE/scripts/BB_make (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/GYRE_LOBSTER/scripts/BB_make (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_PISCES/scripts/BB_make (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_OFF_PISCES/scripts/BB_make (modified) * branches/DEV_r1784_mid_year_merge_2010/CONFIG/POMME/scripts/BB_make (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/LIM_SRC_2/limmsh_2.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/LIM_SRC_2/limthd_2.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/LIM_SRC_2/limtrp_2.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/LIM_SRC_3/limmsh.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/LIM_SRC_3/limtrp.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OFF_SRC/DOM/phycst.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OFF_SRC/lib_mpp.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DIA/diaar5.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/domvvl.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DOM/domwri.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/OBC/obcfla.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/TRA/trasbc.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/lib_mpp.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/UTIL/fait_AA_make (modified) ticket #684 step 8: Add in changes from the trunk between revisions 1879 ... Fri, 09 Jul 2010 11:27:11 GMT acc [2000] * 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/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/OPA_SRC/BDY/bdyvol.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DIA/diafwb.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/DIA/diawri_dimg.h90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DOM/closea.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/dynspg_ts.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/OBC/obcvol.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbc_oce.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/SBC/sbcmod.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/ZDF/zdfkpp.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/cla.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/cla_div.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/cla_dynspg.F90 (modified) ticket #684 step 7: Add in changes between the head of the ... 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 ... 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 ... Thu, 24 Jun 2010 15:52:01 GMT acc [1954] * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/DEV_r1784_mid_year_merge_2010/DOC/TexFiles/Chapters/Chap_LDF.tex (modified) * branches/DEV_r1784_mid_year_merge_2010/DOC/TexFiles/Namelist/nam_dynldf (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DYN/dynldf.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DYN/dynldf_lap.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn_c1d.h90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn_c2d.h90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn_oce.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn_substitute.h90 (modified) ticket #684 step 4: Add in changes between the head of the ... 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 ... Thu, 24 Jun 2010 15:00:16 GMT acc [1951] * branches/DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/EXP00/namelist (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DTA/dtasal.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DTA/dtatem.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/sbcblk_clio.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcice_if.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcssr.F90 (modified) * branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) ticket #684 step 2: Add in changes from the DEV_r1784_3DF branch Thu, 24 Jun 2010 13:38:43 GMT acc [1950] * branches/DEV_r1784_mid_year_merge_2010 (copied) ticket #684 step 1: Create branch for mid year branch; start at the ... Mon, 30 Nov 2009 10:55:11 GMT rblod [1782] * trunk/CONFIG/ORCA2_LIM/EXP00/AA_job (modified) * trunk/CONFIG/ORCA2_LIM_PISCES/EXP00/AA_job (modified) Update AA_job for ORCA2