78 | | |
| 78 | Step 2. Merge in changes from the UKMO branch: |
| 79 | |
| 80 | |
| 81 | {{{ |
| 82 | svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2191 \ |
| 83 | svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/devukmo2010 . |
| 84 | |
| 85 | --- Merging differences between repository URLs into '.': |
| 86 | U CONFIG/GYRE_LOBSTER/EXP00/namelist |
| 87 | U CONFIG/GYRE/EXP00/namelist |
| 88 | U CONFIG/ORCA2_OFF_PISCES/EXP00/namelist |
| 89 | U CONFIG/ORCA2_LIM/EXP00/1_namelist |
| 90 | U CONFIG/ORCA2_LIM/EXP00/namelist |
| 91 | U CONFIG/ORCA2_LIM_PISCES/EXP00/namelist |
| 92 | U CONFIG/POMME/EXP00/namelist |
| 93 | Conflict discovered in 'DOC/NEMO_book.pdf'. |
| 94 | Select: (p) postpone, (df) diff-full, (e) edit, |
| 95 | (h) help for more options: p |
| 96 | C DOC/NEMO_book.pdf |
| 97 | U DOC/TexFiles/Chapters/Chap_LDF.tex |
| 98 | U DOC/TexFiles/Chapters/Chap_SBC.tex |
| 99 | U DOC/TexFiles/Namelist/namsbc_rnf |
| 100 | U DOC/TexFiles/Namelist/nam_dynldf |
| 101 | U DOC/NEMO_book.tex |
| 102 | U NEMO/OFF_SRC/IOM/iom_ioipsl.F90 |
| 103 | U NEMO/OFF_SRC/IOM/iom_nf90.F90 |
| 104 | U NEMO/OPA_SRC/DOM/closea.F90 |
| 105 | U NEMO/OPA_SRC/DOM/daymod.F90 |
| 106 | A NEMO/OPA_SRC/jul2greg.h90 |
| 107 | A NEMO/OPA_SRC/ASM |
| 108 | A NEMO/OPA_SRC/ASM/asmpar.F90 |
| 109 | A NEMO/OPA_SRC/ASM/asminc.F90 |
| 110 | A NEMO/OPA_SRC/ASM/asmtrj.F90 |
| 111 | U NEMO/OPA_SRC/IOM/iom_ioipsl.F90 |
| 112 | U NEMO/OPA_SRC/IOM/iom.F90 |
| 113 | U NEMO/OPA_SRC/IOM/iom_nf90.F90 |
| 114 | U NEMO/OPA_SRC/DYN/dynnxt.F90 |
| 115 | U NEMO/OPA_SRC/DYN/divcur.F90 |
| 116 | U NEMO/OPA_SRC/DYN/sshwzv.F90 |
| 117 | U NEMO/OPA_SRC/DYN/dynspg_flt.F90 |
| 118 | U NEMO/OPA_SRC/DYN/dynspg_ts.F90 |
| 119 | U NEMO/OPA_SRC/DYN/dynldf_lap.F90 |
| 120 | U NEMO/OPA_SRC/DYN/dynldf.F90 |
| 121 | U NEMO/OPA_SRC/SOL/solmat.F90 |
| 122 | U NEMO/OPA_SRC/cla_div.F90 |
| 123 | U NEMO/OPA_SRC/OBC/obcdyn_bt.F90 |
| 124 | U NEMO/OPA_SRC/OBC/obcini.F90 |
| 125 | U NEMO/OPA_SRC/OBC/obcvol.F90 |
| 126 | U NEMO/OPA_SRC/OBC/obc_oce.F90 |
| 127 | U NEMO/OPA_SRC/OBC/obcrad.F90 |
| 128 | U NEMO/OPA_SRC/OBC/obcdta.F90 |
| 129 | U NEMO/OPA_SRC/OBC/obcrst.F90 |
| 130 | U NEMO/OPA_SRC/LDF/ldfdyn_oce.F90 |
| 131 | U NEMO/OPA_SRC/LDF/ldfdyn_c1d.h90 |
| 132 | U NEMO/OPA_SRC/LDF/ldfdyn_c2d.h90 |
| 133 | U NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90 |
| 134 | U NEMO/OPA_SRC/LDF/ldfdyn_substitute.h90 |
| 135 | U NEMO/OPA_SRC/LDF/ldfdyn.F90 |
| 136 | U NEMO/OPA_SRC/SBC/sbcana.F90 |
| 137 | U NEMO/OPA_SRC/SBC/sbc_oce.F90 |
| 138 | U NEMO/OPA_SRC/SBC/geo2ocean.F90 |
| 139 | U NEMO/OPA_SRC/SBC/sbcfwb.F90 |
| 140 | U NEMO/OPA_SRC/SBC/sbcmod.F90 |
| 141 | U NEMO/OPA_SRC/SBC/sbcrnf.F90 |
| 142 | U NEMO/OPA_SRC/BDY/bdy_oce.F90 |
| 143 | U NEMO/OPA_SRC/BDY/bdytra.F90 |
| 144 | U NEMO/OPA_SRC/BDY/bdydta.F90 |
| 145 | U NEMO/OPA_SRC/BDY/bdytides.F90 |
| 146 | U NEMO/OPA_SRC/BDY/bdydyn.F90 |
| 147 | U NEMO/OPA_SRC/BDY/bdyini.F90 |
| 148 | A NEMO/OPA_SRC/BDY/bdyice.F90 |
| 149 | U NEMO/OPA_SRC/BDY/bdyvol.F90 |
| 150 | U NEMO/OPA_SRC/BDY/bdy_par.F90 |
| 151 | A NEMO/OPA_SRC/julian.F90 |
| 152 | U NEMO/OPA_SRC/lib_mpp.F90 |
| 153 | U NEMO/OPA_SRC/cla_dynspg.F90 |
| 154 | A NEMO/OPA_SRC/greg2jul.h90 |
| 155 | A NEMO/OPA_SRC/OBS |
| 156 | A NEMO/OPA_SRC/OBS/obs_sla.F90 |
| 157 | A NEMO/OPA_SRC/OBS/obs_readmdt.F90 |
| 158 | A NEMO/OPA_SRC/OBS/obsvel_io.h90 |
| 159 | A NEMO/OPA_SRC/OBS/obs_read_vel.F90 |
| 160 | A NEMO/OPA_SRC/OBS/obsseaice_io.h90 |
| 161 | A NEMO/OPA_SRC/OBS/obs_grid.F90 |
| 162 | A NEMO/OPA_SRC/OBS/obs_sort.F90 |
| 163 | A NEMO/OPA_SRC/OBS/obs_mpp.F90 |
| 164 | A NEMO/OPA_SRC/OBS/obs_grid_search_bruteforce.h90 |
| 165 | A NEMO/OPA_SRC/OBS/obs_prof_io.F90 |
| 166 | A NEMO/OPA_SRC/OBS/obs_surf_def.F90 |
| 167 | A NEMO/OPA_SRC/OBS/obs_level_search.h90 |
| 168 | A NEMO/OPA_SRC/OBS/diaobs.F90 |
| 169 | A NEMO/OPA_SRC/OBS/obs_conv_functions.h90 |
| 170 | A NEMO/OPA_SRC/OBS/obsinter_z1d.h90 |
| 171 | A NEMO/OPA_SRC/OBS/obs_read_sst.F90 |
| 172 | A NEMO/OPA_SRC/OBS/ddatetoymdhms.h90 |
| 173 | A NEMO/OPA_SRC/OBS/obs_oper.F90 |
| 174 | A NEMO/OPA_SRC/OBS/obssla_types.h90 |
| 175 | A NEMO/OPA_SRC/OBS/maxdist.h90 |
| 176 | A NEMO/OPA_SRC/OBS/obs_read_altbias.F90 |
| 177 | A NEMO/OPA_SRC/OBS/obs_read_sla.F90 |
| 178 | A NEMO/OPA_SRC/OBS/obs_rot_vel.F90 |
| 179 | A NEMO/OPA_SRC/OBS/obs_seaice_io.F90 |
| 180 | A NEMO/OPA_SRC/OBS/str_c_to_for.h90 |
| 181 | A NEMO/OPA_SRC/OBS/obsinter_h2d.h90 |
| 182 | A NEMO/OPA_SRC/OBS/obs_profiles.F90 |
| 183 | A NEMO/OPA_SRC/OBS/obs_read_seaice.F90 |
| 184 | A NEMO/OPA_SRC/OBS/obs_const.F90 |
| 185 | A NEMO/OPA_SRC/OBS/mpp_map.F90 |
| 186 | A NEMO/OPA_SRC/OBS/grt_cir_dis.h90 |
| 187 | A NEMO/OPA_SRC/OBS/obs_seaice.F90 |
| 188 | A NEMO/OPA_SRC/OBS/obs_write.F90 |
| 189 | A NEMO/OPA_SRC/OBS/linquad.h90 |
| 190 | A NEMO/OPA_SRC/OBS/obs_inter_z1d.F90 |
| 191 | A NEMO/OPA_SRC/OBS/obs_sst_io.F90 |
| 192 | A NEMO/OPA_SRC/OBS/obs_utils.F90 |
| 193 | A NEMO/OPA_SRC/OBS/obsprof_io.h90 |
| 194 | A NEMO/OPA_SRC/OBS/obs_read_prof.F90 |
| 195 | A NEMO/OPA_SRC/OBS/obs_profiles_def.F90 |
| 196 | A NEMO/OPA_SRC/OBS/obs_sla_types.F90 |
| 197 | A NEMO/OPA_SRC/OBS/obssst_io.h90 |
| 198 | A NEMO/OPA_SRC/OBS/obs_fbm.F90 |
| 199 | A NEMO/OPA_SRC/OBS/obs_types.F90 |
| 200 | A NEMO/OPA_SRC/OBS/find_obs_proc.h90 |
| 201 | A NEMO/OPA_SRC/OBS/obs_conv.F90 |
| 202 | A NEMO/OPA_SRC/OBS/obs_prep.F90 |
| 203 | A NEMO/OPA_SRC/OBS/obs_sla_io.F90 |
| 204 | A NEMO/OPA_SRC/OBS/obs_inter_sup.F90 |
| 205 | A NEMO/OPA_SRC/OBS/obs_sst.F90 |
| 206 | A NEMO/OPA_SRC/OBS/obssla_io.h90 |
| 207 | A NEMO/OPA_SRC/OBS/grt_cir_dis_saa.h90 |
| 208 | A NEMO/OPA_SRC/OBS/obs_vel_io.F90 |
| 209 | A NEMO/OPA_SRC/OBS/obs_inter_h2d.F90 |
| 210 | U NEMO/OPA_SRC/ZDF/zdftke.F90 |
| 211 | U NEMO/OPA_SRC/ZDF/zdfkpp.F90 |
| 212 | U NEMO/OPA_SRC/TRA/tradmp.F90 |
| 213 | U NEMO/OPA_SRC/TRA/trasbc.F90 |
| 214 | U NEMO/OPA_SRC/cla.F90 |
| 215 | U NEMO/OPA_SRC/DIA/diafwb.F90 |
| 216 | U NEMO/OPA_SRC/DIA/diawri.F90 |
| 217 | U NEMO/OPA_SRC/DIA/diawri_dimg.h90 |
| 218 | U NEMO/OPA_SRC/step.F90 |
| 219 | U NEMO/OPA_SRC/opa.F90 |
| 220 | }}} |
| 221 | |
| 222 | |