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

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
ticket/0877_LOCEAN_2011 (diff) – NEMO

Changes between Version 2 and Version 3 of ticket/0877_LOCEAN_2011


Ignore:
Timestamp:
2011-10-22T11:14:43+02:00 (13 years ago)
Author:
cetlod
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • ticket/0877_LOCEAN_2011

    v2 v3  
    3030'''(2)''' Check out the new branch and merge in the first development branch [[BR]] 
    3131{{{ 
    32 svn co svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_LOCEAN_2011 
     32svn co svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_LOCEAN_2011  dev_LOCEAN_2011 
     33 
     34svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2787_LOCEAN_offline_fldread dev_LOCEAN_2011 
     35 
     36U    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist 
     37U    dev_LOCEAN_2011/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 
     38U    dev_LOCEAN_2011/NEMOGCM/NEMO/OFF_SRC/domrea.F90 
     39U    dev_LOCEAN_2011/NEMOGCM/NEMO/OFF_SRC/dommsk.F90 
     40U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/trc_oce.F90 
     41U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 
     42 
     43}}} 
     44 
     45No conflicts 
     46 
     47'''(3)''' Merge in the second development branch in the new branch [[BR]] 
     48{{{ 
     49svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2787_PISCES_improvment  dev_LOCEAN_2011 
     50 
     51U    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_pisces 
     52U    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_pisces 
     53U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trc.F90 
     54U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trcini.F90 
     55U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcrst_pisces.F90 
     56U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zflx.F90 
     57U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zint.F90 
     58U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90 
     59U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zche.F90 
     60U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcini_pisces.F90 
     61U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zopt.F90 
     62U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmeso.F90 
     63U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zprod.F90 
     64U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90 
     65U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlys.F90 
     66U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zbio.F90 
     67U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmicro.F90 
     68U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/sms_pisces.F90 
     69U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsed.F90 
     70U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmort.F90 
     71U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlim.F90 
     72U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zrem.F90 
     73U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90 
     74U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 
     75U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 
     76U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 
    3377}}} 
    3478----