New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
ticket/1006_dev_NOC_2012_rev3555 – NEMO
wiki:ticket/1006_dev_NOC_2012_rev3555

Version 3 (modified by acc, 12 years ago) (diff)

--

Merging Noc developments for 2012

branches to be merged:

2012/dev_r3322_NOCS09_SAS               [added to merge at changeset  3607    ]
2012/dev_r3337_NOCS10_ICB               [added to merge at changeset  3609    ]
2012/dev_r3385_NOCS04_HAMF              [added to merge at changeset      ]

2012/dev_r3452_NOCL02_Smagorinsky       [added to merge at changeset      ]
2012/dev_r3452_NOCL06_LOGLAYER          [added to merge at changeset      ]

2012/dev_r3452_NOCL01_WettingDrying     [Ongoing. On schedule for 2013    ]
2012/dev_r3452_NOCL03_vPPM              [postponed to 2013]
2012/dev_r3452_NOCL05_hpgMarsaleix      [postponed to 2013]

Step 1. copy trunk at lowest revision number used by any of the branches to be merged

svn copy svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3322 \
         svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_NOC_2012_rev3555 \
         -m"Create branch for the merge of all NOC 2012 developments. See ticket #1006. Step 1: copy trunk at lowest revision number used by any of the branches to be merged"

Successfully created new branch: branches/2012/dev_NOC_2012_rev3555

Step 2. merge in changes from the first development branch into a checked out version of the merge branch. This simply recreates the first development branch but consolidates the changes made on that branch into a single changeset:

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3322 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3322_NOCS09_SAS \
          dev_NOC_2012_rev3555


--- Merging r3323 through r3606 into 'dev_NOC_2012_rev3555':
U    dev_NOC_2012_rev3555/DOC/TexFiles/Chapters/Chap_SBC.tex
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_Q.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_bsf.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_S.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_T.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_emp.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_IceThick.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_msf.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_AMOC.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_EqS.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_EqT.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_EqU.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_GlobMeanTS.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_S100m.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_T100m.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_zonal_S.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_zonal_T.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_qnet.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_ICE.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_all.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_sss.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_sst.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_Med_Sdepth.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_mld.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_vardef.sh_example1
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_vardef.sh_example2
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_all.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_read.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_vardef.sh_example1
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_Med_Sspread.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_main.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/README
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_erp.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_vardef.sh_example2
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_mht.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_EMP.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_common.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_IceFrac.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_Drake.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_main.sh
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_ZonMld.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/initenv.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_ArcSal.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_SSH.pro
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IGCM00
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IGCM00/config.card
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IGCM00/COMP
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IGCM00/COMP/opa9.card
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IGCM00/COMP/opa9.driver
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IGCM00/COMP/lim2.card
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/IGCM00/COMP/lim2.driver
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/cpp_ORCA2_SAS_LIM.fcm
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/1_namelist_ice_lim2
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist_ice_lim2
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/opa
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist_ice_lim3
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/EMPave_old.dat
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/AGRIF_FixedGrids.in
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/iodef.xml
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/AA_job
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/xmlio_server.def
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/1_namelist
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/iodef_ar5.xml
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist
A    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist_ice
--- Merging r3323 through r3606 into 'dev_NOC_2012_rev3555/NEMOGCM/CONFIG/cfg.txt':
U    dev_NOC_2012_rev3555/NEMOGCM/CONFIG/cfg.txt
--- Merging r3323 through r3606 into 'dev_NOC_2012_rev3555':
U    dev_NOC_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90
U    dev_NOC_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
A    dev_NOC_2012_rev3555/NEMOGCM/NEMO/SAS_SRC
A    dev_NOC_2012_rev3555/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90
A    dev_NOC_2012_rev3555/NEMOGCM/NEMO/SAS_SRC/stpctl.F90
A    dev_NOC_2012_rev3555/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90
A    dev_NOC_2012_rev3555/NEMOGCM/NEMO/SAS_SRC/step.F90
A    dev_NOC_2012_rev3555/NEMOGCM/NEMO/SAS_SRC/daymod.F90
A    dev_NOC_2012_rev3555/NEMOGCM/NEMO/SAS_SRC/diawri.F90

Check in merge branch:

svn ci -m"Branch dev_NOC_2012_rev3555. #1006. Step 2: Add changes from the 2012/dev_r3322_NOCS09_SAS (Stand Alone Surface module) branch"

