| 793 | |
| 794 | '''Step 10'''. Merge in all changes on the 2012/dev_r3452_NOCL06_LOGLAYER branch. Check-in if no conflicts arise: |
| 795 | |
| 796 | {{{ |
| 797 | svn 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 '.': |
| 802 | U NEMOGCM/CONFIG/AMM12/EXP00/namelist |
| 803 | U NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 |
| 804 | }}} |
| 805 | |
| 806 | No 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 | {{{ |
| 809 | svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 10: merge in changes from the 2012/dev_r3452_NOCL06_LOGLAYER branch" |
| 810 | |
| 811 | Sending . |
| 812 | Sending NEMOGCM/CONFIG/AMM12/EXP00/namelist |
| 813 | Sending NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 |
| 814 | Transmitting file data .. |
| 815 | Committed 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 | {{{ |
| 821 | svn 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 '.': |
| 826 | U NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilap.F90 |
| 827 | U NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90 |
| 828 | U NEMOGCM/NEMO/OPA_SRC/step_oce.F90 |
| 829 | A NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_smag.F90 |
| 830 | A NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_smag.F90 |
| 831 | U NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90 |
| 832 | U NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_oce.F90 |
| 833 | U NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_c3d.h90 |
| 834 | U NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 |
| 835 | U NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 |
| 836 | U NEMOGCM/NEMO/OPA_SRC/step.F90 |
| 837 | |
| 838 | svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 11: merge in changes from the 2012/dev_r3452_NOCL02_Smagorinsky branch" |
| 839 | |
| 840 | Sending . |
| 841 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilap.F90 |
| 842 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90 |
| 843 | Sending NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 |
| 844 | Sending NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_oce.F90 |
| 845 | Adding NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_smag.F90 |
| 846 | Sending NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 |
| 847 | Sending NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_c3d.h90 |
| 848 | Sending NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90 |
| 849 | Adding NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_smag.F90 |
| 850 | Sending NEMOGCM/NEMO/OPA_SRC/step.F90 |
| 851 | Sending NEMOGCM/NEMO/OPA_SRC/step_oce.F90 |
| 852 | Transmitting file data ......... |
| 853 | Committed revision 3634. |
| 854 | |
| 855 | }}} |
| 856 | |
| 857 | '''Note documentation is absent!''' |
| 858 | |
| 859 | Step 13. Finally Merge in all trunk changes from 3452 to 3555. Check-in if no conflicts arise. |
| 860 | |
| 861 | {{{ |
| 862 | |
| 863 | svn 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 '.': |
| 868 | R NEMOGCM/SETTE/input_ORCA2_OFF_PISCES.cfg |
| 869 | R NEMOGCM/SETTE/input_ORCA2_LIM.cfg |
| 870 | Conflict discovered in 'NEMOGCM/SETTE/iodef_sette.xml'. |
| 871 | Select: (p) postpone, (df) diff-full, (e) edit, |
| 872 | (mc) mine-conflict, (tc) theirs-conflict, |
| 873 | (s) show all options: p |
| 874 | C NEMOGCM/SETTE/iodef_sette.xml |
| 875 | R NEMOGCM/SETTE/input_AMM12.cfg |
| 876 | U NEMOGCM/SETTE/input_ORCA2_LIM_PISCES.cfg |
| 877 | U NEMOGCM/SETTE/input_ORCA2_LIM_AGRIF.cfg |
| 878 | R NEMOGCM/SETTE/sette.sh |
| 879 | R NEMOGCM/SETTE/README |
| 880 | R NEMOGCM/SETTE/input_AMM12_PISCES.cfg |
| 881 | R NEMOGCM/SETTE/prepare_job.sh |
| 882 | U NEMOGCM/SETTE/sette_beginner.sh |
| 883 | R NEMOGCM/SETTE/fcm_job.sh |
| 884 | R NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW6_VARGAS |
| 885 | D NEMOGCM/SETTE/input_POMME.cfg |
| 886 | D NEMOGCM/SETTE/sette.sh.vargas |
| 887 | Conflict discovered in 'NEMOGCM/CONFIG/cfg.txt'. |
| 888 | Select: (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': |
| 892 | C NEMOGCM/CONFIG/cfg.txt |
| 893 | --- Merging r3453 through r3555 into '.': |
| 894 | U NEMOGCM/NEMO/LIM_SRC_2/limdmp_2.F90 |
| 895 | U NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 |
| 896 | Summary of conflicts: |
| 897 | Text conflicts: 2 |
| 898 | |
| 899 | }}} |
| 900 | |
| 901 | Resolved simple conflicts in iodef_sette.xml and config.txt. Checked in completed NOC 2012 merge. Ready for final SETTE testing. |
| 902 | |
| 903 | {{{ |
| 904 | svn 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 | |
| 906 | Sending . |
| 907 | Sending NEMOGCM/CONFIG/cfg.txt |
| 908 | Sending NEMOGCM/NEMO/LIM_SRC_2/limdmp_2.F90 |
| 909 | Replacing NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW6_VARGAS |
| 910 | Replacing NEMOGCM/SETTE/README |
| 911 | Replacing NEMOGCM/SETTE/fcm_job.sh |
| 912 | Replacing NEMOGCM/SETTE/input_AMM12.cfg |
| 913 | Replacing NEMOGCM/SETTE/input_AMM12_PISCES.cfg |
| 914 | Replacing NEMOGCM/SETTE/input_ORCA2_LIM.cfg |
| 915 | Sending NEMOGCM/SETTE/input_ORCA2_LIM_AGRIF.cfg |
| 916 | Sending NEMOGCM/SETTE/input_ORCA2_LIM_PISCES.cfg |
| 917 | Replacing NEMOGCM/SETTE/input_ORCA2_OFF_PISCES.cfg |
| 918 | Deleting NEMOGCM/SETTE/input_POMME.cfg |
| 919 | Sending NEMOGCM/SETTE/iodef_sette.xml |
| 920 | Replacing NEMOGCM/SETTE/prepare_job.sh |
| 921 | Replacing NEMOGCM/SETTE/sette.sh |
| 922 | Deleting NEMOGCM/SETTE/sette.sh.vargas |
| 923 | Sending NEMOGCM/SETTE/sette_beginner.sh |
| 924 | Transmitting file data ...... |
| 925 | Committed revision 3635. |
| 926 | |
| 927 | }}} |
| 928 | |
| 929 | |