Changes between Initial Version and Version 1 of ticket/0891_merge_LOCEAN_CMCC_INGV_MERCATOR_2011

Timestamp:

2011-11-15T11:13:59+01:00 (12 years ago)

Author:

cetlod

Comment:

--

ticket/0891_merge_LOCEAN_CMCC_INGV_MERCATOR_2011

@@ +1 @@
+[[PageOutline]]
+Last edited [[Timestamp]]
+
+[[BR]]
+
+'''Author''' : NEMO Team
+
+'''ticket''' : #891
+
+'''Branch''' : [https://forge.ipsl.jussieu.fr/nemo/browser/branches/dev_LOCEAN_CMCC_INGV_MERCATOR_2011      dev_LOCEAN_CMCC_INGV_MERCATOR_2011 ] 
+----
+
+=== Description ===
+
+This branch is the merge of 2 branhes :
+
+    * 2011/dev_LOCEAN_CMCC_2011
+    * 2011/dev_MERCATOR_INGV_2011_MERGE
+
+=== 1st step : Copy LOCEAN/CMCC branch into the new branch
+
+{{{
+
+svn copy svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_LOCEAN_CMCC_2011 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011 -m "1st step of the merge: Copy LOCEAN/CMCC branch into the new branch"
+
+}}}
+
+=== 2nd step ===
+
+{{{
+
+svn co svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011 dev_LOCEAN_CMCC_INGV_MERCATOR_2011
+
+svn merge -r 2787:3100 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_MERCATOR_INGV_2011_MERGE .
+
+U    DOC/NEMO_book.pdf
+U    DOC/TexFiles/Biblio/Biblio.bib
+U    DOC/TexFiles/Figures/logo_MERCATOR.pdf
+U    DOC/TexFiles/Chapters/Chap_DIA.tex
+U    DOC/TexFiles/Chapters/Chap_SBC.tex
+U    DOC/TexFiles/Chapters/Chap_ZDF.tex
+A    DOC/TexFiles/Namelist/namsbc_wave
+U    DOC/TexFiles/Namelist/namsbc
+U    DOC/TexFiles/Namelist/namflo
+A    DOC/TexFiles/Namelist/nam_tide
+A    DOC/TexFiles/Namelist/namsbc_ecmwf
+A    DOC/TexFiles/Namelist/namdia_harm
+A    DOC/TexFiles/Namelist/namdct
+U    DOC/TexFiles/Namelist/namzdf_ric
+A    NEMOGCM/TOOLS/SECTIONS_DIADCT
+A    NEMOGCM/TOOLS/SECTIONS_DIADCT/run
+A    NEMOGCM/TOOLS/SECTIONS_DIADCT/run/list_sections.ascii_GYRE
+A    NEMOGCM/TOOLS/SECTIONS_DIADCT/run/list_sections.ascii_exp
+A    NEMOGCM/TOOLS/SECTIONS_DIADCT/run/list_sections.ascii_global
+A    NEMOGCM/TOOLS/SECTIONS_DIADCT/run/namelist
+A    NEMOGCM/TOOLS/SECTIONS_DIADCT/run/job.ksh
+A    NEMOGCM/TOOLS/SECTIONS_DIADCT/src
+A    NEMOGCM/TOOLS/SECTIONS_DIADCT/src/writesections.f90
+A    NEMOGCM/TOOLS/SECTIONS_DIADCT/src/compute_sections.f90
+A    NEMOGCM/TOOLS/SECTIONS_DIADCT/src/readsections.f90
+A    NEMOGCM/TOOLS/SECTIONS_DIADCT/src/sections_tools.f90
+A    NEMOGCM/TOOLS/SECTIONS_DIADCT/src/declarations.f90
+A    NEMOGCM/TOOLS/SECTIONS_DIADCT/src/diadct_sections.f90
+A    NEMOGCM/TOOLS/SECTIONS_DIADCT/src/readcoordmesh.f90
+U    NEMOGCM/CONFIG/GYRE_LOBSTER/EXP00/iodef.xml
+U    NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml
+U    NEMOGCM/CONFIG/GYRE/EXP00/namelist
+C    NEMOGCM/CONFIG/GYRE/cpp_GYRE.fcm
+C    NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
+U    NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml
+U    NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist
+U    NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
+C    NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm
+U    NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml
+U    NEMOGCM/CONFIG/POMME/EXP00/iodef.xml
+U    NEMOGCM/CONFIG/POMME/EXP00/namelist
+U    NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
+U    NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90
+U    NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90
+U    NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
+U    NEMOGCM/NEMO/OPA_SRC/step_oce.F90
+A    NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90
+A    NEMOGCM/NEMO/OPA_SRC/SBC/tide.h90
+A    NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90
+A    NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90
+A    NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90
+A    NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_ecmwf.F90
+C    NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90
+U    NEMOGCM/NEMO/OPA_SRC/FLO/flo_oce.F90
+U    NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90
+A    NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90
+U    NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90
+U    NEMOGCM/NEMO/OPA_SRC/FLO/flo4rk.F90
+U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90
+A    NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90
+A    NEMOGCM/NEMO/OPA_SRC/DIA/surdetermine.F90
+A    NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90
+U    NEMOGCM/NEMO/OPA_SRC/step.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
+U    NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90
+C    NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90
+}}}
+    
+----
+=== Testing ===
+Testing could consider (where appropriate) other configurations in addition to NVTK].
+
+||NVTK Tested||!'''YES/NO!'''||
+||Other model configurations||!'''YES/NO!'''||
+||Processor configurations tested||[ Enter processor configs tested here ]||
+||If adding new functionality please confirm that the [[BR]]New code doesn't change results when it is switched off [[BR]]and !''works!'' when switched on||!'''YES/NO/NA!'''||
+
+(Answering UNSURE is likely to generate further questions from reviewers.)
+
+'Please add further summary details here'
+
+ * Processor configurations tested
+ * etc----
+
+=== Bit Comparability ===
+||Does this change preserve answers in your tested standard configurations (to the last bit) ?||!'''YES/NO !'''||
+||Does this change bit compare across various processor configurations. (1xM, Nx1 and MxN are recommended)||!'''YES/NO!'''||
+||Is this change expected to preserve answers in all possible model configurations?||!'''YES/NO!'''||
+||Is this change expected to preserve all diagnostics? [[BR]]!,,!''Preserving answers in model runs does not necessarily imply preserved diagnostics. !''||!'''YES/NO!'''||
+
+If you answered !'''NO!''' to any of the above, please provide further details:
+
+ * Which routine(s) are causing the difference?
+ * Why the changes are not protected by a logical switch or new section-version
+ * What is needed to achieve regression with the previous model release (e.g. a regression branch, hand-edits etc). If this is not possible, explain why not.
+ * What do you expect to see occur in the test harness jobs?
+ * Which diagnostics have you altered and why have they changed?Please add details here........
+
+----
+=== System Changes ===
+||Does your change alter namelists?||!'''YES/NO !'''||
+||Does your change require a change in compiler options?||!'''YES/NO !'''||
+
+If any of these apply, please document the changes required here.......
+
+----
+=== Resources ===
+!''Please !''summarize!'' any changes in runtime or memory use caused by this change......!''
+
+----
+=== IPR issues ===
+||Has the code been wholly (100%) produced by NEMO developers staff working exclusively on NEMO?||!'''YES/ NO !'''||
+
+If No:
+
+ * Identify the collaboration agreement details
+ * Ensure the code routine header is in accordance with the agreement, (Copyright/Redistribution etc).Add further details here if required..........