Timeline


and

matching tags

2016-01-21:

21:11 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clevy
(diff)
21:11 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clevy
(diff)
18:29 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by till
(diff)
18:29 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by till
(diff)
18:16 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by laurent
(diff)
18:10 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by laurent
(diff)
16:38 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clevy
(diff)
16:35 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clevy
(diff)
15:02 Developers edited by nicolasmartin
(diff)
14:39 Changeset [6268] by jpalmier

JPALM — 21-01-2016 — fix ideal-tracer bug - mispelled the iom_varid variable called

12:05 Changeset [6267] by timgraham

Branch to setup a GYRE test (based on SETTE) to be used for HPC benchmarking

09:51 Ticket #1666 (coupling with land-only sub-domains) created by emalod
NEMO cannot be coupled with atmosphere when 'land-only' subdomains are …

2016-01-20:

17:22 Developers edited by nicolasmartin
(diff)
15:46 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by acc
(diff)
14:46 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by timgraham
(diff)
12:49 Changeset [6266] by frrh

Change the executable name expected by OASIS

12:42 Changeset [6265] by frrh

Remove SVN keywords and properties.

12:40 Changeset [6264] by frrh

Create clean version of toyoce coupled component name change branch relative to
NEMO version 3.6 to avoid nasties caused by apparent fcm clashes when using
existing versions of this branch.

12:24 Changeset [6263] by frrh

Merge branches/UKMO/icebergs_latent_heat [5808:5821]

2016-01-19:

14:18 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by anw
(diff)
12:08 Changeset [6262] by frrh

Changes to facilitate testing of MEDUSA coupling field exchange.

2016-01-18:

16:49 Changeset [6261] by jpalmier

JPALM — 18-01-2016 — bugfix MEDUSA-TOP by calling lbc_lnk(trn) and (trb) before advection

01:53 2016WP/2016Shared Actions edited by nicolasmartin
(diff)
01:41 2016WP/2016Shared Actions edited by nicolasmartin
(diff)
01:00 2016WP/2016Shared Actions edited by nicolasmartin
(diff)

2016-01-17:

18:35 Changeset [6260] by hadcv
  • Fix an uninitialized variable
  • Remove some reference statements from field_def.xml file; these variables did not always get overwritten by their intended data.
10:49 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clevy
(diff)

2016-01-15:

18:43 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clevy
(diff)
16:47 Changeset [6259] by jpalmier

JPALM —15-01-2016 — bugfix lbc_lnk before trcadv is called

16:12 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by acc
(diff)
16:05 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by alexmegann
(diff)
15:58 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by joel69
(diff)
15:12 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by ayool
remove Julien Palmieri; he is unable to make the meeting (diff)
15:09 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by ayool
add name to list (diff)
13:11 Changeset [6258] by timgraham

First inclusion of Laurent Debreu's modified code for vertical refinement.
Still a lot of outstanding issues:
1) conv preprocessor fails for limrhg.F90 at the moment (for now I've run without ice model)
2) conv preprocessor fails for STO code - removed this code from testing for now
3) conv preprocessor fails for cpl_oasis.F90 - can work round this by modifying code but the preprocessor should be fixed to deal with this.

After that code compiles and can be run for horizontal grid refinement. Not yet working for vertical refinement.

12:05 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clevy
(diff)
11:22 Changeset [6257] by frrh

cpl_prism_snd is now called cpl_snd. Correct name.

10:59 Changeset [6256] by frrh

Add some TEMPORARY code to facilitate testing MEDUSA coupling
interface fields with UM atmosphere.

10:51 Changeset [6255] by frrh

Commit our MEDUSA coupling interface changes.

NOTE: These are not robust enough to be viewed as
anything other than an initial development to facilitate
atmos-ocean coupler interface testing.

In particular the use of "magic numbers" to point to
MEDUSA tracer fields is not a viable long term solution.

10:26 Ticket #1665 (bug in domzgr.F90 if horizontal mesh is an f-plane (jphgr_msh = 2) and ...) created by flavoni
Correction applied in domzgr.F90: […] is not correct in the case of …
09:55 Ticket #1664 (dimensions were reversed in XIOS1) closed by clevy
wontfix: This probably is a solution, but is very probably not the sustainable way …
09:35 Changeset [6254] by frrh