Sending        .
Sending        DOC/TexFiles/Chapters/Chap_SBC.tex
Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm
Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm
Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/1_namelist
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/1_namelist_ice_lim2
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/AA_job
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/AGRIF_FixedGrids.in
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/EMPave_old.dat
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/iodef.xml
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/iodef_ar5.xml
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist_ice
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist_ice_lim2
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist_ice_lim3
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/opa
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/xmlio_server.def
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/README
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/initenv.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_common.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_main.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_main.sh
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_ArcSal.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_EqS.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_EqT.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_EqU.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_GlobMeanTS.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_IceFrac.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_IceThick.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_Med_Sdepth.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_Med_Sspread.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_S100m.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_T100m.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_ZonMld.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_all.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_bsf.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_emp.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_erp.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_mht.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_mld.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_msf.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_qnet.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_sss.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_sst.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_vardef.sh_example1
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_vardef.sh_example2
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_zonal_S.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_plot_zonal_T.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_AMOC.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_Drake.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_EMP.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_ICE.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_Q.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_S.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_SSH.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_T.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_all.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_read.pro
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_vardef.sh_example1
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IDL_scripts/std_ts_vardef.sh_example2
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IGCM00
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IGCM00/COMP
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IGCM00/COMP/lim2.card
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IGCM00/COMP/lim2.driver
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IGCM00/COMP/opa9.card
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IGCM00/COMP/opa9.driver
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/IGCM00/config.card
Adding         NEMOGCM/CONFIG/ORCA2_SAS_LIM/cpp_ORCA2_SAS_LIM.fcm
Sending        NEMOGCM/CONFIG/cfg.txt
Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90
Adding         NEMOGCM/NEMO/SAS_SRC
Adding         NEMOGCM/NEMO/SAS_SRC/daymod.F90
Adding         NEMOGCM/NEMO/SAS_SRC/diawri.F90
Adding         NEMOGCM/NEMO/SAS_SRC/nemogcm.F90
Adding         NEMOGCM/NEMO/SAS_SRC/sbcssm.F90
Adding         NEMOGCM/NEMO/SAS_SRC/step.F90
Adding         NEMOGCM/NEMO/SAS_SRC/stpctl.F90
Transmitting file data ....
Committed revision 3607.

Step 3. Merge in trunk changes between trunk@3322 and trunk@3337. Check-in changes if no conflicts arise

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3322 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3337 \
          ./

--- Merging r3323 through r3337 into '.':
A    ADM/DOC_SCRIPTS/sphinx
A    ADM/DOC_SCRIPTS/sphinx/conf.py
A    ADM/README
U    NEMOGCM/SETTE/SETTE.pdf
U    NEMOGCM/SETTE/sette.sh
U    NEMOGCM/SETTE/README
U    NEMOGCM/SETTE/prepare_job.sh
U    NEMOGCM/SETTE/sette_beginner.sh
U    NEMOGCM/SETTE/fcm_job.sh
U    NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER
U    NEMOGCM/SETTE/BATCH_TEMPLATE/sette_batch_template
U    NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_TITANE
U    NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW6_VARGAS
U    NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90
 
svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 3: Merge in trunk changes between revision 3322 and 3337"

Sending        .
Adding         ADM/DOC_SCRIPTS/sphinx
Adding         ADM/DOC_SCRIPTS/sphinx/conf.py
Adding         ADM/README
Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm
Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm
Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm
Sending        NEMOGCM/CONFIG/cfg.txt
Sending        NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90
Sending        NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW6_VARGAS
Sending        NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_TITANE
Sending        NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER
Sending        NEMOGCM/SETTE/BATCH_TEMPLATE/sette_batch_template
Sending        NEMOGCM/SETTE/README
Sending        NEMOGCM/SETTE/SETTE.pdf
Sending        NEMOGCM/SETTE/fcm_job.sh
Sending        NEMOGCM/SETTE/prepare_job.sh
Sending        NEMOGCM/SETTE/sette.sh
Sending        NEMOGCM/SETTE/sette_beginner.sh
Transmitting file data ...........
Committed revision 3608.

Step 4. Merge in all changes on the 2012/dev_r3337_NOCS10_ICB branch. Check-in if no conflicts arise:

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3337 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3337_NOCS10_ICB \
          ./

--- Merging r3338 through r3608 into '.':
U    DOC/NEMO_book.pdf
U    DOC/TexFiles/Biblio/Biblio.bib
U    DOC/TexFiles/Chapters/Chap_SBC.tex
A    DOC/TexFiles/Namelist/namberg
U    NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist
U    NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
U    NEMOGCM/CONFIG/AMM12/EXP00/namelist
U    NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
U    NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90
U    NEMOGCM/NEMO/OPA_SRC/SOL/solmat.F90
U    NEMOGCM/NEMO/OPA_SRC/SOL/solsor.F90
U    NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
U    NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90
U    NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90
U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
U    NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90
A    NEMOGCM/NEMO/OPA_SRC/ICB
A    NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.F90
A    NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90
A    NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90
A    NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90
A    NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90
A    NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90
A    NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90
A    NEMOGCM/NEMO/OPA_SRC/ICB/icbdia.F90
A    NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90
A    NEMOGCM/NEMO/OPA_SRC/ICB/icbtrj.F90
A    NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90

svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 4: Merge in changes from 2012/dev_r3337_NOCS10_ICB (ICeBergs) branch"

Sending        .
Sending        DOC/NEMO_book.pdf
Sending        DOC/TexFiles/Biblio/Biblio.bib
Sending        DOC/TexFiles/Chapters/Chap_SBC.tex
Adding         DOC/TexFiles/Namelist/namberg
Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm
Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm
Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm
Sending        NEMOGCM/CONFIG/AMM12/EXP00/namelist
Sending        NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
Sending        NEMOGCM/CONFIG/cfg.txt
Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90
Adding         NEMOGCM/NEMO/OPA_SRC/ICB
Adding         NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90
Adding         NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.F90
Adding         NEMOGCM/NEMO/OPA_SRC/ICB/icbdia.F90
Adding         NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90
Adding         NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90
Adding         NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90
Adding         NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90
Adding         NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90
Adding         NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90
Adding         NEMOGCM/NEMO/OPA_SRC/ICB/icbtrj.F90
Adding         NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90
Sending        NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90
Sending        NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90
Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
Sending        NEMOGCM/NEMO/OPA_SRC/SOL/solmat.F90
Sending        NEMOGCM/NEMO/OPA_SRC/SOL/solsor.F90
Sending        NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
Transmitting file data ...............
Committed revision 3609.

Step 5. Merge in trunk changes between trunk@3337 and trunk@3385. Check-in changes if no conflicts arise

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3337 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3385 \
          ./

--- Merging r3338 through r3385 into '.':
U    NEMOGCM/EXTERNAL/XMLIO_SERVER/src/IOSERVER/mod_interface_ioipsl.f90
U    NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_S.pro
U    NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_T.pro
U    NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_read.pro
U    NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
U    NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim2.F90
U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90
U    NEMOGCM/NEMO/OPA_SRC/timing.F90
U    NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limistate.F90
U    NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90

svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 5: Merge in trunk changes between revision 3337 and 3385"

Sending        .
Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm
Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm
Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm
Sending        NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_S.pro
Sending        NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_T.pro
Sending        NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_read.pro
Sending        NEMOGCM/CONFIG/cfg.txt
Sending        NEMOGCM/EXTERNAL/XMLIO_SERVER/src/IOSERVER/mod_interface_ioipsl.f90
Sending        NEMOGCM/NEMO/LIM_SRC_3/limistate.F90
Sending        NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90
Sending        NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim2.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90
Sending        NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
Sending        NEMOGCM/NEMO/OPA_SRC/timing.F90
Transmitting file data ...........
Committed revision 3610.

Step 6. Check SETTE status before merging with the more intrusive HAMF branch. Some changes required to achieve successful compilation of all SETTE tests (except the AGRIF test which has never successfully compiled on nautilus). Minor bugs found in sbcssm.F90 and icb_oce.F90. New namberg namelist missing from GYRE, ORCA2_OFF_PISCES and ORCA2_SAS_LIM experiment directories. Stripped ICB modules of their dos-style line endings (CRLF). Also needed to update iodef.xml files to a more recent version in order to run those tests using key_iomput. This latter problem must be a trunk error which has been fixed later so the updated iodef.xml files have not been checked in on this branch. Note, the iceberg code has new iom_put statements in NEMOGCM/NEMO/OPA_SRC/ICB/icbdia.F90 which do not have corresponding entries in the iodef.xml files. These entries will have to be matched at some point:

      CALL iom_put( "berg_melt"        , berg_melt   (:,:)   )   ! Melt rate of icebergs                     [kg/m2/s]
      CALL iom_put( "berg_buoy_melt"   , buoy_melt   (:,:)   )   ! Buoyancy component of iceberg melt rate   [kg/m2/s]
      CALL iom_put( "berg_eros_melt"   , eros_melt   (:,:)   )   ! Erosion component of iceberg melt rate    [kg/m2/s]
      CALL iom_put( "berg_conv_melt"   , conv_melt   (:,:)   )   ! Convective component of iceberg melt rate [kg/m2/s]
      CALL iom_put( "berg_virtual_area", virtual_area(:,:)   )   ! Virtual coverage by icebergs              [m2]
      CALL iom_put( "bits_src"         , bits_src    (:,:)   )   ! Mass source of bergy bits                 [kg/m2/s]
      CALL iom_put( "bits_melt"        , bits_melt   (:,:)   )   ! Melt rate of bergy bits                   [kg/m2/s]
      CALL iom_put( "bits_mass"        , bits_mass   (:,:)   )   ! Bergy bit density field                   [kg/m2]
      CALL iom_put( "berg_mass"        , berg_mass   (:,:)   )   ! Iceberg density field                     [kg/m2]
      CALL iom_put( "berg_real_calving", real_calving(:,:,:) )   ! Calving into iceberg class                [kg/s]

but this may as well be done after the merge since the XIOS branch introduces new xml files. With these changes the following SETTE status is achieved:

GYRELOB     restartability  passed
ORCA2LIMPIS restartability  passed
ORCA2OFFPIS restartability  passed
AMM12       restartability  FAILED

GYRELOB     reproducibility passed
ORCA2LIMPIS reproducibility passed
ORCA2OFFPIS reproducibility passed
AMM12       reproducibility FAILED

After which the successful code has been checked in:

svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 6: Minor code changes and updated namelists to enable successful SETTE testing"

Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbdia.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbtrj.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90
Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90
Transmitting file data ...............
Committed revision 3614.

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.