Opened 7 years ago

Closed 6 years ago

Last modified 3 years ago

#1179 closed Task (fixed)

Mercator merge 2013

Reported by: cbricaud Owned by: cbricaud
Priority: low Milestone:
Component: OCE Version: release-3.5
Severity: Keywords:
Cc: Review:
MP ready?:
Progress:

Description

  1. create branch

svn copy -r 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_2013
Committed revision 4209.

2.branch to merge in

-time-splitting is not put inside (as discussed).
-1D papa station
-QSR mean for bio when diurnal cycle
-config manager

Commit History (0)

(No commits)

Change History (4)

comment:1 Changed 7 years ago by cbricaud

3. get dev_MERCATOR_2013

svn co svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_MERCATOR_2013 dev_MERCATOR_2013

4.put 1D papa station changes in dev_MERCATOR_2013

4.1 merge changes from rev 4022 to 4119 from trunk into dev_r4022_MERCATOR5_PAPA1D

svn co svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_r4022_MERCATOR5_PAPA1D dev_r4022_MERCATOR5_PAPA1D
svn merge -r 4022:4119 svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk dev_r4022_MERCATOR5_PAPA1D

D dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/ARCH/OLD/arch-PW7_METO.fcm
A dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/ARCH/arch-PW7_METO.fcm
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/NEMO/TOP_SRC/PISCES/trcini_pisces.F90
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/NEMO/SAS_SRC/daymod.F90
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/TOOLS/COMPILE/Fcheck_archfile.sh
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/TOOLS/maketools
U dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/TOOLS/MISCELLANEOUS/chk_iomput.sh

svn ci -m "merge changes from rev 4022 to 4119 from trunk into dev_r4022_MERCATOR5_PAPA1D"
Committed revision 4210.

4.2 put dev_r4022_MERCATOR5_PAPA1D changes in dev_MERCATOR_2013

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

—- Merging r4023 through r4210 into 'dev_MERCATOR_2013/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm':

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

—- Merging r4023 through r4210 into 'dev_MERCATOR_2013':

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

—- Merging r4023 through r4210 into 'dev_MERCATOR_2013/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm':

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

—- Merging r4023 through r4210 into 'dev_MERCATOR_2013':
U dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
U dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90
U dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90
U dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
A dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/par_C1D_PAPA.h90
U dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
U dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90
U dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/par_oce.F90
U dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90
U dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90
U dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90
U dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90
U dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90
U dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
U dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
U dev_MERCATOR_2013/NEMOGCM/NEMO/TOP_SRC/PISCES/trcini_pisces.F90
U dev_MERCATOR_2013/NEMOGCM/TOOLS/MISCELLANEOUS/chk_iomput.sh
U dev_MERCATOR_2013/NEMOGCM/TOOLS/COMPILE/Fcheck_archfile.sh
U dev_MERCATOR_2013/NEMOGCM/TOOLS/maketools
—- Merging r4023 through r4210 into 'dev_MERCATOR_2013/NEMOGCM/CONFIG/cfg.txt':

U dev_MERCATOR_2013/NEMOGCM/CONFIG/cfg.txt

—- Merging r4023 through r4210 into 'dev_MERCATOR_2013':
A dev_MERCATOR_2013/NEMOGCM/CONFIG/C1D_PAPA
A dev_MERCATOR_2013/NEMOGCM/CONFIG/C1D_PAPA/EXP00
A dev_MERCATOR_2013/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist
A dev_MERCATOR_2013/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_ice
A dev_MERCATOR_2013/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_ice_lim2
A dev_MERCATOR_2013/NEMOGCM/CONFIG/C1D_PAPA/EXP00/field_def.xml
A dev_MERCATOR_2013/NEMOGCM/CONFIG/C1D_PAPA/EXP00/domain_def.xml
A dev_MERCATOR_2013/NEMOGCM/CONFIG/C1D_PAPA/EXP00/iodef.xml
A dev_MERCATOR_2013/NEMOGCM/CONFIG/C1D_PAPA/cpp_C1D_PAPA.fcm

U dev_MERCATOR_2013

svn ci -m "put dev_r4022_MERCATOR5_PAPA1D changes in dev_MERCATOR_2013"
Committed revision 4211.

comment:2 Changed 7 years ago by cbricaud

5. put dev_rev4119_MERCATOR4_CONFMAN in dev_MERCATOR_2013

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

—- Merging r4120 through r4213 into 'dev_MERCATOR_2013':
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/README
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/cfg
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/cfg/variable.cfg
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/Doxyfile
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/merge_bathy.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/create_coord.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/create_bathy.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/multi.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/mpp.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/iom_mpp.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/iom_cdf.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/global.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/interp.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/attribute.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/extrap.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/create_boundary.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/create_restart.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/domain.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/phycst.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/vgrid.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/iom_rstdimg.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/date.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/logger.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/file.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/boundary.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/iom.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/grid.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/function.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/filter.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/dimension.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/kind.f90
A dev_MERCATOR_2013/NEMOGCM/TOOLS/SIREN/src/variable.f90

Committed revision 4214.

comment:3 Changed 6 years ago by cbricaud

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

comment:4 Changed 3 years ago by nemo

  • Type changed from Development to Task

Remove 'Development' type

Note: See TracTickets for help on using tickets.