Changeset 10689 for NEMO/branches/2019/fix_ticket2229/cfgs/AMM12/EXPREF/file_def_nemo-oce.xml

Timestamp:

2019-02-15T14:55:37+01:00 (5 years ago)

Author:

mathiot

Message:

update branch to the head of the trunk r10688 (ticket #2229)

Location:

NEMO/branches/2019/fix_ticket2229

Files:

• . (modified) (1 prop)
• cfgs/AMM12/EXPREF/file_def_nemo-oce.xml (modified) (1 diff)

NEMO/branches/2019/fix_ticket2229

@@ -1 @@
-^/utils/build/arch        arch
-^/utils/build/makenemo    makenemo
-^/utils/build/mk          mk
-^/utils/tools             tools
-^/vendors/AGRIF/dev       ext/AGRIF
-^/vendors/FCM             ext/FCM
-^/vendors/IOIPSL          ext/IOIPSL
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL

@@ -1 @@
-^/utils/build/arch        arch
-^/utils/build/makenemo    makenemo
-^/utils/build/mk          mk
-^/utils/tools             tools
-^/vendors/AGRIF/dev       ext/AGRIF
-^/vendors/FCM             ext/FCM
-^/vendors/IOIPSL          ext/IOIPSL
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL

NEMO/branches/2019/fix_ticket2229/cfgs/AMM12/EXPREF/file_def_nemo-oce.xml

@@ -67 +67 @@
 
      <file id="file15" name_suffix="_25hourm_grid_W" description="ocean W grid variables, 25h meaned" enabled=".TRUE." >
-     <field field_ref="vomecrtz25h"          name="vomerctz"  operation="instant" enabled=".TRUE."/>
-     <field field_ref="woce"                 name="vovecrtz"  operation="instant" enabled=".TRUE."/>
+     <field field_ref="vovecrtz25h"          name="vovecrtz"  operation="instant" enabled=".TRUE."/>
      <field field_ref="avt25h"               name="votkeavt"  operation="instant" enabled=".TRUE."/>
      <field field_ref="avm25h"               name="votkeavm"  operation="instant" enabled=".TRUE."/>

@@ -1 @@
-^/utils/build/arch        arch
-^/utils/build/makenemo    makenemo
-^/utils/build/mk          mk
-^/utils/tools             tools
-^/vendors/AGRIF/dev       ext/AGRIF
-^/vendors/FCM             ext/FCM
-^/vendors/IOIPSL          ext/IOIPSL
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL