Version 9 (modified by acc, 10 years ago) (diff)

Last edited Timestamp?


Author : acc

ticket : #684

Branch : DEV_r1784_mid_year_merge_2010


The 2010 mid-year merge branch

This branch will contain all the bug-fixes up to tag version 3.2.1 + code from the following completed developments:

  • DEV_r1784_3DF
  • DEV_r1837_mass_heat_salt_fluxes
  • dev_r1821_mixed_ldfdyn
  • DEV_R1821_Rivers
  • DEV_1879_mpp_rep

Step 1 === is to create the branch from the earliest trunk revision from which any of the branches to be merged were created. In this case revision 1784. The command used was:

svn copy svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@1784 \
         svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_r1784_mid_year_merge_2010 \
          -m "ticket #684 step 1: Create branch for mid year branch; start at the earliest base revision for the branches to be merged"

Step 2 === is to checkout the new branch, merge in the differences between the head of the 3DF branch and the trunk@1784 and check back in the modified branch. This will simply recreate the 3DF branch but the associated changes will be easily identified:

svn co svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_r1784_mid_year_merge_2010

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@1784 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_r1784_3DF DEV_r1784_mid_year_merge_2010

<password>


--- Merging r1785 through r1950 into 'DEV_r1784_mid_year_merge_2010':
U    DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/EXP00/namelist
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcssr.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/fldread.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcblk_clio.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcice_if.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcblk_core.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcrnf.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcflx.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DTA/dtasal.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DTA/dtatem.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/TRA/traqsr.F90

cd DEV_r1784_mid_year_merge_2010
<password>
svn ci -m"ticket #684 step 2: Add in changes from the DEV_r1784_3DF branch"

Step 3 === is to merge in the changes on the trunk between revision 1784 and 1821 (which is the next lowest base version used for the branches).

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@1784 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@1821 ./

<password>

--- Merging r1785 through r1821 into '.':
U    EXTERNAL/XMLF90/makemake_XMLF90.perl
U    EXTERNAL/XMLF90/AA_make
U    EXTERNAL/XMLIO_SERVER/makemake_XMLIO.perl
U    EXTERNAL/XMLIO_SERVER/AA_make
U    NVTK/fait_AA_make
U    NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_GYRE
U    NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ORCA2_OFF_PISCES
U    NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ORCA2_LIM
U    NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ORCA2_LIM3
U    NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ORCA2_LIM_PISCES
U    NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_GYRE_LOBSTER
U    NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ZAGRIF
U    CONFIG/GYRE_LOBSTER/scripts/BB_make
U    CONFIG/GYRE_LOBSTER/scripts/BB_make.ldef
U    CONFIG/GYRE_LOBSTER/EXP00/iodef.xml
U    CONFIG/GYRE/scripts/BB_make
U    CONFIG/GYRE/scripts/BB_make.ldef
U    CONFIG/ORCA2_OFF_PISCES/IGCM00/COMP/pisces.card
U    CONFIG/ORCA2_OFF_PISCES/scripts/BB_make
U    CONFIG/ORCA2_OFF_PISCES/scripts/BB_make.ldef
U    CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_pisces
U    CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
U    CONFIG/ORCA2_LIM/IGCM00/COMP/opa9.card
U    CONFIG/ORCA2_LIM/IGCM00/COMP/opa9.driver
U    CONFIG/ORCA2_LIM/scripts/BB_make
U    CONFIG/ORCA2_LIM/scripts/BB_make.ldef
U    CONFIG/ORCA2_LIM/EXP00/iodef.xml
U    CONFIG/ORCA2_LIM_PISCES/scripts/BB_make
U    CONFIG/ORCA2_LIM_PISCES/scripts/BB_make.ldef
U    CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_pisces
U    CONFIG/POMME/scripts/BB_make
U    CONFIG/POMME/scripts/BB_make.ldef
U    AGRIF/AA_make.ldef
U    AGRIF/AGRIF_FILES/modmpp.F
U    AGRIF/AGRIF_FILES/modinterp.F
U    AGRIF/AGRIF_FILES/modtypes.F
U    AGRIF/AGRIF_FILES/modutil.F
U    AGRIF/AGRIF_FILES/modlinktomodel.F
U    AGRIF/AGRIF_FILES/modupdate.F
U    AGRIF/AGRIF_FILES/modbc.F
U    AGRIF/AA_make
A    UTIL/CFG_TOOLS
A    UTIL/CFG_TOOLS/io_netcdf.f90
A    UTIL/CFG_TOOLS/agrif_types.f90
A    UTIL/CFG_TOOLS/create_coordinates.f90
A    UTIL/CFG_TOOLS/agrif_readwrite.f90
A    UTIL/CFG_TOOLS/cfg_tools.f90
A    UTIL/CFG_TOOLS/namelist
A    UTIL/CFG_TOOLS/Makefile
U    UTIL/fait_AA_make
U    NEMO/OFF_SRC/DOM/domrea.F90
U    NEMO/OPA_SRC/DOM/dom_oce.F90
U    NEMO/OPA_SRC/DOM/domain.F90
U    NEMO/OPA_SRC/DOM/domhgr.F90
U    NEMO/OPA_SRC/IOM/iom.F90
U    NEMO/OPA_SRC/DYN/divcur.F90
U    NEMO/OPA_SRC/DYN/sshwzv.F90
U    NEMO/OPA_SRC/DYN/dynspg_flt.F90
U    NEMO/OPA_SRC/SOL/solmat.F90
U    NEMO/OPA_SRC/OBC/obcini.F90
U    NEMO/OPA_SRC/OBC/obc_oce.F90
U    NEMO/OPA_SRC/OBC/obcrst.F90
U    NEMO/OPA_SRC/SBC/fldread.F90
U    NEMO/OPA_SRC/SBC/sbcmod.F90
U    NEMO/OPA_SRC/lib_mpp.F90
U    NEMO/OPA_SRC/DIA/dianam.F90
U    NEMO/OPA_SRC/DIA/diadimg.F90
U    NEMO/OPA_SRC/DIA/diawri.F90
U    NEMO/OPA_SRC/step.F90
U    NEMO/OPA_SRC/opa.F90
U    NEMO/LIM_SRC_2/limwri_2.F90
A    NEMO/TOP_SRC/PISCES/trcrst_pisces.F90
U    NEMO/TOP_SRC/PISCES/p4zflx.F90
U    NEMO/TOP_SRC/PISCES/p4zche.F90
U    NEMO/TOP_SRC/PISCES/trcini_pisces.F90
U    NEMO/TOP_SRC/PISCES/p4zopt.F90
U    NEMO/TOP_SRC/PISCES/p4zmeso.F90
U    NEMO/TOP_SRC/PISCES/p4zprod.F90
U    NEMO/TOP_SRC/PISCES/p4zsink.F90
U    NEMO/TOP_SRC/PISCES/p4zbio.F90
U    NEMO/TOP_SRC/PISCES/p4zmicro.F90
U    NEMO/TOP_SRC/PISCES/sms_pisces.F90
U    NEMO/TOP_SRC/PISCES/trclsm_pisces.F90
U    NEMO/TOP_SRC/PISCES/p4zmort.F90
U    NEMO/TOP_SRC/PISCES/p4zlim.F90
U    NEMO/TOP_SRC/PISCES/p4zrem.F90
A    NEMO/TOP_SRC/C14b/trcrst_c14b.F90
U    NEMO/TOP_SRC/C14b/trclsm_c14b.F90
U    NEMO/TOP_SRC/CFC/trcctl_cfc.F90
A    NEMO/TOP_SRC/CFC/trcrst_cfc.F90
U    NEMO/TOP_SRC/CFC/trclsm_cfc.F90
A    NEMO/TOP_SRC/MY_TRC/trcrst_my_trc.F90
U    NEMO/TOP_SRC/TRP/trczdf_imp.F90
U    NEMO/TOP_SRC/TRP/trczdf_iso.F90
U    NEMO/TOP_SRC/TRP/trctrp.F90
U    NEMO/TOP_SRC/TRP/trczdf_iso_vopt.F90
U    NEMO/TOP_SRC/LOBSTER/trcbio.F90
U    NEMO/TOP_SRC/LOBSTER/trcini_lobster.F90
U    NEMO/TOP_SRC/LOBSTER/trcsed.F90
U    NEMO/TOP_SRC/LOBSTER/trcexp.F90
U    NEMO/TOP_SRC/LOBSTER/trcopt.F90
A    NEMO/TOP_SRC/LOBSTER/trcrst_lobster.F90
U    NEMO/TOP_SRC/trcdta.F90
U    NEMO/TOP_SRC/trcrst.F90
U    NEMO/NST_SRC/agrif2model.F90

No conflicts so far (but rather more changes than expected?). Nevertheless check this in and move onto step 4.

svn ci -m"ticket #684 step 3: Add in changes from the trunk between revisions 1784 and 1821. No conflicts so far"

Step 4 === is to merge in the changes between the head of the dev_r1821_mixed_ldfdyn branch and the trunk@1821:

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@1821 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/dev_r1821_mixed_ldfdyn 

< password >


--- Merging r1822 through r1963 into 'DEV_r1784_mid_year_merge_2010':
U    DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/EXP00/namelist
U    DEV_r1784_mid_year_merge_2010/DOC/TexFiles/Chapters/Chap_LDF.tex
U    DEV_r1784_mid_year_merge_2010/DOC/TexFiles/Namelist/nam_dynldf
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DYN/dynldf_lap.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DYN/dynldf.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn_oce.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn_c1d.h90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn_c2d.h90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn_substitute.h90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/LDF/ldfdyn.F90

Still no conflicts, so check this in and move onto step 5

svn ci -m"ticket #684 step 4: Add in changes between the head of the dev_r1821_mixed_ldfdyn branch and the trunk@1821"

Step 5 === ought to be to merge in the changes between the head of the DEV_R1821_Rivers branch and the trunk@1821. This was done and gave rise

to one minor conflict in sbcrnf.F90 (to do with the dimensionality of fnow which was increased by the 3DF branch). This is easily resolved but closer examination of the code and discussions with one of the reviewers (gm) suggests that the vertical distribution of the mass flux associated with the runoff has been omitted. The vertical distribution of temperature and salinity is coded but all the mass flux still occurs at the surface. The physical and numerical implications of this are unclear so this branch has been omitted from the mid-year merge until the matter can be resolved. Step 5 therefore is to merge in the changes on the trunk between revision 1821 and 1879 (which is the base version used for the DEV_1879_mpp_rep branch).

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

<password>

--- Merging r1822 through r1879 into '.':
U    CONFIG/ORCA2_OFF_PISCES/EXP00/iodef.xml
U    CONFIG/ORCA2_LIM/IGCM00/COMP/opa9.driver
U    CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml
U    CONFIG/POMME/scripts/BB_make
U    CONFIG/POMME/EXP00/namelist
U    NEMO/OFF_SRC/trc_oce.F90
U    NEMO/OPA_SRC/DOM/dom_oce.F90
U    NEMO/OPA_SRC/DOM/phycst.F90
U    NEMO/OPA_SRC/par_POMME_R025.h90
U    NEMO/OPA_SRC/DYN/dynnxt.F90
U    NEMO/OPA_SRC/DYN/dynspg_flt.F90
U    NEMO/OPA_SRC/SOL/solmat.F90
U    NEMO/OPA_SRC/OBC/obc_par_EEL_R5.h90
U    NEMO/OPA_SRC/OBC/obc_par.F90
U    NEMO/OPA_SRC/OBC/obc_par_POMME_R025.h90
U    NEMO/OPA_SRC/OBC/obcdta.F90
U    NEMO/OPA_SRC/SBC/fldread.F90
U    NEMO/OPA_SRC/SBC/geo2ocean.F90
U    NEMO/OPA_SRC/SBC/sbccpl.F90
U    NEMO/OPA_SRC/SBC/sbcfwb.F90
U    NEMO/OPA_SRC/trc_oce.F90
U    NEMO/OPA_SRC/lib_mpp.F90
U    NEMO/OPA_SRC/TRA/traadv_tvd.F90
U    NEMO/OPA_SRC/TRA/tranxt.F90
U    NEMO/OPA_SRC/DIA/diaptr.F90
U    NEMO/TOP_SRC/trcini.F90
U    NEMO/TOP_SRC/PISCES/trcrst_pisces.F90
U    NEMO/TOP_SRC/PISCES/p4zflx.F90
U    NEMO/TOP_SRC/PISCES/p4zopt.F90
U    NEMO/TOP_SRC/PISCES/p4zmeso.F90
U    NEMO/TOP_SRC/PISCES/p4zprod.F90
U    NEMO/TOP_SRC/PISCES/p4zsink.F90
U    NEMO/TOP_SRC/PISCES/p4zlys.F90
U    NEMO/TOP_SRC/PISCES/p4zmicro.F90
U    NEMO/TOP_SRC/PISCES/sms_pisces.F90
U    NEMO/TOP_SRC/PISCES/p4zsed.F90
U    NEMO/TOP_SRC/par_trc.F90
U    NEMO/TOP_SRC/trcdia.F90
U    NEMO/TOP_SRC/trcwri.F90
U    NEMO/TOP_SRC/trcrst.F90
U    NEMO/NST_SRC/agrif_user.F90

Still no conflicts. Commit these changes and move onto step 6.

svn ci -m"ticket #684 step 5: Add in changes from the trunk between revisions 1821 and 1879."

Step 6 === is to merge in the changes between the head of the DEV_1879_mpp_rep branch and the trunk@1879

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@1879 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_1879_mpp_rep ./

<password>

--- Merging r1880 through r1975 into '.':
U    CONFIG/GYRE_LOBSTER/EXP00/namelist
U    CONFIG/GYRE/EXP00/namelist
U    CONFIG/ORCA2_LIM/EXP00/1_namelist
U    CONFIG/ORCA2_LIM/EXP00/namelist
U    CONFIG/ORCA2_LIM_PISCES/EXP00/namelist
U    CONFIG/POMME/EXP00/namelist
U    NEMO/OPA_SRC/DOM/dom_oce.F90
U    NEMO/OPA_SRC/DOM/domain.F90
U    NEMO/OPA_SRC/IOM/in_out_manager.F90
U    NEMO/OPA_SRC/DYN/dynspg_flt.F90
U    NEMO/OPA_SRC/SOL/solpcg.F90
U    NEMO/OPA_SRC/SOL/solver.F90
U    NEMO/OPA_SRC/SOL/solsor.F90
U    NEMO/OPA_SRC/SBC/sbcana.F90
U    NEMO/OPA_SRC/SBC/sbcfwb.F90
U    NEMO/OPA_SRC/lib_mpp.F90
U    NEMO/OPA_SRC/opa.F90
U    NEMO/LIM_SRC_2/limdyn_2.F90
U    NEMO/LIM_SRC_3/limdyn.F90

Still no conflicts. Commit these changes.

svn ci -m"ticket #684 step 6: Add in changes between the head of the DEV_r1879_mpp_rep branch and the trunk@1879."

Step 7 === Back to the Rivers branch. By popular demand this branch is to be included regardless of any future algorithmic changes required. The branch required some

tidying first to impose coding standards, update namelists and remove redundant variables. This was done first on the branch (see changes between DEV_R1821_Rivers@1938 and DEV_R1821_Rivers@1998). Changes on this branch were then added to the merge branch. Note this is now out of sequence since the merge branch includes trunk changes up to 1879 so some conflicts may occur. Fortunately, the trunk changes between 1821 and 1879 have minimal overlap with the changes on the Rivers branch so this is not a major concern:

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@1821 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_R1821_Rivers

<password>

--- Merging r1822 through r1998 into '.':
U    CONFIG/GYRE_LOBSTER/EXP00/namelist
U    CONFIG/GYRE/EXP00/namelist
U    CONFIG/ORCA2_LIM/EXP00/namelist
U    CONFIG/ORCA2_LIM_PISCES/EXP00/namelist
U    CONFIG/POMME/EXP00/namelist
U    NEMO/OPA_SRC/DOM/closea.F90
U    NEMO/OPA_SRC/DYN/sshwzv.F90
U    NEMO/OPA_SRC/DYN/dynspg_flt.F90
U    NEMO/OPA_SRC/DYN/dynspg_ts.F90
U    NEMO/OPA_SRC/cla_div.F90
U    NEMO/OPA_SRC/OBC/obcvol.F90
U    NEMO/OPA_SRC/SBC/sbc_oce.F90
Conflict discovered in 'NEMO/OPA_SRC/SBC/sbcfwb.F90'.
Select: (p) postpone, (df) diff-full, (e) edit, (h) help for more options: p
C    NEMO/OPA_SRC/SBC/sbcfwb.F90
U    NEMO/OPA_SRC/SBC/sbcmod.F90
Conflict discovered in 'NEMO/OPA_SRC/SBC/sbcrnf.F90'.
Select: (p) postpone, (df) diff-full, (e) edit, (h) help for more options: p
C    NEMO/OPA_SRC/SBC/sbcrnf.F90
U    NEMO/OPA_SRC/BDY/bdyvol.F90
U    NEMO/OPA_SRC/cla_dynspg.F90
U    NEMO/OPA_SRC/ZDF/zdfkpp.F90
U    NEMO/OPA_SRC/TRA/trasbc.F90
U    NEMO/OPA_SRC/cla.F90
U    NEMO/OPA_SRC/DIA/diafwb.F90
U    NEMO/OPA_SRC/DIA/diawri.F90
U    NEMO/OPA_SRC/DIA/diawri_dimg.h90

The two conflicts were easily resolved and the code committed to the repository:

svn ci -m"ticket #684 step 7: Add in changes between the head of the DEV_r1821_Rivers branch and the trunk@1821. Note untested changes were made to the Rivers branch before this merge see wiki ticket page for details"

Step 8 === Final merge step is to merge in the trunk changes between trunk@1879 and trunk@1986 which is the point at which the 3.2.1 tag was made

Step 9 === The code merging is now complete. Step 9 is to compile and then to run it through the Nemo Validation Tool Kit?.

Testing

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
New code doesn't change results when it is switched off
and ''works'' when switched on
'''YES/NO/NA'''
  • 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?
,,''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 '''

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