Changeset 10663 for NEMO/branches/2019/fix_ticket2228/cfgs/SHARED/field_def_nemo-oce.xml

Timestamp:

2019-02-12T19:54:50+01:00 (5 years ago)

Author:

mathiot

Message:

update branch to the head of the trunk (r10647)

Location:

NEMO/branches/2019/fix_ticket2228

Files:

• . (modified) (1 prop)
• cfgs/SHARED/field_def_nemo-oce.xml (modified) (1 diff)

NEMO/branches/2019/fix_ticket2228

@@ -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_ticket2228/cfgs/SHARED/field_def_nemo-oce.xml

@@ -975 +975 @@
 
     <field_group id="25h_grid_W" grid_ref="grid_W_3D" operation="instant">
-      <field id="vomecrtz25h"         name="k current 25h mean"                 unit="m/s"      />
+      <field id="vovecrtz25h"         name="k current 25h mean"                 unit="m/s"      />
       <field id="avt25h"              name="vertical diffusivity25h mean"       unit="m2/s" />
       <field id="avm25h"              name="vertical viscosity 25h mean"        unit="m2/s" />

@@ -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