| 155 | '''Step 4'''. Merge in changes from the NOCS merge |
| 156 | |
| 157 | |
| 158 | {{{ |
| 159 | svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2855 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_NOC_2011_MERGE dev_NOC_UKMO_MERGE |
| 160 | |
| 161 | --- Merging differences between repository URLs into 'dev_NOC_UKMO_MERGE': |
| 162 | U dev_NOC_UKMO_MERGE/DOC/TexFiles/Biblio/Biblio.bib |
| 163 | U dev_NOC_UKMO_MERGE/DOC/TexFiles/Chapters/Chap_DYN.tex |
| 164 | U dev_NOC_UKMO_MERGE/DOC/TexFiles/Chapters/Chap_MISC.tex |
| 165 | U dev_NOC_UKMO_MERGE/DOC/TexFiles/Chapters/Chap_ZDF.tex |
| 166 | U dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/namdyn_hpg |
| 167 | U dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/nambfr |
| 168 | U dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/namtra_ldf |
| 169 | A dev_NOC_UKMO_MERGE/DOC/TexFiles/Namelist/namdyn_nept |
| 170 | U dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist |
| 171 | U dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist |
| 172 | U dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist |
| 173 | U dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist |
| 174 | U dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist |
| 175 | U dev_NOC_UKMO_MERGE/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm |
| 176 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OFF_SRC/domrea.F90 |
| 177 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 |
| 178 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 |
| 179 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 |
| 180 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 |
| 181 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 |
| 182 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 |
| 183 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 |
| 184 | Conflict discovered in '/Users/omfman/NEMO/SRC_PARIS/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90'. |
| 185 | Select: (p) postpone, (df) diff-full, (e) edit, |
| 186 | (mc) mine-conflict, (tc) theirs-conflict, |
| 187 | (s) show all options: p |
| 188 | C dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 |
| 189 | A dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 |
| 190 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 |
| 191 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90 |
| 192 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 |
| 193 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90 |
| 194 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 |
| 195 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 |
| 196 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 |
| 197 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 |
| 198 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 |
| 199 | Conflict discovered in '/Users/omfman/NEMO/SRC_PARIS/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90'. |
| 200 | Select: (p) postpone, (df) diff-full, (e) edit, |
| 201 | (mc) mine-conflict, (tc) theirs-conflict, |
| 202 | (s) show all options: p |
| 203 | C dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 |
| 204 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 |
| 205 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/step.F90 |
| 206 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90 |
| 207 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 |
| 208 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90 |
| 209 | Conflict discovered in '/Users/omfman/NEMO/SRC_PARIS/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90'. |
| 210 | REAL(wp), DIMENSION(jpi,jpj,jpk,kjpt), INTENT(inout) :: pta ! tracer trend |
| 211 | Select: (p) postpone, (df) diff-full, (e) edit, |
| 212 | (mc) mine-conflict, (tc) theirs-conflict, |
| 213 | (s) show all options: p |
| 214 | C dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 |
| 215 | Conflict discovered in '/Users/omfman/NEMO/SRC_PARIS/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90'. |
| 216 | Select: (p) postpone, (df) diff-full, (e) edit, |
| 217 | (mc) mine-conflict, (tc) theirs-conflict, |
| 218 | (s) show all options: p |
| 219 | C dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 |
| 220 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 |
| 221 | U dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 |
| 222 | }}} |
| 223 | |
| 224 | '''Step 5'''. resolve conflicts (most arising from the tracer sub-timestepping) and commit |
| 225 | |
| 226 | |
| 227 | {{{ |
| 228 | svn ci -m"Branch dev_NOC_UKMO_MERGE #890. Resolved conflicts (most arising from the tracer sub-timestepping)"Password: |
| 229 | Sending DOC/TexFiles/Biblio/Biblio.bib |
| 230 | zdpdy2 = zcoef0 / e2v(ji,jj) * & |
| 231 | Sending DOC/TexFiles/Chapters/Chap_DYN.tex |
| 232 | Sending DOC/TexFiles/Chapters/Chap_MISC.tex |
| 233 | Sending DOC/TexFiles/Chapters/Chap_ZDF.tex |
| 234 | Sending DOC/TexFiles/Namelist/nambfr |
| 235 | Sending DOC/TexFiles/Namelist/namdyn_hpg |
| 236 | Adding DOC/TexFiles/Namelist/namdyn_nept |
| 237 | Sending DOC/TexFiles/Namelist/namtra_ldf |
| 238 | Sending NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm |
| 239 | Sending NEMOGCM/CONFIG/GYRE/EXP00/namelist |
| 240 | Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist |
| 241 | Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist |
| 242 | Sending NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist |
| 243 | Sending NEMOGCM/CONFIG/POMME/EXP00/namelist |
| 244 | Sending NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 |
| 245 | Sending NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 |
| 246 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 |
| 247 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 |
| 248 | Adding NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 |
| 249 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 |
| 250 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 |
| 251 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 |
| 252 | Sending NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90 |
| 253 | Sending NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 |
| 254 | Sending NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 |
| 255 | Sending NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 |
| 256 | Sending NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90 |
| 257 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 |
| 258 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 |
| 259 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 |
| 260 | Sending NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 |
| 261 | Sending NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 |
| 262 | Sending NEMOGCM/NEMO/OPA_SRC/step.F90 |
| 263 | Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 |
| 264 | Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 |
| 265 | Transmitting file data ................................. |
| 266 | Committed revision 3101. |
| 267 | |
| 268 | svn ci -m"Branch dev_NOC_UKMO_MERGE #890. Corrected minor typo in dynhpg.F90"Password: |
| 269 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 |
| 270 | Transmitting file data . |
| 271 | Committed revision 3102. |
| 272 | }}} |
| 273 | |