| 11 | |
| 12 | '''Step2'''. Merge in changes from the dev_UKM0_2011 branch. revert unwanted changes to NEMO_book.pdf and arch files. Commit changes |
| 13 | |
| 14 | |
| 15 | {{{ |
| 16 | svn ci -m"Branch dev_NOC_UKMO_MERGE #890. Step 2. Merge in changes from the dev_UKM0_2011 branch with unwanted changes reverted" |
| 17 | Password: |
| 18 | Sending DOC/TexFiles/Biblio/Biblio.bib |
| 19 | Sending DOC/TexFiles/Chapters/Chap_ASM.tex |
| 20 | Sending DOC/TexFiles/Chapters/Chap_OBS.tex |
| 21 | Sending DOC/TexFiles/Chapters/Chap_SBC.tex |
| 22 | Sending DOC/TexFiles/Chapters/Introduction.tex |
| 23 | Adding (bin) DOC/TexFiles/Figures/Fig_OBS_dataplot_main.pdf |
| 24 | Adding (bin) DOC/TexFiles/Figures/Fig_OBS_dataplot_prof.pdf |
| 25 | Sending DOC/TexFiles/Figures/logo_UKMO.pdf |
| 26 | Sending DOC/TexFiles/Namelist/namobs_example |
| 27 | Sending DOC/TexFiles/Namelist/namsbc_cpl |
| 28 | Deleting DOC/TexFiles/Namelist/namsbc_cpl_co2 |
| 29 | Adding NEMOGCM/ARCH/arch-PW6_METO.fcm |
| 30 | Adding NEMOGCM/ARCH/arch-ifort_linux_omp.fcm |
| 31 | Adding NEMOGCM/ARCH/arch-mpxlf_aix.fcm |
| 32 | Replacing NEMOGCM/ARCH/arch-xlf_aix.fcm |
| 33 | Adding NEMOGCM/ARCH/arch-xlf_pwr6.fcm |
| 34 | Adding NEMOGCM/CONFIG/AMM |
| 35 | Adding NEMOGCM/CONFIG/AMM-PISCES |
| 36 | Sending NEMOGCM/CONFIG/GYRE/EXP00/namelist |
| 37 | Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist |
| 38 | Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist |
| 39 | Sending NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist |
| 40 | Sending NEMOGCM/CONFIG/POMME/EXP00/namelist |
| 41 | Sending NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 |
| 42 | Sending NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90 |
| 43 | Replacing NEMOGCM/NEMO/OPA_SRC/BDY |
| 44 | Sending NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 |
| 45 | Sending NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90 |
| 46 | Sending NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 |
| 47 | Sending NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 |
| 48 | Sending NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 |
| 49 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90 |
| 50 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 |
| 51 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 |
| 52 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90 |
| 53 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 |
| 54 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_oce.F90 |
| 55 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 |
| 56 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 |
| 57 | Sending NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90 |
| 58 | Sending NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 |
| 59 | Sending NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 |
| 60 | Sending NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 |
| 61 | Replacing NEMOGCM/NEMO/OPA_SRC/OBC/obc_vectopt_loop_substitute.h90 |
| 62 | Replacing NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn.F90 |
| 63 | Replacing NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn_bt.F90 |
| 64 | Replacing NEMOGCM/NEMO/OPA_SRC/OBC/obcfla.F90 |
| 65 | Replacing NEMOGCM/NEMO/OPA_SRC/OBC/obcrst.F90 |
| 66 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 |
| 67 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 |
| 68 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 |
| 69 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 |
| 70 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 |
| 71 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 |
| 72 | Adding NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 |
| 73 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90 |
| 74 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 |
| 75 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 |
| 76 | Sending NEMOGCM/NEMO/OPA_SRC/SOL/solver.F90 |
| 77 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 |
| 78 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90 |
| 79 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90 |
| 80 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90 |
| 81 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90 |
| 82 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 |
| 83 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90 |
| 84 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 |
| 85 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90 |
| 86 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 |
| 87 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilap.F90 |
| 88 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilapg.F90 |
| 89 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90 |
| 90 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 |
| 91 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 |
| 92 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 |
| 93 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90 |
| 94 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90 |
| 95 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90 |
| 96 | Sending NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 |
| 97 | Sending NEMOGCM/NEMO/OPA_SRC/oce.F90 |
| 98 | Adding NEMOGCM/NEMO/OPA_SRC/par_AMM_12km.h90 |
| 99 | Sending NEMOGCM/NEMO/OPA_SRC/par_oce.F90 |
| 100 | Sending NEMOGCM/NEMO/OPA_SRC/step.F90 |
| 101 | Sending NEMOGCM/NEMO/OPA_SRC/step_oce.F90 |
| 102 | Sending NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90 |
| 103 | Sending NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 |
| 104 | Sending NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 |
| 105 | Sending NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcbio.F90 |
| 106 | Sending NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcexp.F90 |
| 107 | Sending NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcopt.F90 |
| 108 | Sending NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsed.F90 |
| 109 | Sending NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsed.F90 |
| 110 | Sending NEMOGCM/NEMO/TOP_SRC/PISCES/trcrst_pisces.F90 |
| 111 | Sending NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90 |
| 112 | Sending NEMOGCM/NEMO/TOP_SRC/SED/sedini.F90 |
| 113 | Sending NEMOGCM/NEMO/TOP_SRC/SED/sedmodel.F90 |
| 114 | Sending NEMOGCM/NEMO/TOP_SRC/SED/sedwri.F90 |
| 115 | Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 |
| 116 | Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90 |
| 117 | Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90 |
| 118 | Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 |
| 119 | Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90 |
| 120 | Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90 |
| 121 | Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 |
| 122 | Sending NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90 |
| 123 | Sending NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90 |
| 124 | Sending NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc.F90 |
| 125 | Sending NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 |
| 126 | Sending NEMOGCM/NEMO/TOP_SRC/trc.F90 |
| 127 | Sending NEMOGCM/NEMO/TOP_SRC/trcdia.F90 |
| 128 | Sending NEMOGCM/NEMO/TOP_SRC/trcdta.F90 |
| 129 | Sending NEMOGCM/NEMO/TOP_SRC/trcini.F90 |
| 130 | Sending NEMOGCM/NEMO/TOP_SRC/trcnam.F90 |
| 131 | Sending NEMOGCM/NEMO/TOP_SRC/trcrst.F90 |
| 132 | Sending NEMOGCM/NEMO/TOP_SRC/trcstp.F90 |
| 133 | Adding NEMOGCM/NEMO/TOP_SRC/trcsub.F90 |
| 134 | Sending NEMOGCM/NEMO/TOP_SRC/trcwri.F90 |
| 135 | Sending NEMOGCM/TOOLS/COMPILE/cfg.txt |
| 136 | Adding NEMOGCM/TOOLS/OBSTOOLS |
| 137 | Adding NEMOGCM/TOOLS/REBUILD_NEMO |
| 138 | Transmitting file data ................................................................................................... |
| 139 | Committed revision 3094. |
| 140 | }}} |
| 141 | |
| 142 | '''Step 3'''. Undo some changes necessary to fully reinstate OBC and fix a bug in obcdta.F90 |
| 143 | |
| 144 | |
| 145 | {{{ |
| 146 | svn ci -m"Branch dev_NOC_UKMO_MERGE #890. Undid some changes to fully reinstate OBC code" |
| 147 | |
| 148 | Sending NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90 |
| 149 | Sending NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 |
| 150 | Sending NEMOGCM/NEMO/OPA_SRC/OBC/obcdta.F90 |
| 151 | Transmitting file data ... |
| 152 | Committed revision 3096. |
| 153 | }}} |
| 154 | |