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

Changes between Version 4 and Version 5 of ticket/0883_MERCATOR_2011_MERGE


Ignore:
Timestamp:
2011-11-07T10:27:50+01:00 (12 years ago)
Author:
cbricaud
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • ticket/0883_MERCATOR_2011_MERGE

    v4 v5  
    1414 
    1515 
    16 step1 
    17  svn copy svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \ 
     16 
     17'''step1''' 
     18 
     19  
     20{{{ 
     21svn copy svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \ 
    1822          svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_MERCATOR_2011_MERGE \ 
    1923          -m "copy trunk rev 2787 in branch" 
     24}}} 
     25 
    2026 
    2127==> "Committed revision 3045" 
     28 
     29 
     30 
     31'''step2: add changes form dev_r2787_MERCATOR2_tidalharm'''  
     32 
     33  
     34{{{ 
     35svn merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \ 
     36           svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2787_MERCATOR2_tidalharm \ 
     37           dev_MERCATOR_2011_MERGE 
     38}}} 
     39 
     40 
     41 
     42{{{ 
     43--- Merging r2793 through r3045 into 'dev_MERCATOR_2011_MERGE': 
     44U    dev_MERCATOR_2011_MERGE/DOC/TexFiles/Chapters/Chap_DIA.tex 
     45A    dev_MERCATOR_2011_MERGE/DOC/TexFiles/Namelist/namdia_harm 
     46U    dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml 
     47U    dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist 
     48U    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 
     49A    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 
     50A    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/tide.h90 
     51A    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 
     52A    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/surdetermine.F90 
     53U    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step.F90 
     54}}} 
     55 
     56 
     57 
     58 
     59{{{ 
     60svn ci -m "add changes from dev_r2787_MERCATOR2_tidalharm in dev_MERCATOR_2011_MERGE" 
     61}}} 
     62  
     63 
     64{{{ 
     65Sending        DOC/TexFiles/Chapters/Chap_DIA.tex 
     66Adding         DOC/TexFiles/Namelist/namdia_harm 
     67Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml 
     68Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist 
     69Adding         NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 
     70Adding         NEMOGCM/NEMO/OPA_SRC/DIA/surdetermine.F90 
     71Adding         NEMOGCM/NEMO/OPA_SRC/SBC/tide.h90 
     72Adding         NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 
     73Sending        NEMOGCM/NEMO/OPA_SRC/step.F90 
     74Sending        NEMOGCM/NEMO/OPA_SRC/step_oce.F90 
     75Transmitting file data ..... 
     76Committed revision 3046. 
     77}}} 
     78 
     79step3 
     80 
     81 
     82 
     83 
     84