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

Changes between Version 2 and Version 3 of ticket/0874_NOC_2011_MERGE


Ignore:
Timestamp:
2011-10-24T18:00:41+02:00 (12 years ago)
Author:
acc
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • ticket/0874_NOC_2011_MERGE

    v2 v3  
    88{{{ 
    99dev_r2782_NOCS_Griffies               [added to merge at changeset 2980] 
    10 dev_r2787_NOCS_NEPTUNE 
     10dev_r2787_NOCS_NEPTUNE            [added to merge at changeset 2986] 
    1111dev_r2802_NOCL_bfrimp 
    1212dev_r2802_NOCL_prjhpg 
     
    7777Committed revision 2980. 
    7878}}} 
     79 
     80'''Step 3'''. Merge in trunk changes between trunk@2782 and trunk@2787. Check-in changes if no conflicts arise 
     81 
     82 
     83{{{ 
     84svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2782 \ 
     85                 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \ 
     86                  ./ 
     87  
     88--- Merging r2783 through r2787 into '.': 
     89U    NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm 
     90U    NEMOGCM/NEMO/OFF_SRC/domrea.F90 
     91U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 
     92U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 
     93U    NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90 
     94U    NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 
     95 
     96svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 3: Merge in trunk changes between revision 2782 and 2787"  
     97 
     98Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm 
     99Sending        NEMOGCM/NEMO/OFF_SRC/domrea.F90 
     100Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 
     101Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 
     102Sending        NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90 
     103Sending        NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 
     104Transmitting file data ...... 
     105Committed revision 2985. 
     106}}} 
     107 
     108'''Step 4'''. Merge in all changes on the NOCS_NEPTUNE branch. Revert the cpp_ORCA2_LIM.fcm file that shouldn't have been changed. Check-in if no conflicts arise: 
     109 
     110 
     111{{{ 
     112svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \ 
     113                 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2787_NOCS_NEPTUNE \ 
     114                 ./ 
     115 
     116--- Merging r2791 through r2985 into '.': 
     117U    DOC/TexFiles/Biblio/Biblio.bib 
     118U    DOC/TexFiles/Chapters/Chap_DYN.tex 
     119A    DOC/TexFiles/Namelist/namdyn_nept 
     120U    NEMOGCM/CONFIG/GYRE/EXP00/namelist 
     121U    NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist 
     122U    NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist 
     123U    NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm 
     124U    NEMOGCM/CONFIG/POMME/EXP00/namelist 
     125U    NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm 
     126U    NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 
     127A    NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 
     128U    NEMOGCM/NEMO/OPA_SRC/step.F90 
     129 
     130svn revert NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm 
     131Reverted 'NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm' 
     132 
     133svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 4: Merge in changes from 2011/dev_r2787_NOCS_NEPTUNE branch" 
     134  
     135Sending        DOC/TexFiles/Biblio/Biblio.bib 
     136Sending        DOC/TexFiles/Chapters/Chap_DYN.tex 
     137Adding         DOC/TexFiles/Namelist/namdyn_nept 
     138Sending        NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm 
     139Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist 
     140Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist 
     141Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist 
     142Sending        NEMOGCM/CONFIG/POMME/EXP00/namelist 
     143Adding         NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 
     144Sending        NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 
     145Sending        NEMOGCM/NEMO/OPA_SRC/step.F90 
     146Transmitting file data ......... 
     147Committed revision 2986. 
     148}}} 
     149