Changeset 7965 for branches/UKMO/dev_r5518_GO6_missing_STABLE_revs/NEMOGCM/CONFIG/SHARED/field_def.xml

Timestamp:

2017-04-25T13:18:30+02:00 (7 years ago)

Author:

frrh

Message:

Merge missing swathe of revisions from nemo_v3_6_STABLE: Revisions 6449-6477 inclusive

Command:
svn merge -r6424:6477 \u200b\u200bsvn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2015/nemo_v3_6_STABLE/NEMOGCM

We then have to resolve conflicts manually in TOOLS/SIREN/src/docsrc
due to missing files in this location and the moving of Doxyfile from
TOOLS/SIREN/src to TOOLS/SIREN.

File:

• branches/UKMO/dev_r5518_GO6_missing_STABLE_revs/NEMOGCM/CONFIG/SHARED/field_def.xml (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_missing_STABLE_revs/NEMOGCM/CONFIG/SHARED/field_def.xml

@@ -302 +302 @@
          <field id="emp_x_sst"    long_name="Concentration/Dilution term on SST"                                                                                              unit="kg*degree_C/m2/s" />
          <field id="emp_x_sss"    long_name="Concentration/Dilution term on SSS"                                                                                              unit="kg*0.001/m2/s" />        
+         <field id="rnf_x_sst"    long_name="Runoff term on SST"                                                                                                              unit="kg*degC/m2/s" />
+         <field id="rnf_x_sss"    long_name="Runoff term on SSS"                                                                                                              unit="kg*1e-3/m2/s" />
        
          <field id="iceconc"      long_name="ice concentration"                                            standard_name="sea_ice_area_fraction"                              unit="%"            />