Merge branches/UKMO/dev_r5107_hadgem3_mct@5679 (not 5631 as used in
original GO6.1 which I was supplied with! This has extra, meaningful,
error trapping in place of the original inappropriate use of "STOP"
which is useless in the context of coupled models.

Again merging this branch proved far more awkward than it should
be with spurious claims of conflicts in various irrelevant files
in NEMOGCM/ARCH/ and DOC/TexFiles which I reverted before committing.

2016-01-14:

19:22 Changeset [6253] by emanuelaclementi

#1643 : Changes after review phase, thanks to Rachid Benshila

17:48 Ticket #1664 (dimensions were reversed in XIOS1) created by lambertn
Since the revision 713 in XIOS1 …
13:27 Changeset [6252] by frrh

Merge branches/UKMO/dev_r5107_hadgem3_cplseq@5646

Again this was not at all straightforward because it reported
conflicts in:
DOC/TexFiles/Chapters/Chap_STO.tex
DOC/TexFiles/Namelist/namcfg_orca1
and
DOC/TexFiles/Namelist/namsbc_isf

I dont care about those for the purposes of this so I've run
fcm conflicts and in each case selected (y) to "accept the local delete"!

13:18 Changeset [6251] by frrh

Merge fcm:NEMO.xm/branches/UKMO/dev_r5107_hadgem3_cplfld@5592

This is a total nightmare because
a) this branch contains an entire copy of the trunk and
b) the svn keyword deletion is not the first change in the branch
c) we have to be VERY careful about what revisions we include - we dont want the
last one!

13:03 Changeset [6250] by frrh

Merge rev 5677 to 5797 of branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice
This completes the inclusion of
branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice@5797

13:00 Changeset [6249] by frrh

Merge in

rev 5662:5668 from branches/UKMO/dev_r5518_CICE_coupling_GSI7_GSI8
since we HAVE to do this before we can merge in
branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice
because that is a branch of a branch and directly tryingto merge
that will make a complete mess of things.

12:47 Changeset [6248] by frrh

Package branch created from
fcm:NEMO.xm/branches/UKMO/nemo_v3_6_STABLE_copy@5783

11:23 Developers/Developing Code Changes edited by clevy
(diff)
11:18 Developers/Developing Code Changes edited by clevy
(diff)
11:05 Developers/Developing Code Changes edited by clevy
(diff)
10:38 Developers/Developing Code Changes edited by clevy
(diff)

2016-01-13:

18:33 Changeset [6247] by jpalmier

JPALM — 13-01-2016 — MEDUSA debugg

18:11 Changeset [6246] by jpalmier

JPALM — 13-01-2016 — MEDUSA debugg

17:54 2016WP/INGV_2016 edited by emanuelaclementi
(diff)
17:51 2016WP/2016Shared Actions edited by emanuelaclementi
(diff)
17:41 2016WP/INGV_2016 edited by emanuelaclementi
(diff)
17:40 Changeset [6245] by jpalmier

JPALM — 13-01-2016 — MEDUSA debugg

17:31 Changeset [6244] by jpalmier

JPALM — 13-01-2016 — MEDUSA debugg

17:25 Changeset [6243] by kingr

Corrected the writing of the asssim backgroud - added avt, removed gcx.

17:02 Changeset [6242] by davestorkey

UKMO/dev_r5107_xios_initialize_toyoce branch. Clear SVN keywords (because some appear to have been switched on again by accident in previous updates).

16:55 Changeset [6241] by jpalmier

JPALM — 13-01-2016 — MEDUSA debugg

16:36 Changeset [6240] by jpalmier

JPALM — 13-01-2016 — clean svn_key

15:59 Changeset [6239] by jpalmier

JPALM — 13-01-2016 — put OPA/TRD/trdtrc.F90 under not defined key_top cpp_key to avoid conflict with TOP/TRP/trdtrc.F90

15:49 Changeset [6238] by davestorkey

