437 | | |
438 | | |
| 437 | '''Stage 7'''. Merge in changes from the dev_r3385_NOCS04_HAMF branch and resolve conflicts. |
| 438 | |
| 439 | {{{ |
| 440 | svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3385 \ |
| 441 | svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3385_NOCS04_HAMF \ |
| 442 | ./ |
| 443 | |
| 444 | --- Merging r3386 through r3624 into '.': |
| 445 | U DOC/TexFiles/Chapters/Introduction.tex |
| 446 | U DOC/TexFiles/Chapters/Chap_SBC.tex |
| 447 | U NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist |
| 448 | U NEMOGCM/CONFIG/GYRE/EXP00/namelist |
| 449 | U NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist |
| 450 | U NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml |
| 451 | U NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist |
| 452 | U NEMOGCM/CONFIG/AMM12/EXP00/namelist |
| 453 | U NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 |
| 454 | U NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90 |
| 455 | U NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 |
| 456 | U NEMOGCM/NEMO/OPA_SRC/ASM/asmtrj.F90 |
| 457 | U NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 |
| 458 | U NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 |
| 459 | U NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 |
| 460 | U NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 |
| 461 | U NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_exp.F90 |
| 462 | U NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 |
| 463 | U NEMOGCM/NEMO/OPA_SRC/oce.F90 |
| 464 | U NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 |
| 465 | U NEMOGCM/NEMO/OPA_SRC/SBC/albedo.F90 |
| 466 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 |
| 467 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbcana.F90 |
| 468 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 |
| 469 | Conflict discovered in 'NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90'. |
| 470 | Select: (p) postpone, (df) diff-full, (e) edit, |
| 471 | (mc) mine-conflict, (tc) theirs-conflict, |
| 472 | (s) show all options: p |
| 473 | C NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 |
| 474 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90 |
| 475 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_mfs.F90 |
| 476 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 |
| 477 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_clio.F90 |
| 478 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90 |
| 479 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90 |
| 480 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 |
| 481 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 |
| 482 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 |
| 483 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 |
| 484 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 |
| 485 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 |
| 486 | U NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 |
| 487 | U NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 |
| 488 | U NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90 |
| 489 | U NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90 |
| 490 | U NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 |
| 491 | U NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90 |
| 492 | U NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 |
| 493 | U NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 |
| 494 | U NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90 |
| 495 | U NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90 |
| 496 | U NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90 |
| 497 | U NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 |
| 498 | U NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 |
| 499 | U NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 |
| 500 | U NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 |
| 501 | U NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 |
| 502 | U NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90 |
| 503 | U NEMOGCM/NEMO/LIM_SRC_2/limwri_2.F90 |
| 504 | U NEMOGCM/NEMO/LIM_SRC_2/limhdf_2.F90 |
| 505 | U NEMOGCM/NEMO/LIM_SRC_2/limwri_dimg_2.h90 |
| 506 | U NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 |
| 507 | U NEMOGCM/NEMO/LIM_SRC_2/limadv_2.F90 |
| 508 | U NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90 |
| 509 | U NEMOGCM/NEMO/LIM_SRC_2/limdmp_2.F90 |
| 510 | U NEMOGCM/NEMO/LIM_SRC_2/limrhg_2.F90 |
| 511 | U NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90 |
| 512 | U NEMOGCM/NEMO/LIM_SRC_2/limmsh_2.F90 |
| 513 | U NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90 |
| 514 | U NEMOGCM/NEMO/LIM_SRC_2/limdyn_2.F90 |
| 515 | U NEMOGCM/NEMO/LIM_SRC_2/limdia_2.F90 |
| 516 | U NEMOGCM/NEMO/LIM_SRC_2/thd_ice_2.F90 |
| 517 | U NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 |
| 518 | U NEMOGCM/NEMO/LIM_SRC_2/ice_2.F90 |
| 519 | U NEMOGCM/NEMO/LIM_SRC_2/limthd_lac_2.F90 |
| 520 | U NEMOGCM/NEMO/TOP_SRC/trc.F90 |
| 521 | U NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90 |
| 522 | U NEMOGCM/NEMO/TOP_SRC/PISCES/p4zrem.F90 |
| 523 | U NEMOGCM/NEMO/TOP_SRC/trcsub.F90 |
| 524 | U NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 |
| 525 | U NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 |
| 526 | U NEMOGCM/NEMO/TOP_SRC/SED/sedchem.F90 |
| 527 | U NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90 |
| 528 | U NEMOGCM/NEMO/LIM_SRC_3/limupdate.F90 |
| 529 | U NEMOGCM/NEMO/LIM_SRC_3/limthd_ent.F90 |
| 530 | U NEMOGCM/NEMO/LIM_SRC_3/limmsh.F90 |
| 531 | U NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 |
| 532 | U NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 |
| 533 | U NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90 |
| 534 | U NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90 |
| 535 | U NEMOGCM/NEMO/LIM_SRC_3/thd_ice.F90 |
| 536 | U NEMOGCM/NEMO/LIM_SRC_3/dom_ice.F90 |
| 537 | U NEMOGCM/NEMO/LIM_SRC_3/limdia.F90 |
| 538 | U NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90 |
| 539 | U NEMOGCM/NEMO/LIM_SRC_3/ice.F90 |
| 540 | U NEMOGCM/NEMO/LIM_SRC_3/iceini.F90 |
| 541 | U NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90 |
| 542 | U NEMOGCM/NEMO/LIM_SRC_3/limhdf.F90 |
| 543 | U NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90 |
| 544 | U NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 |
| 545 | U NEMOGCM/NEMO/LIM_SRC_3/limcons.F90 |
| 546 | U NEMOGCM/NEMO/LIM_SRC_3/limwri_dimg.h90 |
| 547 | U NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 |
| 548 | U NEMOGCM/NEMO/LIM_SRC_3/limtab.F90 |
| 549 | U NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 |
| 550 | U NEMOGCM/NEMO/LIM_SRC_3/limrst.F90 |
| 551 | U NEMOGCM/NEMO/LIM_SRC_3/limadv.F90 |
| 552 | U NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90 |
| 553 | U NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90 |
| 554 | U NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 |
| 555 | Summary of conflicts: |
| 556 | Text conflicts: 1 |
| 557 | }}} |
| 558 | |
| 559 | Resolved simple conflict in sbc_oce.F90 and checked in merged code prior to SETTE testing |
| 560 | |
| 561 | {{{ |
| 562 | svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 7. Check in code now merged with dev_r3385_NOCS04_HAMF" |
| 563 | |
| 564 | Sending . |
| 565 | Sending DOC/TexFiles/Chapters/Chap_SBC.tex |
| 566 | Sending DOC/TexFiles/Chapters/Introduction.tex |
| 567 | Sending NEMOGCM/CONFIG/AMM12/EXP00/namelist |
| 568 | Sending NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist |
| 569 | Sending NEMOGCM/CONFIG/GYRE/EXP00/namelist |
| 570 | Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml |
| 571 | Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist |
| 572 | Sending NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist |
| 573 | Sending NEMOGCM/NEMO/LIM_SRC_2/ice_2.F90 |
| 574 | Sending NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 |
| 575 | Sending NEMOGCM/NEMO/LIM_SRC_2/limadv_2.F90 |
| 576 | Sending NEMOGCM/NEMO/LIM_SRC_2/limdia_2.F90 |
| 577 | Sending NEMOGCM/NEMO/LIM_SRC_2/limdmp_2.F90 |
| 578 | Sending NEMOGCM/NEMO/LIM_SRC_2/limdyn_2.F90 |
| 579 | Sending NEMOGCM/NEMO/LIM_SRC_2/limhdf_2.F90 |
| 580 | Sending NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90 |
| 581 | Sending NEMOGCM/NEMO/LIM_SRC_2/limmsh_2.F90 |
| 582 | Sending NEMOGCM/NEMO/LIM_SRC_2/limrhg_2.F90 |
| 583 | Sending NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 |
| 584 | Sending NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90 |
| 585 | Sending NEMOGCM/NEMO/LIM_SRC_2/limthd_lac_2.F90 |
| 586 | Sending NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90 |
| 587 | Sending NEMOGCM/NEMO/LIM_SRC_2/limwri_2.F90 |
| 588 | Sending NEMOGCM/NEMO/LIM_SRC_2/limwri_dimg_2.h90 |
| 589 | Sending NEMOGCM/NEMO/LIM_SRC_2/thd_ice_2.F90 |
| 590 | Sending NEMOGCM/NEMO/LIM_SRC_3/dom_ice.F90 |
| 591 | Sending NEMOGCM/NEMO/LIM_SRC_3/ice.F90 |
| 592 | Sending NEMOGCM/NEMO/LIM_SRC_3/iceini.F90 |
| 593 | Sending NEMOGCM/NEMO/LIM_SRC_3/limadv.F90 |
| 594 | Sending NEMOGCM/NEMO/LIM_SRC_3/limcons.F90 |
| 595 | Sending NEMOGCM/NEMO/LIM_SRC_3/limdia.F90 |
| 596 | Sending NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90 |
| 597 | Sending NEMOGCM/NEMO/LIM_SRC_3/limhdf.F90 |
| 598 | Sending NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 |
| 599 | Sending NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90 |
| 600 | Sending NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90 |
| 601 | Sending NEMOGCM/NEMO/LIM_SRC_3/limmsh.F90 |
| 602 | Sending NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90 |
| 603 | Sending NEMOGCM/NEMO/LIM_SRC_3/limrst.F90 |
| 604 | Sending NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 |
| 605 | Sending NEMOGCM/NEMO/LIM_SRC_3/limtab.F90 |
| 606 | Sending NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 |
| 607 | Sending NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90 |
| 608 | Sending NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90 |
| 609 | Sending NEMOGCM/NEMO/LIM_SRC_3/limthd_ent.F90 |
| 610 | Sending NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90 |
| 611 | Sending NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90 |
| 612 | Sending NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 |
| 613 | Sending NEMOGCM/NEMO/LIM_SRC_3/limupdate.F90 |
| 614 | Sending NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 |
| 615 | Sending NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 |
| 616 | Sending NEMOGCM/NEMO/LIM_SRC_3/limwri_dimg.h90 |
| 617 | Sending NEMOGCM/NEMO/LIM_SRC_3/thd_ice.F90 |
| 618 | Sending NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 |
| 619 | Sending NEMOGCM/NEMO/OPA_SRC/ASM/asmtrj.F90 |
| 620 | Sending NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 |
| 621 | Sending NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 |
| 622 | Sending NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90 |
| 623 | Sending NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90 |
| 624 | Sending NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90 |
| 625 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 |
| 626 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_exp.F90 |
| 627 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 |
| 628 | Sending NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 |
| 629 | Sending NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 |
| 630 | Sending NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 |
| 631 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/albedo.F90 |
| 632 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 |
| 633 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 |
| 634 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcana.F90 |
| 635 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_clio.F90 |
| 636 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 |
| 637 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_mfs.F90 |
| 638 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 |
| 639 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 |
| 640 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcfwb.F90 |
| 641 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 |
| 642 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90 |
| 643 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 |
| 644 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 |
| 645 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 |
| 646 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 |
| 647 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90 |
| 648 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 |
| 649 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90 |
| 650 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90 |
| 651 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 |
| 652 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90 |
| 653 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90 |
| 654 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90 |
| 655 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 |
| 656 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 |
| 657 | Sending NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 |
| 658 | Sending NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90 |
| 659 | Sending NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 |
| 660 | Sending NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 |
| 661 | Sending NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90 |
| 662 | Sending NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 |
| 663 | Sending NEMOGCM/NEMO/OPA_SRC/oce.F90 |
| 664 | Sending NEMOGCM/NEMO/TOP_SRC/PISCES/p4zrem.F90 |
| 665 | Sending NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90 |
| 666 | Sending NEMOGCM/NEMO/TOP_SRC/SED/sedchem.F90 |
| 667 | Sending NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 |
| 668 | Sending NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 |
| 669 | Sending NEMOGCM/NEMO/TOP_SRC/trc.F90 |
| 670 | Sending NEMOGCM/NEMO/TOP_SRC/trcsub.F90 |
| 671 | Transmitting file data .......................................................................................................... |
| 672 | Committed revision 3625. |
| 673 | }}} |
| 674 | |
| 675 | |