Merge lp:~wence/fluidity/fix-schema into lp:fluidity

[Lawrence Mitchell]

Fix up adaptivity_schema so it is valid relax-ng. Fixes lp:814667.

Cian originally approved, but the branch broke geostrophic_interpolation_gp. I've now fixed up the flml as well for the new format.

[Cian Wilson (cwilson)]

Looks good to me.

review: Approve

[Patrick Farrell (pefarrell)]

a) With this change, does jing work?

b) Grep the flmls for which tests use prescribed adaptivity; do they still pass after this change?

[Patrick Farrell (pefarrell)]

Oh, sorry, you said it fixes lp:814667.

[Cian Wilson (cwilson)]

> a) With this change, does jing work?
>
> b) Grep the flmls for which tests use prescribed adaptivity; do they still
> pass after this change?

Good point...
geostrophic_interpolation_gp/balanced.flml
needs to be updated.

[Lawrence Mitchell (wence)]

> a) With this change, does jing work?

fixes lp:814667, so yes, this does work

> b) Grep the flmls for which tests use prescribed adaptivity; do they still
> pass after this change?

Probably not, since I didn't do this. But now it is friday, so I will wait til monday

[Lawrence Mitchell (wence)]

> > a) With this change, does jing work?
>
> fixes lp:814667, so yes, this does work
>
> > b) Grep the flmls for which tests use prescribed adaptivity; do they still
> > pass after this change?
>
> Probably not, since I didn't do this. But now it is friday, so I will wait
> til monday

I've now fixed up geostrophic_balanced_gp/balanced.flml in line with the schema change. All other prescribed_adaptivity elements in the tree don't use the from_file option.

[Cian Wilson (cwilson)]

Looks good. I've set up a buildbot branch at:
http://buildbot-ocean.ese.ic.ac.uk:8080/waterfall?show=x86_64-fix-schema-gcc4
just in case (as I missed the test cases last time).

Once that passes, then I've got no problems but I'm not sure what the current freeze policy is... this is a bug fix but not for any of the failing tests.

review: Approve

[lp:~wence/fluidity/fix-schema]

3551. By Jon Hill on 2011-08-08

Fix for the failing flredecomp test. Probably better ways to fix this long term, but this will suffice for now

3552. By Cian Wilson on 2011-08-09

Bugfix pointed out by hhiester. cv_stats were not parallel safe.

3553. By Tim Bond on 2011-08-10

Small bufix targetting bug:

   https://bugs.launchpad.net/fluidity/+bug/823966

swapping the order of the parmetis and zoltan checks in configure.in
to fix a linking bug using gcc 4.6 on oneiric.

3554. By Tim Bond on 2011-08-10

Reverting 3553; this fixes 4.6 but breaks Intel 10, and the latter is more
important to us at the moment.

3556. By Lawrence Mitchell on 2011-08-10

Update flml for geostrophic_interpolation_gp in light of new schema

=== modified file 'assemble/Adapt_State_Prescribed.F90'
--- assemble/Adapt_State_Prescribed.F90	2010-11-09 14:08:19 +0000
+++ assemble/Adapt_State_Prescribed.F90	2011-08-11 10:04:22 +0000
@@ -107,7 +107,7 @@
     ewrite(2, *) "New mesh name: " // trim(mesh_name)
     
     if(have_option(base_path // "/mesh/from_file")) then
-      call get_option(base_path // "/mesh/from_file/format", format)
+      call get_option(base_path // "/mesh/from_file/format/name", format)
       call get_option("/geometry/quadrature/degree", quad_degree)
           
       new_positions = read_mesh_files(mesh_name, quad_degree = quad_degree)

=== modified file 'schemas/adaptivity_options.rnc'
--- schemas/adaptivity_options.rnc	2011-03-31 07:29:11 +0000
+++ schemas/adaptivity_options.rnc	2011-08-11 10:04:22 +0000
@@ -1186,7 +1186,7 @@
                (
                   ## Input mesh file format.
                   element format {
-                     "triangle",
+                     attribute name {"triangle"},
                      comment
                   }
                ),

=== modified file 'schemas/adaptivity_options.rng'
--- schemas/adaptivity_options.rng	2011-03-31 07:29:11 +0000
+++ schemas/adaptivity_options.rng	2011-08-11 10:04:22 +0000
@@ -1404,7 +1404,9 @@
 system state.</a:documentation>
             <element name="format">
               <a:documentation>Input mesh file format.</a:documentation>
-              <value>triangle</value>
+              <attribute name="name">
+                <value>triangle</value>
+              </attribute>
               <ref name="comment"/>
             </element>
             <ref name="comment"/>

=== modified file 'tests/geostrophic_interpolation_gp/balanced.flml'
--- tests/geostrophic_interpolation_gp/balanced.flml	2010-11-21 15:41:35 +0000
+++ tests/geostrophic_interpolation_gp/balanced.flml	2011-08-11 10:04:22 +0000
@@ -478,7 +478,7 @@
           </python>
         </name>
         <from_file>
-          <format>triangle</format>
+          <format name="triangle"/>
         </from_file>
       </mesh>
     </prescribed_adaptivity>