Last edited Timestamp?

Author : AUTHOR_NAME

ticket : #887

Branch : 2011/dev_LOCEAN_CMCC_2011

---

Description

Merge of LOCEAN and CMCC developments branches for 2011

1st step : Copy the LOCEAN branch into the new branch==

svn copy svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_LOCEAN_2011 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_LOCEAN_CMCC_2011 -m "1st step of the LOCEAN & CMCC merge: Copy LOCEAN 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_2011 dev_LOCEAN_CMCC_2011

svn merge -r 2855:3033 svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_CMCC .

U    DOC/TexFiles/Biblio/Biblio.bib
U    DOC/TexFiles/Chapters/Chap_DYN.tex
U    DOC/TexFiles/Chapters/Chap_ASM.tex
U    DOC/TexFiles/Namelist/namasm
U    DOC/TexFiles/Namelist/namdyn_vor
U    NEMOGCM/CONFIG/GYRE/EXP00/namelist
U    NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
U    NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
U    NEMOGCM/CONFIG/POMME/EXP00/namelist
U    NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90
U    NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
U    NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

svn_ci "dev_LOCEAN_CMCC_2011: add in changes CMCC devlopments into the new branch"
Password: 
Sending        DOC/TexFiles/Biblio/Biblio.bib
Sending        DOC/TexFiles/Chapters/Chap_ASM.tex
Sending        DOC/TexFiles/Chapters/Chap_DYN.tex
Sending        DOC/TexFiles/Namelist/namasm
Sending        DOC/TexFiles/Namelist/namdyn_vor
Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
Sending        NEMOGCM/CONFIG/POMME/EXP00/namelist
Sending        NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90
Transmitting file data ............
Committed revision 3084.

---

Testing

Testing could consider (where appropriate) other configurations in addition to NVTK].

SETTE Tested	'''YES'''
Other model configurations	'''GYRE_LOBSTER, ORCA2_LIM_PISCES, ORCA2_OFF_PISCES'''
Processor configurations tested	2x2,1x4,2x8,4x4
If adding new functionality please confirm that the New code doesn't change results when it is switched off 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 '''
Does this change bit compare across various processor configurations. (1xM, Nx1 and MxN are recommended)	'''YES'''
Is this change expected to preserve answers in all possible model configurations?	'''YES/NO'''
Is this change expected to preserve all diagnostics? ,,''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 '''
Does your change require a change in compiler options?	'''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..........