Cosmetic changes to UKMO/dev_r5021_nn_etau_revision branch to make compatible with latest version of nemo_v_3_6_STABLE branch (rev 6228).

15:47 Changeset [6237] by davestorkey

Update UKMO/nemo_v_3_6_STABLE_copy branch to revision 6228 of nemo_v_3_6_STABLE.
NB. Involved copying in new AGRIF directory (because that is what was done in the nemo_v_3_6_STABLE branch) so some continuity lost.
Custom merge into /branches/UKMO/nemo_v3_6_STABLE_copy/NEMOGCM: r6228 cf. r5767 of /branches/2015/nemo_v3_6_STABLE/NEMOGCM@6231

15:17 Changeset [6236] by kingr

Corrected a few namelist logicals missing the trailing fullstop (false. → .false.

15:00 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clevy
(diff)
14:48 Changeset [6235] by jpalmier

new branch identical to the trunck for debugging

14:36 Changeset [6234] by jpalmier

JPALM — 13-01-2016 — add trn and tra stat print statement

2016-01-12:

19:42 Changeset [6233] by jpalmier

JPALM — 12-01-2016 — set sbc_???_b to 0.0 at the restart. sbc values very strange in the restart, check first if it causes the pb

17:55 2016WP/2016Shared Actions edited by cetlod
(diff)
17:25 Changeset [6232] by lovato

Fix for ticket #1645 (and update CMCC xios arch file)

11:51 Changeset [6231] by aumont

update PISCES QUOTA to its latest version

11:45 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clevy
(diff)
10:45 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clevy
(diff)
10:00 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clevy
(diff)
09:58 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clevy
(diff)

2016-01-11:

17:14 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by vancop
(diff)
15:23 Changeset [6230] by jpalmier

JPALM —11-01-2016 — MEDUSA debugg

14:46 2016WP edited by cholod
(diff)
13:11 Changeset [6229] by jpalmier

JPALM —11-01-2016 — MEDUSA debugg

12:38 2016WP/2016Shared Actions edited by timgraham
(diff)
11:15 Changeset [6228] by mathiot

Fix for ticket #1663

11:13 Ticket #1663 (restartability issue if ln_isfdiv = false) created by mathiot
Ice shelf not restartable if ln_isfdiv = false with vvl.
09:32 Ticket #1662 (Bug in the slope limitation in ISF case (v3.6_stable & trunk)) created by gm
It seems to me that, in ldfslp.F90, the tapering of the iso-neutral slope …
08:51 Ticket #1661 (BUG in triad slope (trunk, not v3.6 stable)) created by gm
the line 473 in ldfslp.F90 of the trunk version: […] should be replaced …

2016-01-10:

22:33 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by gmainsant
(diff)

2016-01-08:

17:15 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by valcke
(diff)
16:03 2016WP/CNRS_2016 edited by flavoni
(diff)
15:59 2016WP/CNRS_2016 edited by flavoni
(diff)
15:53 2016WP/INGV_2016 edited by emanuelaclementi
(diff)
15:51 Working Groups/Wave Coupling edited by emanuelaclementi
(diff)
15:46 2016WP/INGV_2016 edited by emanuelaclementi
(diff)
15:42 2016WP/INGV_2016 edited by emanuelaclementi
(diff)
15:36 2016WP/INGV_2016 edited by emanuelaclementi
(diff)
15:23 2016WP/CNRS_2016 edited by flavoni
(diff)
15:22 2015WP/2015Action_institutions_INGV edited by emanuelaclementi
(diff)
13:19 Changeset [6227] by jpalmier

JPALM — 08-01-2016 — MEDUSA debugg

13:04 Changeset [6226] by jpalmier

JPALM — 08-01-2016 — debugg

10:35 Changeset [6225] by jamesharle

Update MPP_BDY_UPDATE branch to be consistent with head of trunk

2016-01-07:

18:11 Ticket #1660 (sette_xios.sh now tests the XIOS2.0 interface but changes are required to ...) closed by acc
fixed
18:02 Changeset [6224] by acc

Branch 2015/nemo_v3_6_STABLE; ticket #1660. Changes required to return full functionality to sette_xios.sh tests which are now targeted at XIOS 2.0 versions. Changes include a new sette_rpt.sh script to summarise sette and sette_xios results even if different arch files are used for the two sets of tests

17:57 Ticket #1660 (sette_xios.sh now tests the XIOS2.0 interface but changes are required to ...) created by acc
The nemo_v3_6_stable SETTE/sette_xios.sh script is now intended to test …
17:31 2016WP/2016Shared Actions edited by flavoni
(diff)
17:27 2016WP/CNRS_2016 edited by flavoni
(diff)
17:21 2016WP/CNRS_2016 edited by flavoni
(diff)
16:48 Changeset [6223] by jpalmier

JPALM — 07-01-2016 — add debugg print statements

16:13 Changeset [6222] by timgraham

Reinstate TRUSTING directory as it was accidentally deleted at r6140.

15:33 2016WP/2016Shared Actions edited by diovino
(diff)
15:24 2016WP/2016Shared Actions edited by diovino
(diff)
15:22 2016WP/2016Shared Actions edited by diovino
(diff)
15:04 2016WP/2016Shared Actions edited by diovino
(diff)
15:01 2016WP/CMCC_2016 edited by diovino
(diff)
14:29 2016WP/2016Shared Actions edited by nicolasmartin
(diff)
13:57 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by diovino
(diff)
12:52 2016WP/2016Shared Actions edited by timgraham
(diff)
12:36 2016WP/2016Shared Actions edited by nicolasmartin
(diff)
12:11 2016WP/Met_Office_2016 edited by timgraham
(diff)
11:39 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clem
(diff)
11:10 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by flavoni
(diff)

2016-01-06:

18:30 Changeset [6221] by jpalmier

JPALM — 06-01-2016 — debugg - silly forgetting…

17:52 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by cetlod
(diff)
17:21 Changeset [6220] by jpalmier

JPALM — 06-01-2016 — debugg CFC diag-restart reading and writing

17:02 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clevy
(diff)
17:01 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clevy
(diff)
16:39 Changeset [6219] by hadcv

Quick fix to omit the iso-layer calculation when rn_iso_frac = 0.

The finite-difference part of the iso-layer calculation currently has the following bugs:

  • Only the first subsequent level beneath the iso-layer is considered
  • If z(ik_iso) < rn_zref, the interpolation can result in a MLD shallower than rn_zref
14:31 Changeset [6218] by jpalmier

JPALM — 06-01-2016 — add debbug statements

14:09 Changeset [6217] by jpalmier

JPALM — 06-01-2016 — add debbug statements

13:52 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by aumont
(diff)
13:03 2016WP/Met_Office_2016 edited by mathiot
(diff)
12:39 2016WP/2016Shared Actions edited by mocavero
(diff)
12:38 2016WP/CMCC_2016 edited by mocavero
(diff)
11:07 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by cbricaud
(diff)
10:58 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by clevy
(diff)

2016-01-05:

18:21 Changeset [6216] by jpalmier

JPALM — 05-01-2016 — IDTRA timing checks

17:24 Changeset [6215] by kingr

Cleared SVN keywords.

17:08 Changeset [6214] by kingr

Removed small bugfixes from diaobs as they were causing merge conflicts with Gen Obs Oper? branch.

16:54 Changeset [6213] by jpalmier

JPALM — 05-01-2016 — Unexpected problem appears in monsoon merged NEMO-CFC-IDTRA restarts that does not appear in this branch allone. CFC restart diag is empty. try to avoid this problem by moving diag CFC and IDTRA by writing theses in the main trcrst modules — should check full merged model diff with this branch

16:50 Changeset [6212] by kingr

Added avt variable to assim bkg.

16:33 Changeset [6211] by kingr

Branch to add avx to assim bkg to work with NEMOVAR

15:30 2016WP/CMCC_2016 edited by sciliberti
(diff)
15:28 2016WP/Met_Office_2016 edited by timgraham
(diff)
14:39 Changeset [6210] by acc

Add IRISHSEA unsupported configuration details to uspcfg.txt to enable easier development of the wetting and drying option (trunk only)

13:06 2016WP/2016Shared Actions edited by mocavero
(diff)
13:05 2016WP/CMCC_2016 edited by mocavero
(diff)
12:58 2016WP/CMCC_2016 edited by mocavero
(diff)
12:56 2016WP/CMCC_2016 edited by mocavero
(diff)
12:55 2016WP/2016Shared Actions edited by mocavero
(diff)
12:36 2016WP/2016Shared Actions edited by mocavero
(diff)
12:26 2016WP/2016Shared Actions edited by mocavero
(diff)
10:42 Ticket #1659 (Out of bounds array in trdmxl.F90) closed by timgraham
fixed: Fixed in nemo_v3_6_STABLE at r6208 Fixed in trunk at r6209
10:41 Changeset [6209] by timgraham

Fix for ticket #1659

10:36 Changeset [6208] by timgraham

Fix for ticket #1659

10:07 Ticket #1659 (Out of bounds array in trdmxl.F90) created by timgraham
In trdmxl.F90 ztmltrd2 and zsmltrd2 are allocated as follows where …

2016-01-04:

19:14 Changeset [6207] by jpalmier

JPALM — 04-01-2016 — debugg Idtra sms

16:55 Changeset [6206] by jpalmier

JPALM — 04-01-2016 — add Idtra restart diadnostics reading

14:48 Changeset [6205] by cetlod

Putting correct domain_def.xml for xios2 in GYRE_XIOS configuration

14:47 Changeset [6204] by cetlod

back the nemo_v3_6_STABLE_XIOS2 branch into 3_6_STABLE, including bugfixes, XIOS2 and new AGRIF

14:28 Changeset [6203] by frrh

Commit having cleared out SVN updating and keywords by running:
svn propdel svn:keywords . -R
and
~frsy/bin/clear_svn_keywords.sh

14:25 Changeset [6202] by frrh

Test merge

14:06 Changeset [6201] by jpalmier

JPALM — 04-01-2016 — add debugg prints under debugg_key

12:10 2016WP/CMCC_2016 edited by sciliberti
(diff)
11:49 Changeset [6200] by frrh

Merge in branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice@5797
and MY medusa interface, resolve conflicts in sbccpl and, mysteriously
in sbcice_cice.F90 which frankly should not occur since I am doing nothing in
here!

11:30 Changeset [6199] by frrh

Merge the bug fix applied to dev_r5107_hadgem3_cplfld at rev 5592.

11:27 Changeset [6198] by frrh

Medusa couple interface test

11:02 Changeset [6197] by frrh

Test package branch to include medusa coupling interface.

10:31 Changeset [6196] by frrh

Remove mysterious "trunk" content which seems to have appeared for
reasons unknown.

09:53 2016WP/2016Shared Actions/Workshop_NEMO_in_CMIP6 edited by aurore.voldoire
(diff)

2015-12-31:

16:59 Changeset [6195] by frrh

Merge in medusa interface branch:
branches/UKMO/dev_r5518_medusa_cpl_rh [6168:6171]

16:44 Changeset [6194] by frrh

Merge in branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice [5678:6023]

16:24 Changeset [6193] by frrh

Package branch for medusa interface - best we can do at the moment is branch
from a branch!

15:55 Changeset [6192] by kingr

Updated namelist_ref to remove dobsini and dobsend which hard-wired the run dates for the obsoper.

15:51 Changeset [6191] by kingr

Branch to remove assumed run dates in ref namelist

14:36 Changeset [6190] by frrh

Package test

14:14 Changeset [6189] by frrh

Initial branch setup

14:11 Changeset [6188] by frrh

Test Medusa interface

13:41 Changeset [6187] by frrh

Defunct branch

13:39 Changeset [6186] by frrh

Defunct branch

13:38 Changeset [6185] by frrh

Defunct branch

13:32 Changeset [6184] by frrh

Check out and remove svn keyword updating

13:29 Changeset [6183] by frrh

Medusa coupling interface package branch to about annoying conflicts from
the (far too) many (and thus increasingly unmanageable) GO6 NEMO branches.

13:16 Changeset [6182] by frrh

Delete SVN updating keywords for this branch

12:38 Changeset [6181] by frrh

Add my MEDUSA coupling code

12:34 Changeset [6180] by frrh

Merge in dev_r5107_hadgem3_cplfld up to revision 5592 to act as baseline for
package branch and merging in other necessary branches to resolve conflicts.

12:29 Changeset [6179] by frrh

Package for medusa coupling

11:00 2016WP/CMCC_2016 edited by sciliberti
(diff)
10:41 2016WP/CMCC_2016 edited by sciliberti
(diff)

2015-12-30:

12:55 Changeset [6178] by frrh

Initial mergs of my branch

12:35 Changeset [6177] by frrh

Package branch to manually resolve clashes in the myriad eORCA1 GO6
branches when trying to implement MEDUSA coupling.

10:52 2016WP/CMCC_2016 edited by lovato
(diff)

2015-12-29:

16:06 Changeset [6176] by kingr

Commented out CICE to NEMO variable which break fcm build

15:48 Changeset [6175] by kingr

Possible fix for wroung dimension variables passed between NEMO and CICE.

2015-12-28:

20:41 Changeset [6174] by jpalmier

JPALM —28-12-2015— cleaning2 - MEDUSA

20:09 Changeset [6173] by jpalmier

JPALM —28-12-2015— cleaning

2015-12-24:

17:32 Changeset [6172] by kingr

CICE variable declarations to use with key_asminc.

17:28 Changeset [6171] by frrh

Add MEDUSA coupling interface code. Much of this is temporary and needs further
attention, e.g. for development purposes we allocate temporarry receiving
arrays and we also currently feature the original "magic number"
approach to identifying output fields which must not be allowed to
be a permanent solution and in any case should not get past a code review.

17:15 Changeset [6170] by kingr

Adding CICE key_asminc bugfixes to branch of branch to avoid merge conflicts

16:55 Changeset [6169] by kingr

Trying to resolve merge conflicts

16:44 Changeset [6168] by frrh

Initial branch creation and removal of svn keywords.

16:33 Changeset [6167] by frrh

Branch for developments to facilitate MEDUSA coupling via OASIS3-MCT
particularly with a view to enable coupling with The Met Office
UM in the context of UKESM.

16:20 Changeset [6166] by kingr

More CICE variable declarations to use with key_asminc.

15:31 Ticket #1658 (Cater for MEDUSA coupling) created by frrh
Cater for coupling of MEDUSA fields via OASIS3-MCT, specifically with a …

2015-12-23:

20:23 Changeset [6165] by mocavero

un,vn allocation, see ticket #1615

18:42 Changeset [6164] by jpalmier

JPALM — 23-12-2015 — 1_ adapt CFC in MEDUSA branch - now Working properly 2_ add diagnostics to Ideal tracer

16:35 Changeset [6163] by kingr

Cleared svn keywords

15:42 Changeset [6162] by kingr

Bugfix to delare CICE variables when key_asminc used.

15:30 Changeset [6161] by kingr

Bug fix to get CICE working with asminc key

2015-12-22:

17:17 Ticket #1657 (Bibliography corrections) created by vi7Slitt
There seem to be bibliographic syntax errors in two files. The patch …
15:32 Changeset [6160] by jpalmier

JPALM — 22-12-2015 — adapt trc restart name with the good date

14:58 Changeset [6159] by timgraham

Merged head of nemo_v3_6_STABLE branch back in to this branch to pick up bug fixes added there

14:52 Changeset [6158] by timgraham

Putting correct domain_def.xml file back

14:52 Changeset [6157] by timgraham

Temporary commit to reinstate correct domain_def.xml file

14:24 Changeset [6156] by timgraham

Merged in dev_agrif_v3_6_STABLE

14:13 Changeset [6155] by jpalmier

JPALM — 22-12-2015 — add more print statement for restart writing checkings

13:28 2015WP/2015Shared Actions edited by timgraham
(diff)
12:59 Changeset [6154] by jpalmier

JPALM — 22-12-2015 — add more print statement for restart writing checkings

11:19 Changeset [6153] by timgraham

Final commit to make sure merge info is correct before putting into XIOS2 branch

Note: See TracTimeline for information about the timeline view.