Changes between Version 2 and Version 3 of ticket/1006_dev_NOC_2012_rev3555

Timestamp:

2012-11-21T14:22:49+01:00 (12 years ago)

Author:

acc

Comment:

--

ticket/1006_dev_NOC_2012_rev3555

@@ -435 +435 @@
 }}}
 
-
-
+'''Stage 7'''. Merge in changes from the dev_r3385_NOCS04_HAMF branch and resolve conflicts.
+
+{{{
+svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3385 \
+          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3385_NOCS04_HAMF \
+          ./
+
+--- Merging r3386 through r3624 into '.':
+U    DOC/TexFiles/Chapters/Introduction.tex
+U    DOC/TexFiles/Chapters/Chap_SBC.tex
+U    NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist
+U    NEMOGCM/CONFIG/GYRE/EXP00/namelist
+U    NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
+U    NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml
+U    NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
+U    NEMOGCM/CONFIG/AMM12/EXP00/namelist
+U    NEMOGCM/NEMO/OFF_SRC/dtadyn.F90
+U    NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90
+U    NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90
+U    NEMOGCM/NEMO/OPA_SRC/ASM/asmtrj.F90
+U    NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
+U    NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90
+U    NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90
+U    NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90
+U    NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_exp.F90
+U    NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
+U    NEMOGCM/NEMO/OPA_SRC/oce.F90
+U    NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/albedo.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcana.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90
+Conflict discovered in 'NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90'.
+Select: (p) postpone, (df) diff-full, (e) edit,
+        (mc) mine-conflict, (tc) theirs-conflict,
+        (s) show all options: p
+C    NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_mfs.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_clio.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90
+U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90
+U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90
+U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90
+U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90
+U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90
+U    NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90
+U    NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
+U    NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90
+U    NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90
+U    NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90
+U    NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90
+U    NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90
+U    NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90
+U    NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90
+U    NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90
+U    NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90
+U    NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90
+U    NEMOGCM/NEMO/LIM_SRC_2/limwri_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/limhdf_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/limwri_dimg_2.h90
+U    NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/limadv_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/limdmp_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/limrhg_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/limmsh_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/limdyn_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/limdia_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/thd_ice_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/ice_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/limthd_lac_2.F90
+U    NEMOGCM/NEMO/TOP_SRC/trc.F90
+U    NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90
+U    NEMOGCM/NEMO/TOP_SRC/PISCES/p4zrem.F90
+U    NEMOGCM/NEMO/TOP_SRC/trcsub.F90
+U    NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90
+U    NEMOGCM/NEMO/TOP_SRC/oce_trc.F90
+U    NEMOGCM/NEMO/TOP_SRC/SED/sedchem.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limupdate.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limthd_ent.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limmsh.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limvar.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limistate.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/thd_ice.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/dom_ice.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limdia.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/ice.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/iceini.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limhdf.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limwri.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limcons.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limwri_dimg.h90
+U    NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limtab.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limrst.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limadv.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90
+U    NEMOGCM/NEMO/LIM_SRC_3/limthd.F90
+Summary of conflicts:
+  Text conflicts: 1
+}}}
+
+Resolved simple conflict in sbc_oce.F90 and checked in merged code prior to SETTE testing
+
+{{{
+svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 7. Check in code now merged with dev_r3385_NOCS04_HAMF"
+
+Sending        .
+Sending        DOC/TexFiles/Chapters/Chap_SBC.tex
+Sending        DOC/TexFiles/Chapters/Introduction.tex
+Sending        NEMOGCM/CONFIG/AMM12/EXP00/namelist
+Sending        NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist
+Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist
+Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml
+Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
+Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
+Sending        NEMOGCM/NEMO/LIM_SRC_2/ice_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limadv_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limdia_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limdmp_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limdyn_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limhdf_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limmsh_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limrhg_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limthd_lac_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limwri_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/limwri_dimg_2.h90
+Sending        NEMOGCM/NEMO/LIM_SRC_2/thd_ice_2.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/dom_ice.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/ice.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/iceini.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limadv.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limcons.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limdia.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limhdf.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limistate.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limmsh.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limrst.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limtab.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limthd.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limthd_ent.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limupdate.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limvar.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limwri.F90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/limwri_dimg.h90
+Sending        NEMOGCM/NEMO/LIM_SRC_3/thd_ice.F90
+Sending        NEMOGCM/NEMO/OFF_SRC/dtadyn.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ASM/asmtrj.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90
+Sending        NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_exp.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/albedo.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcana.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_clio.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_mfs.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/oce.F90
+Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zrem.F90
+Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90
+Sending        NEMOGCM/NEMO/TOP_SRC/SED/sedchem.F90
+Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90
+Sending        NEMOGCM/NEMO/TOP_SRC/oce_trc.F90
+Sending        NEMOGCM/NEMO/TOP_SRC/trc.F90
+Sending        NEMOGCM/NEMO/TOP_SRC/trcsub.F90
+Transmitting file data ..........................................................................................................
+Committed revision 3625.
+}}}
+
+