Changeset 4990 for trunk/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/iodef.xml

Timestamp:

2014-12-15T17:42:49+01:00 (9 years ago)

Author:

timgraham

Message:

Merged branches/2014/dev_MERGE_2014 back onto the trunk as follows:

In the working copy of branch ran:
svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
1 conflict in LIM_SRC_3/limdiahsb.F90
Resolved by keeping the version from dev_MERGE_2014 branch
and commited at r4989

In working copy run:
svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_MERGE_2014
to merge the branch into the trunk - no conflicts at this stage.

File:

• trunk/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/iodef.xml (modified) (2 diffs)

trunk/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/iodef.xml

@@ -72 +72 @@
 
    <file id="file3" name_suffix="_grid_U" description="ocean U grid variables" >
-     <field field_ref="suoce"        name="uos"     long_name="sea_surface_x_velocity"    />
+     <field field_ref="ssu"          name="uos"     long_name="sea_surface_x_velocity"    />
      <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity"      />
      <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
@@ -82 +82 @@
    
    <file id="file4" name_suffix="_grid_V" description="ocean V grid variables" >
-     <field field_ref="svoce"        name="vos"     long_name="sea_surface_y_velocity"    />
+     <field field_ref="ssv"          name="vos"     long_name="sea_surface_y_velocity"    />
      <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity"      />
      <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />