Context Navigation

← Previous Changeset
Next Changeset →

Changeset 4990

Timestamp:

2014-12-15T17:42:49+01:00 (10 years ago)

Author:

timgraham

Message:

Merged branches/2014/dev_MERGE_2014 back onto the trunk as follows:

In the working copy of branch ran:
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
1 conflict in LIM_SRC_3/limdiahsb.F90
Resolved by keeping the version from dev_MERGE_2014 branch
and commited at r4989

In working copy run:
svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge --reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_MERGE_2014
to merge the branch into the trunk - no conflicts at this stage.

Location:

trunk

Files:

: 18 deleted
: 219 edited
: 35 copied

. (modified) (view diffs)
DOC (modified) (view diffs)
NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) (view diffs)
NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) (view diffs)
NEMOGCM/ARCH/arch-X64_ADA.fcm (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/ARCH/arch-X64_ADA.fcm) (view diffs)
NEMOGCM/ARCH/arch-X64_ADA_O0.fcm (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/ARCH/arch-X64_ADA_O0.fcm) (view diffs)
NEMOGCM/ARCH/arch-x3750_ADA.fcm (deleted)
NEMOGCM/ARCH/arch-x3750_ADA_O0.fcm (deleted)
NEMOGCM/CONFIG/GYRE/EXP00/namelist_cfg (modified) (view diffs)
NEMOGCM/CONFIG/GYRE/cpp_GYRE.fcm (modified) (view diffs)
NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg (modified) (view diffs)
NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg (modified) (view diffs)
NEMOGCM/CONFIG/GYRE_PISCES/cpp_GYRE_PISCES.fcm (modified) (view diffs)
NEMOGCM/CONFIG/ISOMIP (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/ISOMIP) (view diffs)
NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg (modified) (view diffs)
NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg (modified) (view diffs)
NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm (modified) (view diffs)
NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/1_namelist_cfg (modified) (view diffs)
NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/iodef.xml (modified) (view diffs)
NEMOGCM/CONFIG/ORCA2_LIM3/cpp_ORCA2_LIM3.fcm (modified) (view diffs)
NEMOGCM/CONFIG/SHARED/1_namelist_ref (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/SHARED/1_namelist_ref) (view diffs)
NEMOGCM/CONFIG/SHARED/field_def.xml (modified) (view diffs)
NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref (modified) (view diffs)
NEMOGCM/CONFIG/SHARED/namelist_ref (modified) (view diffs)
NEMOGCM/CONFIG/cfg.txt (modified) (view diffs)
NEMOGCM/CONFIG/makenemo (modified) (view diffs)
NEMOGCM/CONFIG/uspcfg.txt (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/CONFIG/uspcfg.txt) (view diffs)
NEMOGCM/NEMO/LIM_SRC_2/limhdf_2.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/ice.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limadv.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limhdf.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limrst.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limthd_ent.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limupdate1.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 (modified) (view diffs)
NEMOGCM/NEMO/LIM_SRC_3/thd_ice.F90 (modified) (view diffs)
NEMOGCM/NEMO/OFF_SRC/domain.F90 (modified) (view diffs)
NEMOGCM/NEMO/OFF_SRC/dommsk.F90 (modified) (view diffs)
NEMOGCM/NEMO/OFF_SRC/domrea.F90 (modified) (view diffs)
NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) (view diffs)
NEMOGCM/NEMO/OOO_SRC/nemogcm.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/C1D/dyndmp.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilap.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_iso.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_lap.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/LDF/ldfeiv.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/OBS/ddatetoymdhms.h90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/OBS/jul2greg.h90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_seaice.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sla.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sst.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_vel.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis4.F90 (deleted)
NEMOGCM/NEMO/OPA_SRC/SBC/oasis4_date.F90 (deleted)
NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_clio.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_mfs.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilap.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/tranpc.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRA/zpshde.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRD/trd_oce.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trd_oce.F90) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trddyn.F90) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRD/trdglo.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdglo.F90) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRD/trdicp.F90 (deleted)
NEMOGCM/NEMO/OPA_SRC/TRD/trdicp_oce.F90 (deleted)
NEMOGCM/NEMO/OPA_SRC/TRD/trdini.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdini.F90) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRD/trdmld.F90 (deleted)
NEMOGCM/NEMO/OPA_SRC/TRD/trdmld_oce.F90 (deleted)
NEMOGCM/NEMO/OPA_SRC/TRD/trdmld_rst.F90 (deleted)
NEMOGCM/NEMO/OPA_SRC/TRD/trdmod.F90 (deleted)
NEMOGCM/NEMO/OPA_SRC/TRD/trdmod_oce.F90 (deleted)
NEMOGCM/NEMO/OPA_SRC/TRD/trdmod_trc.F90 (deleted)
NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_oce.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_oce.F90) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_rst.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_rst.F90) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRD/trdtrc.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdtrc.F90) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRD/trdvor.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/TRD/trdvor_oce.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ZDF/zdf_oce.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ZDF/zdfini.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/par_oce.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) (view diffs)
NEMOGCM/NEMO/OPA_SRC/vectopt_loop_substitute.h90 (modified) (view diffs)
NEMOGCM/NEMO/SAS_SRC/sbcssm.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zbio.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zexp.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zopt.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsed.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsms.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zopt.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90 (deleted)
NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc_rst.F90 (deleted)
NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc.F90 (deleted)
NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc_oce.F90 (deleted)
NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90) (view diffs)
NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc_rst.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc_rst.F90) (view diffs)
NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc.F90) (view diffs)
NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc_oce.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc_oce.F90) (view diffs)
NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/trc.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) (view diffs)
NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) (view diffs)
NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA) (view diffs)
NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA_O0 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA_O0) (view diffs)
NEMOGCM/SETTE/BATCH_TEMPLATE/batch-x3750_ADA (deleted)
NEMOGCM/SETTE/BATCH_TEMPLATE/batch-x3750_ADA_O0 (deleted)
NEMOGCM/SETTE/input_ISOMIP.cfg (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/SETTE/input_ISOMIP.cfg) (view diffs)
NEMOGCM/SETTE/input_ORCA2_LIM_OBS.cfg (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/SETTE/input_ORCA2_LIM_OBS.cfg) (view diffs)
NEMOGCM/SETTE/sette.sh (modified) (view diffs)
NEMOGCM/SETTE/sette_rpt (modified) (view diffs)
NEMOGCM/SETTE/sette_xios.sh (modified) (view diffs)
NEMOGCM/TOOLS/COMPILE/Fadd_keys.sh (modified) (view diffs)
NEMOGCM/TOOLS/COMPILE/Fcheck_config.sh (modified) (view diffs)
NEMOGCM/TOOLS/COMPILE/Fclean_var.sh (modified) (view diffs)
NEMOGCM/TOOLS/COMPILE/Fcopy_dir.sh (modified) (view diffs)
NEMOGCM/TOOLS/COMPILE/Fcopy_extdir.sh (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/TOOLS/COMPILE/Fcopy_extdir.sh) (view diffs)
NEMOGCM/TOOLS/COMPILE/Fdel_keys.sh (modified) (view diffs)
NEMOGCM/TOOLS/COMPILE/Ffetch_extdir.sh (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/TOOLS/COMPILE/Ffetch_extdir.sh) (view diffs)
NEMOGCM/TOOLS/COMPILE/Fmake_WORK.sh (modified) (view diffs)
NEMOGCM/TOOLS/COMPILE/Fmake_extconfig.sh (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/TOOLS/COMPILE/Fmake_extconfig.sh) (view diffs)
NEMOGCM/TOOLS/COMPILE/bld.cfg (modified) (view diffs)
NEMOGCM/TOOLS/COMPILE/bld_preproagr.cfg (modified) (view diffs)
NEMOGCM/TOOLS/COMPILE/bldxag.cfg (modified) (view diffs)
NEMOGCM/TOOLS/MISCELLANEOUS/icb_pp.py (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/TOOLS/MISCELLANEOUS/icb_pp.py) (view diffs)
NEMOGCM/TOOLS/OBSTOOLS/python (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/TOOLS/OBSTOOLS/python) (view diffs)
NEMOGCM/TOOLS/OBSTOOLS/src/date_utils.F90 (modified) (view diffs)
NEMOGCM/TOOLS/OBSTOOLS/src/fbgenerate.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/TOOLS/OBSTOOLS/src/fbgenerate.F90) (view diffs)
NEMOGCM/TOOLS/OBSTOOLS/src/fbgenerate_coords.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/TOOLS/OBSTOOLS/src/fbgenerate_coords.F90) (view diffs)
NEMOGCM/TOOLS/OBSTOOLS/src/ooo_data.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/TOOLS/OBSTOOLS/src/ooo_data.F90) (view diffs)
NEMOGCM/TOOLS/OBSTOOLS/src/ooo_write.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/TOOLS/OBSTOOLS/src/ooo_write.F90) (view diffs)
NEMOGCM/TOOLS/OBSTOOLS/src/test_arrays_mod.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/TOOLS/OBSTOOLS/src/test_arrays_mod.F90) (view diffs)
NEMOGCM/TOOLS/OBSTOOLS/src/test_fbgenerate.F90 (copied) (copied from branches/2014/dev_MERGE_2014/NEMOGCM/TOOLS/OBSTOOLS/src/test_fbgenerate.F90) (view diffs)

Note: See TracChangeset for help on using the changeset viewer.

New URL for NEMO forge! http://forge.nemo-ocean.eu

Context Navigation

Changeset 4990

Download in other formats: