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.
#1183 (merge 2013 NOCS UKMO MERCATOR) – NEMO

Opened 11 years ago

Closed 10 years ago

Last modified 7 years ago

#1183 closed Task (fixed)

merge 2013 NOCS UKMO MERCATOR

Reported by: cbricaud Owned by: cbricaud
Priority: low Milestone:
Component: OCE Version: v3.6
Severity: Keywords:
Cc:

Commit History (0)

(No commits)

Change History (10)

comment:1 Changed 11 years ago by cbricaud

  1. create a new branch to merge Mercator and UKMO branches into; from rev 4119

svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_MERCATOR_UKMO_2013 -m " create branch from trunk rev4119 to merge UKMO and Mercator"

comment:3 Changed 11 years ago by cbricaud

4. merge Mercator branch into dev_MERCATOR_UKMO_2013

svn merge -r 4119:HEAD svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_MERCATOR_2013 dev_MERCATOR_UKMO_2013

--- Merging r4120 through r4227 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm':

U dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm

--- Merging r4120 through r4227 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm':

U dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm

--- Merging r4120 through r4227 into 'dev_MERCATOR_UKMO_2013':
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/par_oce.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/par_C1D_PAPA.h90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/extrap.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/attribute.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/create_boundary.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/domain.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/create_restart.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/phycst.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/vgrid.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/iom_rstdimg.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/date.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/logger.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/file.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/boundary.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/iom.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/variable.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/kind.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/dimension.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/filter.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/function.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/grid.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/merge_bathy.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/Doxyfile
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/create_coord.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/create_bathy.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/multi.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/mpp.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/global.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/iom_cdf.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/iom_mpp.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/src/interp.f90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/README
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/cfg
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/SIREN/cfg/variable.cfg
A dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/C1D_PAPA
A dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/C1D_PAPA/EXP00
A dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist
A dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_ice
A dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_ice_lim2
A dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/C1D_PAPA/EXP00/field_def.xml
A dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/C1D_PAPA/EXP00/domain_def.xml
A dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/C1D_PAPA/EXP00/iodef.xml
A dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/C1D_PAPA/cpp_C1D_PAPA.fcm
--- Merging r4120 through r4227 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/cfg.txt':

U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/cfg.txt

--- Merging r4120 through r4227 into 'dev_MERCATOR_UKMO_2013':

U dev_MERCATOR_UKMO_2013

--- Recording mergeinfo for merge of r4120 through r4227 into 'dev_MERCATOR_UKMO_2013':

G dev_MERCATOR_UKMO_2013

--- Recording mergeinfo for merge of r4120 through r4227 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm':

G dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm

--- Recording mergeinfo for merge of r4120 through r4227 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm':

G dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm

--- Recording mergeinfo for merge of r4120 through r4227 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/cfg.txt':

G dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/cfg.txt

svn ci -m " merge Mercator branch into ev_MERCATOR_UKMO_201"

==> Committed revision 4228.

comment:4 Changed 11 years ago by cbricaud

5. Merge UKMO branch into dev_MERCATOR_UKMO_2013

svn merge -r 3987:HEAD svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_UKMO_2013 dev_MERCATOR_UKMO_2013

--- Merging r3988 through r4228 into 'dev_MERCATOR_UKMO_2013':
U dev_MERCATOR_UKMO_2013/DOC/TexFiles/Chapters/Chap_OBS.tex
U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/GYRE/EXP00/namelist
U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist
U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist
U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/AMM12/EXP00/namelist
U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist
--- Merging r3988 through r4228 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/cfg.txt':

G dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/cfg.txt

--- Merging r3988 through r4228 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm':

G dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm

--- Merging r3988 through r4228 into 'dev_MERCATOR_UKMO_2013':

C dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/OLD/arch-PW7_METO.fcm
C dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-PW7_METO.fcm

--- Merging r3988 through r4228 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm':

G dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm

--- Merging r3988 through r4228 into 'dev_MERCATOR_UKMO_2013':
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/TOP_SRC/PISCES/trcini_pisces.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OOO_SRC
A dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OOO_SRC/dtadyn.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OOO_SRC/ooo.nml
A dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OOO_SRC/nemogcm.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OOO_SRC/ooo_data.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OOO_SRC/ooo_intp.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OOO_SRC/ooo_write.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OOO_SRC/obs_fbm.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OOO_SRC/ooo_read.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OOO_SRC/ooo_utils.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/par_ORCA_R05.h90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/par_EEL_R5.h90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/par_EEL_R6.h90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domcfg.F90
Conflict discovered in '/home/mercator/MERGE_2013/dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90'.
Select: (p) postpone, (df) diff-full, (e) edit,

(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p

C dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/IOM/iom_nf90.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/IOM/iom_ioipsl.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/par_ORCA_R025.h90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/par_AMM_12km.h90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/C1D/c1d.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/C1D/dtauvd.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/C1D/dyndmp.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/OBS/mpp_map.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/OBS/obs_fbm.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/par_POMME_R025.h90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/par_ORCA_R1.h90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/par_ORCA_R2.h90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/par_ORCA_R4.h90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/par_oce.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/par_GYRE.h90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/par_EEL_R2.h90
U dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/maketools
U dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/MISCELLANEOUS/chk_iomput.sh
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/src/ooo_utils.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/src/obs_const.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/src/c4comb.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/ooo
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/ooo/ooo.py
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/ooo/init.py
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/ooo/locator.py
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/ooo/run.py
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/ooo/test_nml.py
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/ooo/nml.py
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/doc
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/doc/Makefile
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/doc/source
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/doc/source/conf.py
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/doc/source/_templates
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/doc/source/index.rst
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/doc/source/intro.rst
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/doc/source/_static
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/doc/make.bat
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/setup.py
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/bin
A dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/OBSTOOLS/OOO/bin/ooo
U dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/COMPILE/Fcheck_archfile.sh

G dev_MERCATOR_UKMO_2013

--- Recording mergeinfo for merge of r3988 through r4228 into 'dev_MERCATOR_UKMO_2013':

G dev_MERCATOR_UKMO_2013

--- Recording mergeinfo for merge of r3988 through r4228 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm':

G dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm

--- Recording mergeinfo for merge of r3988 through r4228 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm':

G dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm

--- Recording mergeinfo for merge of r3988 through r4228 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/cfg.txt':

G dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/cfg.txt

Summary of conflicts:

Text conflicts: 1
Tree conflicts: 2

comment:5 Changed 11 years ago by cbricaud

svn resolved arch-PW7_METO.fcm
svn resolved OLD/arch-PW7_METO.fcm
svn resolved domzgr.F90

svn ci -m " merge UKMO branch into dev_MERCATOR_UKMO_2013"

comment:6 Changed 11 years ago by cbricaud

  • Type changed from Bug to Development branch

6. compile AMM12, ORCA2_LIM and C1D_PAPA configurations


svn ci -m " correct some bugs in UKMO_MERCATOR 2013 branch"

NEMO/OPA_SRC/par_C1D_PAPA.h90
NEMO/OPA_SRC/DOM/domzgr.F90
CONFIG/cfg.txt

Password:
Sending CONFIG/cfg.txt
Sending NEMO/OPA_SRC/DOM/domzgr.F90
Sending NEMO/OPA_SRC/par_C1D_PAPA.h90
Transmitting file data ...
Committed revision 4231.

comment:7 Changed 11 years ago by cbricaud

7. Merge dev_r3948_NOC_FK into dev_MERCATOR_UKMO_2013

svn merge -r 3948:HEAD svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_r3948_NOC_FK dev_MERCATOR_UKMO_2013

--- Merging r3949 through r4231 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm':

G dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm

--- Merging r3949 through r4231 into 'dev_MERCATOR_UKMO_2013':

C dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/OLD/arch-PW7_METO.fcm
C dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-PW7_METO.fcm

--- Merging r3949 through r4231 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm':
UG dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm
--- Merging r3949 through r4231 into 'dev_MERCATOR_UKMO_2013':

C dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-X64_YELLOWSTONE.fcm

U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/step.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90
Conflict discovered in '/home/mercator/MERGE_2013/dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90'.
Select: (p) postpone, (df) diff-full, (e) edit,

(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p

C dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/SOL/solmat.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/LBC/lbclnk.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90
A dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/TOP_SRC/PISCES/trcini_pisces.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90
U dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/COMPILE/Fcheck_archfile.sh
U dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/maketools
U dev_MERCATOR_UKMO_2013/NEMOGCM/TOOLS/MISCELLANEOUS/chk_iomput.sh
U dev_MERCATOR_UKMO_2013/NEMOGCM/SETTE/sette.sh
U dev_MERCATOR_UKMO_2013/NEMOGCM/SETTE/prepare_job.sh
U dev_MERCATOR_UKMO_2013/NEMOGCM/SETTE/all_functions.sh
U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/GYRE/EXP00/namelist
U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml
U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/SHARED/field_def.xml

G dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_oldstyle.xml

U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
UG dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_default.xml

G dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_demo.xml

U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist
U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/iodef.xml
U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/AMM12/EXP00/namelist
U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml
--- Merging r3949 through r4231 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/cfg.txt':

G dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/cfg.txt

--- Merging r3949 through r4231 into 'dev_MERCATOR_UKMO_2013':

G dev_MERCATOR_UKMO_2013

--- Recording mergeinfo for merge of r3949 through r4231 into 'dev_MERCATOR_UKMO_2013':

U dev_MERCATOR_UKMO_2013

--- Recording mergeinfo for merge of r3949 through r4231 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm':

U dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm

--- Recording mergeinfo for merge of r3949 through r4231 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm':

U dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm

--- Recording mergeinfo for merge of r3949 through r4231 into 'dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/cfg.txt':

U dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/cfg.txt

Summary of conflicts:

Text conflicts: 1
Tree conflicts: 3

svn resolved NEMOGCM/ARCH/OLD/arch-PW7_METO.fcm NEMOGCM/ARCH/arch-PW7_METO.fcm
Resolved conflicted state of 'NEMOGCM/ARCH/OLD/arch-PW7_METO.fcm'

svn resolved NEMOGCM/ARCH/arch-X64_YELLOWSTONE.fcm
Resolved conflicted state of 'NEMOGCM/ARCH/arch-X64_YELLOWSTONE.fcm'

svn resolved domzgr.F90
Resolved conflicted state of 'domzgr.F90'

svn ci -m " commit dev_r3948_NOC_FK into dev_MERCATOR_UKMO_2013"
Password:
Sending .
Sending NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm
Sending NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm
Sending NEMOGCM/CONFIG/AMM12/EXP00/namelist
Sending NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml
Sending NEMOGCM/CONFIG/GYRE/EXP00/namelist
Sending NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist
Sending NEMOGCM/CONFIG/GYRE_PISCES/EXP00/iodef.xml
Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_default.xml
Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
Sending NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml
Sending NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
Sending NEMOGCM/CONFIG/SHARED/field_def.xml
Sending NEMOGCM/CONFIG/cfg.txt
Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90
Adding NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90
Sending NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90
Sending NEMOGCM/SETTE/all_functions.sh
Sending NEMOGCM/SETTE/prepare_job.sh
Sending NEMOGCM/SETTE/sette.sh
Transmitting file data ................
Committed revision 4233.

comment:8 Changed 11 years ago by cbricaud

  • Version changed from v3.4 to v3.6

check compilation in ORCA2_LIM, C1D and AMM12.

svn ci -m "bug correction in dev_MERCATOR_UKMO_2013_test to compile ORCA2_LIM, C1D and AMM12"

Sending OPA_SRC/C1D/c1d.F90
Sending OPA_SRC/DOM/domcfg.F90
==> Committed revision 4235.

comment:9 Changed 10 years ago by cbricaud

  • Resolution set to fixed
  • Status changed from new to closed

comment:10 Changed 7 years ago by nemo

  • Type changed from Development to Task

Remove 'Development' type

Note: See TracTickets for help on using tickets.