Changeset 2208

Timestamp:

2010-10-12T11:20:53+02:00 (14 years ago)

Author:

rblod

Message:

Put FCM NEMO code changes in DEV_r2191_3partymerge2010 branch

Location:

branches/DEV_r2191_3partymerge2010/NEMO

Files:

• C1D_SRC/c1d.F90 (modified) (view diffs)
• C1D_SRC/diawri_c1d.F90 (modified) (view diffs)
• C1D_SRC/dyncor_c1d.F90 (modified) (view diffs)
• C1D_SRC/dynnxt_c1d.F90 (modified) (view diffs)
• C1D_SRC/step_c1d.F90 (modified) (view diffs)
• LIM_SRC_2/dom_ice_2.F90 (modified) (view diffs)
• LIM_SRC_2/ice_2.F90 (modified) (view diffs)
• LIM_SRC_2/limadv_2.F90 (modified) (view diffs)
• LIM_SRC_2/limdia_2.F90 (modified) (view diffs)
• LIM_SRC_2/limdmp_2.F90 (modified) (view diffs)
• LIM_SRC_2/limdyn_2.F90 (modified) (view diffs)
• LIM_SRC_2/limistate_2.F90 (modified) (view diffs)
• LIM_SRC_2/limrhg_2.F90 (modified) (view diffs)
• LIM_SRC_2/limrst_2.F90 (modified) (view diffs)
• LIM_SRC_2/limsbc_2.F90 (modified) (view diffs)
• LIM_SRC_2/limtab_2.F90 (modified) (view diffs)
• LIM_SRC_2/limthd_2.F90 (modified) (view diffs)
• LIM_SRC_2/limthd_zdf_2.F90 (modified) (view diffs)
• LIM_SRC_2/limtrp_2.F90 (modified) (view diffs)
• LIM_SRC_2/limwri_2.F90 (modified) (view diffs)
• LIM_SRC_2/par_ice_2.F90 (modified) (view diffs)
• LIM_SRC_3/dom_ice.F90 (modified) (view diffs)
• LIM_SRC_3/limadv.F90 (modified) (view diffs)
• LIM_SRC_3/limdyn.F90 (modified) (view diffs)
• LIM_SRC_3/limistate.F90 (modified) (view diffs)
• LIM_SRC_3/limitd_me.F90 (modified) (view diffs)
• LIM_SRC_3/limitd_th.F90 (modified) (view diffs)
• LIM_SRC_3/limmsh.F90 (modified) (view diffs)
• LIM_SRC_3/limrhg.F90 (modified) (view diffs)
• LIM_SRC_3/limrst.F90 (modified) (view diffs)
• LIM_SRC_3/limsbc.F90 (modified) (view diffs)
• LIM_SRC_3/limtab.F90 (modified) (view diffs)
• LIM_SRC_3/limthd.F90 (modified) (view diffs)
• LIM_SRC_3/limthd_dh.F90 (modified) (view diffs)
• LIM_SRC_3/limthd_dif.F90 (modified) (view diffs)
• LIM_SRC_3/limthd_ent.F90 (modified) (view diffs)
• LIM_SRC_3/limthd_lac.F90 (modified) (view diffs)
• LIM_SRC_3/limthd_sal.F90 (modified) (view diffs)
• LIM_SRC_3/limtrp.F90 (modified) (view diffs)
• LIM_SRC_3/limupdate.F90 (modified) (view diffs)
• LIM_SRC_3/limvar.F90 (modified) (view diffs)
• LIM_SRC_3/par_ice.F90 (modified) (view diffs)
• LIM_SRC_3/thd_ice.F90 (modified) (view diffs)
• NST_SRC/agrif2model.F90 (modified) (view diffs)
• NST_SRC/agrif_oce.F90 (modified) (view diffs)
• NST_SRC/agrif_opa_interp.F90 (modified) (view diffs)
• NST_SRC/agrif_opa_sponge.F90 (modified) (view diffs)
• NST_SRC/agrif_opa_update.F90 (modified) (view diffs)
• NST_SRC/agrif_top_interp.F90 (modified) (view diffs)
• NST_SRC/agrif_top_sponge.F90 (modified) (view diffs)
• NST_SRC/agrif_top_update.F90 (modified) (view diffs)
• NST_SRC/agrif_user.F90 (modified) (view diffs)
• OFF_SRC/DOM/daymod.F90 (modified) (view diffs)
• OFF_SRC/DOM/domngb.F90 (modified) (view diffs)
• OFF_SRC/DOM/domstp.F90 (modified) (view diffs)
• OFF_SRC/DOM/domzgr_substitute.h90 (modified) (view diffs)
• OFF_SRC/IOM/in_out_manager.F90 (modified) (view diffs)
• OFF_SRC/IOM/iom.F90 (modified) (view diffs)
• OFF_SRC/IOM/iom_def.F90 (modified) (view diffs)
• OFF_SRC/IOM/iom_ioipsl.F90 (modified) (view diffs)
• OFF_SRC/IOM/iom_nf90.F90 (modified) (view diffs)
• OFF_SRC/IOM/iom_rstdimg.F90 (modified) (view diffs)
• OFF_SRC/LDF/ldfslp.F90 (modified) (view diffs)
• OFF_SRC/LDF/ldftra.F90 (modified) (view diffs)
• OFF_SRC/SBC/sbc_oce.F90 (modified) (view diffs)
• OFF_SRC/SBC/sbcrnf.F90 (modified) (view diffs)
• OFF_SRC/SOL/sol_oce.F90 (modified) (view diffs)
• OFF_SRC/eosbn2.F90 (modified) (view diffs)
• OFF_SRC/lib_mpp.F90 (modified) (view diffs)
• OFF_SRC/trc_oce.F90 (modified) (view diffs)
• OPA_SRC/BDY/bdy_oce.F90 (modified) (view diffs)
• OPA_SRC/BDY/bdy_par.F90 (modified) (view diffs)
• OPA_SRC/BDY/bdydta.F90 (modified) (view diffs)
• OPA_SRC/BDY/bdydyn.F90 (modified) (view diffs)
• OPA_SRC/BDY/bdyini.F90 (modified) (view diffs)
• OPA_SRC/BDY/bdytides.F90 (modified) (view diffs)
• OPA_SRC/BDY/bdytra.F90 (modified) (view diffs)
• OPA_SRC/BDY/bdyvol.F90 (modified) (view diffs)
• OPA_SRC/DIA/diaar5.F90 (modified) (view diffs)
• OPA_SRC/DIA/diafwb.F90 (modified) (view diffs)
• OPA_SRC/DIA/diagap.F90 (modified) (view diffs)
• OPA_SRC/DIA/diahth.F90 (modified) (view diffs)
• OPA_SRC/DIA/diaptr.F90 (modified) (view diffs)
• OPA_SRC/DOM/closea.F90 (modified) (view diffs)
• OPA_SRC/DOM/daymod.F90 (modified) (view diffs)
• OPA_SRC/DOM/dom_oce.F90 (modified) (view diffs)
• OPA_SRC/DOM/domain.F90 (modified) (view diffs)
• OPA_SRC/DOM/domcfg.F90 (modified) (view diffs)
• OPA_SRC/DOM/domhgr.F90 (modified) (view diffs)
• OPA_SRC/DOM/dommsk.F90 (modified) (view diffs)
• OPA_SRC/DOM/domngb.F90 (modified) (view diffs)
• OPA_SRC/DOM/domstp.F90 (modified) (view diffs)
• OPA_SRC/DOM/domvvl.F90 (modified) (view diffs)
• OPA_SRC/DOM/domzgr.F90 (modified) (view diffs)
• OPA_SRC/DOM/domzgr_substitute.h90 (modified) (view diffs)
• OPA_SRC/DOM/phycst.F90 (modified) (view diffs)
• OPA_SRC/DYN/divcur.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynadv.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynadv_cen2.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynadv_ubs.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynbfr.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynhpg.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynkeg.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynldf.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynldf_iso.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynnxt.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynspg.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynspg_exp.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynspg_flt.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynspg_oce.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynspg_ts.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynvor.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynzad.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynzdf.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynzdf_exp.F90 (modified) (view diffs)
• OPA_SRC/DYN/dynzdf_imp.F90 (modified) (view diffs)
• OPA_SRC/DYN/sshwzv.F90 (modified) (view diffs)
• OPA_SRC/FLO/flo_oce.F90 (modified) (view diffs)
• OPA_SRC/FLO/floats.F90 (modified) (view diffs)
• OPA_SRC/FLO/flowri.F90 (modified) (view diffs)
• OPA_SRC/IOM/in_out_manager.F90 (modified) (view diffs)
• OPA_SRC/IOM/iom.F90 (modified) (view diffs)
• OPA_SRC/IOM/iom_def.F90 (modified) (view diffs)
• OPA_SRC/IOM/iom_ioipsl.F90 (modified) (view diffs)
• OPA_SRC/IOM/iom_nf90.F90 (modified) (view diffs)
• OPA_SRC/IOM/iom_rstdimg.F90 (modified) (view diffs)
• OPA_SRC/IOM/restart.F90 (modified) (view diffs)
• OPA_SRC/LDF/ldfdyn.F90 (modified) (view diffs)
• OPA_SRC/LDF/ldfdyn_c2d.h90 (modified) (view diffs)
• OPA_SRC/LDF/ldfdyn_c3d.h90 (modified) (view diffs)
• OPA_SRC/LDF/ldfdyn_oce.F90 (modified) (view diffs)
• OPA_SRC/LDF/ldfslp.F90 (modified) (view diffs)
• OPA_SRC/LDF/ldftra.F90 (modified) (view diffs)
• OPA_SRC/LDF/ldftra_oce.F90 (modified) (view diffs)
• OPA_SRC/OBC/obc_oce.F90 (modified) (view diffs)
• OPA_SRC/OBC/obcini.F90 (modified) (view diffs)
• OPA_SRC/SBC/albedo.F90 (modified) (view diffs)
• OPA_SRC/SBC/cpl_oasis3.F90 (modified) (view diffs)
• OPA_SRC/SBC/cpl_oasis4.F90 (modified) (view diffs)
• OPA_SRC/SBC/fldread.F90 (modified) (view diffs)
• OPA_SRC/SBC/geo2ocean.F90 (modified) (view diffs)
• OPA_SRC/SBC/oasis4_date.F90 (modified) (view diffs)
• OPA_SRC/SBC/sbc_ice.F90 (modified) (view diffs)
• OPA_SRC/SBC/sbc_oce.F90 (modified) (view diffs)
• OPA_SRC/SBC/sbcana.F90 (modified) (view diffs)
• OPA_SRC/SBC/sbcblk_clio.F90 (modified) (view diffs)
• OPA_SRC/SBC/sbcblk_core.F90 (modified) (view diffs)
• OPA_SRC/SBC/sbccpl.F90 (modified) (view diffs)
• OPA_SRC/SBC/sbcflx.F90 (modified) (view diffs)
• OPA_SRC/SBC/sbcfwb.F90 (modified) (view diffs)
• OPA_SRC/SBC/sbcice_if.F90 (modified) (view diffs)
• OPA_SRC/SBC/sbcice_lim.F90 (modified) (view diffs)
• OPA_SRC/SBC/sbcice_lim_2.F90 (modified) (view diffs)
• OPA_SRC/SBC/sbcmod.F90 (modified) (view diffs)
• OPA_SRC/SBC/sbcrnf.F90 (modified) (view diffs)
• OPA_SRC/SBC/sbcssm.F90 (modified) (view diffs)
• OPA_SRC/SBC/sbcssr.F90 (modified) (view diffs)
• OPA_SRC/SOL/sol_oce.F90 (modified) (view diffs)
• OPA_SRC/SOL/solmat.F90 (modified) (view diffs)
• OPA_SRC/SOL/solpcg.F90 (modified) (view diffs)
• OPA_SRC/SOL/solsor.F90 (modified) (view diffs)
• OPA_SRC/SOL/solver.F90 (modified) (view diffs)
• OPA_SRC/TRA/eosbn2.F90 (modified) (view diffs)
• OPA_SRC/TRA/traadv.F90 (modified) (view diffs)
• OPA_SRC/TRA/traadv_cen2.F90 (modified) (view diffs)
• OPA_SRC/TRA/traadv_eiv.F90 (modified) (view diffs)
• OPA_SRC/TRA/traadv_muscl.F90 (modified) (view diffs)
• OPA_SRC/TRA/traadv_muscl2.F90 (modified) (view diffs)
• OPA_SRC/TRA/traadv_qck.F90 (modified) (view diffs)
• OPA_SRC/TRA/traadv_tvd.F90 (modified) (view diffs)
• OPA_SRC/TRA/traadv_ubs.F90 (modified) (view diffs)
• OPA_SRC/TRA/trabbc.F90 (modified) (view diffs)
• OPA_SRC/TRA/trabbl.F90 (modified) (view diffs)
• OPA_SRC/TRA/trabbl_adv.h90 (modified) (view diffs)
• OPA_SRC/TRA/tradmp.F90 (modified) (view diffs)
• OPA_SRC/TRA/traldf.F90 (modified) (view diffs)
• OPA_SRC/TRA/traldf_iso.F90 (modified) (view diffs)
• OPA_SRC/TRA/tranpc.F90 (modified) (view diffs)
• OPA_SRC/TRA/tranxt.F90 (modified) (view diffs)
• OPA_SRC/TRA/traqsr.F90 (modified) (view diffs)
• OPA_SRC/TRA/trasbc.F90 (modified) (view diffs)
• OPA_SRC/TRA/trazdf.F90 (modified) (view diffs)
• OPA_SRC/TRA/trazdf_exp.F90 (modified) (view diffs)
• OPA_SRC/TRA/trazdf_imp.F90 (modified) (view diffs)
• OPA_SRC/TRD/trdicp.F90 (modified) (view diffs)
• OPA_SRC/TRD/trdicp_oce.F90 (modified) (view diffs)
• OPA_SRC/TRD/trdmld_oce.F90 (modified) (view diffs)
• OPA_SRC/TRD/trdmld_rst.F90 (modified) (view diffs)
• OPA_SRC/TRD/trdmod.F90 (modified) (view diffs)
• OPA_SRC/TRD/trdmod_oce.F90 (modified) (view diffs)
• OPA_SRC/TRD/trdvor.F90 (modified) (view diffs)
• OPA_SRC/TRD/trdvor_oce.F90 (modified) (view diffs)
• OPA_SRC/ZDF/zdf_oce.F90 (modified) (view diffs)
• OPA_SRC/ZDF/zdfbfr.F90 (modified) (view diffs)
• OPA_SRC/ZDF/zdfddm.F90 (modified) (view diffs)
• OPA_SRC/ZDF/zdfevd.F90 (modified) (view diffs)
• OPA_SRC/ZDF/zdfini.F90 (modified) (view diffs)
• OPA_SRC/ZDF/zdfkpp.F90 (modified) (view diffs)
• OPA_SRC/ZDF/zdfmxl.F90 (modified) (view diffs)
• OPA_SRC/ZDF/zdfric.F90 (modified) (view diffs)
• OPA_SRC/ZDF/zdftke.F90 (modified) (view diffs)
• OPA_SRC/ZDF/zdftke_old.F90 (modified) (view diffs)
• OPA_SRC/ZDF/zdftmx.F90 (modified) (view diffs)
• OPA_SRC/agrif_opa_interp.F90 (deleted)
• OPA_SRC/agrif_opa_sponge.F90 (deleted)
• OPA_SRC/agrif_opa_update.F90 (deleted)
• OPA_SRC/istate.F90 (modified) (view diffs)
• OPA_SRC/lib_cray.f90 (modified) (view diffs)
• OPA_SRC/lib_mpp.F90 (modified) (view diffs)
• OPA_SRC/oce.F90 (modified) (view diffs)
• OPA_SRC/opa.F90 (modified) (view diffs)
• OPA_SRC/par_oce.F90 (modified) (view diffs)
• OPA_SRC/step.F90 (modified) (view diffs)
• OPA_SRC/stpctl.F90 (modified) (view diffs)
• OPA_SRC/trc_oce.F90 (modified) (view diffs)
• TOP_SRC/C14b/par_c14b.F90 (modified) (view diffs)
• TOP_SRC/C14b/trcctl_c14b.F90 (modified) (view diffs)
• TOP_SRC/C14b/trcini_c14b.F90 (modified) (view diffs)
• TOP_SRC/C14b/trclsm_c14b.F90 (modified) (view diffs)
• TOP_SRC/CFC/par_cfc.F90 (modified) (view diffs)
• TOP_SRC/CFC/trcctl_cfc.F90 (modified) (view diffs)
• TOP_SRC/CFC/trcini_cfc.F90 (modified) (view diffs)
• TOP_SRC/CFC/trclsm_cfc.F90 (modified) (view diffs)
• TOP_SRC/CFC/trcsms_cfc.F90 (modified) (view diffs)
• TOP_SRC/DUMMY (deleted)
• TOP_SRC/LOBSTER/par_lobster.F90 (modified) (view diffs)
• TOP_SRC/LOBSTER/sms_lobster.F90 (modified) (view diffs)
• TOP_SRC/LOBSTER/trcbio.F90 (modified) (view diffs)
• TOP_SRC/LOBSTER/trcctl_lobster.F90 (modified) (view diffs)
• TOP_SRC/LOBSTER/trcexp.F90 (modified) (view diffs)
• TOP_SRC/LOBSTER/trcini_lobster.F90 (modified) (view diffs)
• TOP_SRC/LOBSTER/trclsm_lobster.F90 (modified) (view diffs)
• TOP_SRC/LOBSTER/trcopt.F90 (modified) (view diffs)
• TOP_SRC/LOBSTER/trcsed.F90 (modified) (view diffs)
• TOP_SRC/LOBSTER/trcsms_lobster.F90 (modified) (view diffs)
• TOP_SRC/MY_TRC/par_my_trc.F90 (modified) (view diffs)
• TOP_SRC/MY_TRC/trcctl_my_trc.F90 (modified) (view diffs)
• TOP_SRC/MY_TRC/trcini_my_trc.F90 (modified) (view diffs)
• TOP_SRC/MY_TRC/trclsm_my_trc.F90 (modified) (view diffs)
• TOP_SRC/MY_TRC/trcsms_my_trc.F90 (modified) (view diffs)
• TOP_SRC/PISCES/p4zbio.F90 (modified) (view diffs)
• TOP_SRC/PISCES/p4zche.F90 (modified) (view diffs)
• TOP_SRC/PISCES/p4zflx.F90 (modified) (view diffs)
• TOP_SRC/PISCES/p4zint.F90 (modified) (view diffs)
• TOP_SRC/PISCES/p4zlim.F90 (modified) (view diffs)
• TOP_SRC/PISCES/p4zlys.F90 (modified) (view diffs)
• TOP_SRC/PISCES/p4zmeso.F90 (modified) (view diffs)
• TOP_SRC/PISCES/p4zmicro.F90 (modified) (view diffs)
• TOP_SRC/PISCES/p4zmort.F90 (modified) (view diffs)
• TOP_SRC/PISCES/p4zopt.F90 (modified) (view diffs)
• TOP_SRC/PISCES/p4zprod.F90 (modified) (view diffs)
• TOP_SRC/PISCES/p4zrem.F90 (modified) (view diffs)
• TOP_SRC/PISCES/p4zsed.F90 (modified) (view diffs)
• TOP_SRC/PISCES/p4zsink.F90 (modified) (view diffs)
• TOP_SRC/PISCES/par_pisces.F90 (modified) (view diffs)
• TOP_SRC/PISCES/sms_pisces.F90 (modified) (view diffs)
• TOP_SRC/PISCES/trcctl_pisces.F90 (modified) (view diffs)
• TOP_SRC/PISCES/trcini_pisces.F90 (modified) (view diffs)
• TOP_SRC/PISCES/trclsm_pisces.F90 (modified) (view diffs)
• TOP_SRC/PISCES/trcsms_pisces.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcadv_cen2.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcadv_muscl.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcadv_muscl2.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcadv_smolar.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcadv_tvd.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcbbc.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcbbl.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcbbl_adv.h90 (modified) (view diffs)
• TOP_SRC/TRP/trcdmp.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcldf_bilap.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcldf_bilapg.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcldf_iso.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcldf_iso_zps.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcldf_lap.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcnxt.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcrad.F90 (modified) (view diffs)
• TOP_SRC/TRP/trcsbc.F90 (modified) (view diffs)
• TOP_SRC/TRP/trctrp.F90 (modified) (view diffs)
• TOP_SRC/TRP/trctrp_ctl.F90 (modified) (view diffs)
• TOP_SRC/TRP/trctrp_lec.F90 (modified) (view diffs)
• TOP_SRC/TRP/trczdf_exp.F90 (modified) (view diffs)
• TOP_SRC/TRP/trczdf_imp.F90 (modified) (view diffs)
• TOP_SRC/TRP/trczdf_iso.F90 (modified) (view diffs)
• TOP_SRC/TRP/trczdf_iso_vopt.F90 (modified) (view diffs)
• TOP_SRC/TRP/trdmld_trc.F90 (modified) (view diffs)
• TOP_SRC/TRP/trdmld_trc_oce.F90 (modified) (view diffs)
• TOP_SRC/TRP/trdmld_trc_rst.F90 (modified) (view diffs)
• TOP_SRC/TRP/trp_trc.F90 (modified) (view diffs)
• TOP_SRC/TRP/zpshde_trc.F90 (modified) (view diffs)
• TOP_SRC/oce_trc.F90 (modified) (view diffs)
• TOP_SRC/par_trc.F90 (modified) (view diffs)
• TOP_SRC/prtctl_trc.F90 (modified) (view diffs)
• TOP_SRC/top_substitute.h90 (modified) (view diffs)
• TOP_SRC/trc.F90 (modified) (view diffs)
• TOP_SRC/trcctl.F90 (modified) (view diffs)
• TOP_SRC/trcdia.F90 (modified) (view diffs)
• TOP_SRC/trcdta.F90 (modified) (view diffs)
• TOP_SRC/trcini.F90 (modified) (view diffs)
• TOP_SRC/trclec.F90 (modified) (view diffs)
• TOP_SRC/trcrst.F90 (modified) (view diffs)
• TOP_SRC/trcsms.F90 (modified) (view diffs)
• TOP_SRC/trcwri.F90 (modified) (view diffs)