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/0889 (diff) – NEMO

Changes between Version 3 and Version 4 of ticket/0889


Ignore:
Timestamp:
2011-11-14T13:03:01+01:00 (12 years ago)
Author:
cbricaud
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • ticket/0889

    v3 v4  
    2020}}} 
    2121 
     22 
     23step3: merge in dev_MERCATOR_INGV_2011_MERGE INGV branch (  dev_INGV_2011)  
     24 
     25 
     26 
     27{{{ 
     28svn merge svn+ssh://yourlogin@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2855 \ 
     29          svn+ssh://yourlogin@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_INGV_2011 \ 
     30          dev_MERCATOR_INGV_2011_MERGE  
     31 
     32}}} 
     33 
     34 
     35 
     36{{{ 
     37--- Merging differences between repository URLs into 'dev_MERCATOR_INGV_2011_MERGE': 
     38U    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Biblio/Biblio.bib 
     39U    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Chapters/Chap_SBC.tex 
     40U    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Chapters/Chap_ZDF.tex 
     41A    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_wave 
     42U    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc 
     43A    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_ecmwf 
     44U    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namzdf_ric 
     45U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist 
     46U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist 
     47U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist 
     48U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist 
     49A    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 
     50U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 
     51U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 
     52U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 
     53A    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_ecmwf.F90 
     54U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 
     55U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90 
     56U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 
     57Password:  
     58Password:  
     59--- Merging r2803 through r3083 into 'dev_MERCATOR_INGV_2011_MERGE': 
     60   C dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_wave 
     61   C dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_ecmwf 
     62   C dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 
     63G    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 
     64G    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 
     65G    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 
     66   C dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_ecmwf.F90 
     67G    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 
     68U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90 
     69U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 
     70Summary of conflicts: 
     71  Tree conflicts: 4 
     72}}} 
     73 
     74 
     75