Changes between Version 7 and Version 8 of ticket/0877_LOCEAN_2011

Timestamp:

2011-10-28T12:00:23+02:00 (13 years ago)

Author:

cetlod

Comment:

--

ticket/0877_LOCEAN_2011

@@ -390 +390 @@
 Committed revision 2978.
 }}}
+
+
+'''(6)''' Merge in NEMOGCM/SETTE subdirectory of dev. branch 2011/dev_r2855_LOCEAN7_SETTE/ changes between 2757 and 3020 [[BR]]
+{{{
+
+svn co svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_LOCEAN_2011/NEMOGCM dev_LOCEAN_2011
+
+cd dev_LOCEAN_2011/SETTE
+
+svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2855_LOCEAN7_SETTE/NEMOGCM/SETTE -r 2757:3020 .
+
+--- Merging r2856 through r3020 into '.':
+A    input_ORCA2_OFF_PISCES.cfg
+A    iodef_sette.xml
+U    SETTE.pdf
+A    input_ORCA2_LIM_AGRIF.cfg
+U    README
+U    sette.sh
+U    param.cfg
+A    prepare_exe_dir.sh
+U    sette_beginner.sh
+U    fcm_job.sh
+U    all_functions.sh
+A    BATCH_TEMPLATE
+A    BATCH_TEMPLATE/sette_batch_template
+A    BATCH_TEMPLATE/batch-ALTIX_NAUTILUS_MPT
+A    BATCH_TEMPLATE/batch-X64_TITANE
+A    BATCH_TEMPLATE/batch-PW6_VARGAS
+
+}}}
 ----
 === Testing ===