| 28 | |
| 29 | |
| 30 | |
| 31 | '''step2: add changes form dev_r2787_MERCATOR2_tidalharm''' |
| 32 | |
| 33 | |
| 34 | {{{ |
| 35 | svn 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': |
| 44 | U dev_MERCATOR_2011_MERGE/DOC/TexFiles/Chapters/Chap_DIA.tex |
| 45 | A dev_MERCATOR_2011_MERGE/DOC/TexFiles/Namelist/namdia_harm |
| 46 | U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml |
| 47 | U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist |
| 48 | U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 |
| 49 | A dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 |
| 50 | A dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/tide.h90 |
| 51 | A dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 |
| 52 | A dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/surdetermine.F90 |
| 53 | U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step.F90 |
| 54 | }}} |
| 55 | |
| 56 | |
| 57 | |
| 58 | |
| 59 | {{{ |
| 60 | svn ci -m "add changes from dev_r2787_MERCATOR2_tidalharm in dev_MERCATOR_2011_MERGE" |
| 61 | }}} |
| 62 | |
| 63 | |
| 64 | {{{ |
| 65 | Sending DOC/TexFiles/Chapters/Chap_DIA.tex |
| 66 | Adding DOC/TexFiles/Namelist/namdia_harm |
| 67 | Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml |
| 68 | Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist |
| 69 | Adding NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 |
| 70 | Adding NEMOGCM/NEMO/OPA_SRC/DIA/surdetermine.F90 |
| 71 | Adding NEMOGCM/NEMO/OPA_SRC/SBC/tide.h90 |
| 72 | Adding NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 |
| 73 | Sending NEMOGCM/NEMO/OPA_SRC/step.F90 |
| 74 | Sending NEMOGCM/NEMO/OPA_SRC/step_oce.F90 |
| 75 | Transmitting file data ..... |
| 76 | Committed revision 3046. |
| 77 | }}} |
| 78 | |
| 79 | step3 |
| 80 | |
| 81 | |
| 82 | |
| 83 | |
| 84 | |