Changeset 13766 for NEMO/branches/2020/dev_12905_xios_ancil/cfgs/ORCA2_ICE_ABL/EXPREF/file_def_nemo-oce.xml

Timestamp:

2020-11-10T12:57:08+01:00 (4 years ago)

Author:

andmirek

Message:

Ticket #2475: merge with trunk rev 13688

Location:

NEMO/branches/2020/dev_12905_xios_ancil

Files:

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

NEMO/branches/2020/dev_12905_xios_ancil

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
 
 # SETTE
-^/utils/CI/sette@HEAD         sette
+^/utils/CI/sette@13559        sette

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
 
 # SETTE
-^/utils/CI/sette@HEAD         sette
+^/utils/CI/sette@13559        sette

NEMO/branches/2020/dev_12905_xios_ancil/cfgs/ORCA2_ICE_ABL/EXPREF/file_def_nemo-oce.xml

@@ -56 +56 @@
      <field field_ref="t_abl" />
      <field field_ref="q_abl" />
+     <field field_ref="uvz1_abl" />
+     <field field_ref="tz1_abl" />
+     <field field_ref="qz1_abl" />
+     <field field_ref="uvz1_dta" />
+     <field field_ref="tz1_dta" />
+     <field field_ref="qz1_dta" />
      <field field_ref="pblh" />
    </file>

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
 
 # SETTE
-^/utils/CI/sette@HEAD         sette
+^/utils/CI/sette@13559        sette