Changes between Version 5 and Version 6 of ticket/1006_dev_NOC_2012_rev3555


Ignore:
Timestamp:
2012-11-22T18:54:51+01:00 (8 years ago)
Author:
acc
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • ticket/1006_dev_NOC_2012_rev3555

    v5 v6  
    12122012/dev_r3385_NOCS04_HAMF              [added to merge at changeset 3631     ] 
    1313 
    14 2012/dev_r3452_NOCL02_Smagorinsky       [added to merge at changeset      ] 
    15 2012/dev_r3452_NOCL06_LOGLAYER          [added to merge at changeset      ] 
     142012/dev_r3452_NOCL02_Smagorinsky       [added to merge at changeset  3634   ] 
     152012/dev_r3452_NOCL06_LOGLAYER          [added to merge at changeset  3633    ] 
     16 
     17NOC 2012 merge completed (subject to testing) at revision 3635. 
    1618 
    17192012/dev_r3452_NOCL01_WettingDrying     [Ongoing. On schedule for 2013    ] 
     
    789791Committed revision 3632. 
    790792}}} 
     793 
     794'''Step 10'''. Merge  in all changes on the 2012/dev_r3452_NOCL06_LOGLAYER branch. Check-in if no conflicts arise: 
     795 
     796{{{ 
     797svn merge  svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3452 \ 
     798                  svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3452_NOCL06_LOGLAYER \ 
     799                   ./ 
     800  
     801--- Merging r3453 through r3632 into '.': 
     802U    NEMOGCM/CONFIG/AMM12/EXP00/namelist 
     803U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 
     804}}} 
     805 
     806No conflicts but no documentation either! Only about 10 lines of code involved. Tidied up a bit and reset the one namelist change supplied to not select this option by default (otherwise the SETTE test results will change).  
     807 
     808{{{ 
     809svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 10: merge in changes from the 2012/dev_r3452_NOCL06_LOGLAYER branch" 
     810 
     811Sending        . 
     812Sending        NEMOGCM/CONFIG/AMM12/EXP00/namelist 
     813Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 
     814Transmitting file data .. 
     815Committed revision 3633. 
     816}}} 
     817 
     818'''Step 11'''. Merge in all changes on the 2012/dev_r3452_NOCL02_Smagorinsky branch. Check-in if no conflicts arise: 
     819 
     820{{{ 
     821svn merge  svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3452  \ 
     822                  svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3452_NOCL02_Smagorinsky \ 
     823                  ./ 
     824 
     825--- Merging r3453 through r3633 into '.': 
     826U    NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilap.F90 
     827U    NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90 
     828U    NEMOGCM/NEMO/OPA_SRC/step_oce.F90 
     829A    NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_smag.F90 
     830A    NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_smag.F90 
     831U    NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90 
     832U    NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_oce.F90 
     833U    NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_c3d.h90 
     834U    NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 
     835U    NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 
     836U    NEMOGCM/NEMO/OPA_SRC/step.F90 
     837 
     838svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 11: merge in changes from the 2012/dev_r3452_NOCL02_Smagorinsky branch" 
     839 
     840Sending        . 
     841Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilap.F90 
     842Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90 
     843Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 
     844Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_oce.F90 
     845Adding         NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_smag.F90 
     846Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 
     847Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_c3d.h90 
     848Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90 
     849Adding         NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_smag.F90 
     850Sending        NEMOGCM/NEMO/OPA_SRC/step.F90 
     851Sending        NEMOGCM/NEMO/OPA_SRC/step_oce.F90 
     852Transmitting file data ......... 
     853Committed revision 3634. 
     854 
     855}}} 
     856 
     857'''Note documentation is absent!'''  
     858 
     859Step 13. Finally Merge in all trunk changes from 3452 to 3555. Check-in if no conflicts arise. 
     860 
     861{{{ 
     862 
     863svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3452 \ 
     864          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3555 \ 
     865          ./ 
     866 
     867--- Merging r3453 through r3555 into '.': 
     868R    NEMOGCM/SETTE/input_ORCA2_OFF_PISCES.cfg 
     869R    NEMOGCM/SETTE/input_ORCA2_LIM.cfg 
     870Conflict discovered in 'NEMOGCM/SETTE/iodef_sette.xml'. 
     871Select: (p) postpone, (df) diff-full, (e) edit, 
     872        (mc) mine-conflict, (tc) theirs-conflict, 
     873        (s) show all options: p 
     874C    NEMOGCM/SETTE/iodef_sette.xml 
     875R    NEMOGCM/SETTE/input_AMM12.cfg 
     876U    NEMOGCM/SETTE/input_ORCA2_LIM_PISCES.cfg 
     877U    NEMOGCM/SETTE/input_ORCA2_LIM_AGRIF.cfg 
     878R    NEMOGCM/SETTE/sette.sh 
     879R    NEMOGCM/SETTE/README 
     880R    NEMOGCM/SETTE/input_AMM12_PISCES.cfg 
     881R    NEMOGCM/SETTE/prepare_job.sh 
     882U    NEMOGCM/SETTE/sette_beginner.sh 
     883R    NEMOGCM/SETTE/fcm_job.sh 
     884R    NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW6_VARGAS 
     885D    NEMOGCM/SETTE/input_POMME.cfg 
     886D    NEMOGCM/SETTE/sette.sh.vargas 
     887Conflict discovered in 'NEMOGCM/CONFIG/cfg.txt'. 
     888Select: (p) postpone, (df) diff-full, (e) edit, 
     889        (mc) mine-conflict, (tc) theirs-conflict, 
     890        (s) show all options: p 
     891--- Merging r3453 through r3555 into 'NEMOGCM/CONFIG/cfg.txt': 
     892C    NEMOGCM/CONFIG/cfg.txt 
     893--- Merging r3453 through r3555 into '.': 
     894U    NEMOGCM/NEMO/LIM_SRC_2/limdmp_2.F90 
     895U    NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 
     896Summary of conflicts: 
     897  Text conflicts: 2 
     898 
     899}}} 
     900 
     901Resolved simple conflicts in iodef_sette.xml and config.txt. Checked in completed NOC 2012 merge. Ready for final SETTE testing. 
     902 
     903{{{ 
     904svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 13: Merge in trunk changes between revision 3452 and 3555. NOC merge complete subject to final SETTE testing." 
     905 
     906Sending        . 
     907Sending        NEMOGCM/CONFIG/cfg.txt 
     908Sending        NEMOGCM/NEMO/LIM_SRC_2/limdmp_2.F90 
     909Replacing      NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW6_VARGAS 
     910Replacing      NEMOGCM/SETTE/README 
     911Replacing      NEMOGCM/SETTE/fcm_job.sh 
     912Replacing      NEMOGCM/SETTE/input_AMM12.cfg 
     913Replacing      NEMOGCM/SETTE/input_AMM12_PISCES.cfg 
     914Replacing      NEMOGCM/SETTE/input_ORCA2_LIM.cfg 
     915Sending        NEMOGCM/SETTE/input_ORCA2_LIM_AGRIF.cfg 
     916Sending        NEMOGCM/SETTE/input_ORCA2_LIM_PISCES.cfg 
     917Replacing      NEMOGCM/SETTE/input_ORCA2_OFF_PISCES.cfg 
     918Deleting       NEMOGCM/SETTE/input_POMME.cfg 
     919Sending        NEMOGCM/SETTE/iodef_sette.xml 
     920Replacing      NEMOGCM/SETTE/prepare_job.sh 
     921Replacing      NEMOGCM/SETTE/sette.sh 
     922Deleting       NEMOGCM/SETTE/sette.sh.vargas 
     923Sending        NEMOGCM/SETTE/sette_beginner.sh 
     924Transmitting file data ...... 
     925Committed revision 3635. 
     926 
     927}}} 
     928 
     929