<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE testproblem SYSTEM "regressiontest.dtd">

<testproblem>
  <name>sw_kelvin_wave</name>
  <owner userid="colin"/>
  <tags>swml</tags>
  <problem_definition length="medium" nprocs="1">
    <command_line>shallow_water -v 3 kelvin_wave.swml &amp;&gt; sw.log</command_line>
    <!-- Kelvin wave test case -->
  </problem_definition>
  <variables>
    <variable name="Denergy" language="python">
from fluidity_tools import stat_parser
s = stat_parser("kelvin_wave.stat")
energy0 = s["LinearEnergy1"]["Value"][0]
energy1 = s["LinearEnergy1"]["Value"][-1]
print energy0,energy1
Denergy = abs(energy1-energy0)/energy0
    </variable>
  </variables>
  <pass_tests>
    <test name="Energy conservation" language="python">
assert Denergy &lt; 1e-5
    </test>
  </pass_tests>
  <warn_tests>
  </warn_tests>
</testproblem>

<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE testproblem SYSTEM "regressiontest.dtd">

<testproblem>
  <name>sw_kelvin_wave</name>
  <owner userid="colin"/>
  <tags>swml</tags>
  <problem_definition length="medium" nprocs="1">
    <command_line>shallow_water -v 3 kelvin_wave.swml &amp;&gt; sw.log</command_line>
    <!-- Kelvin wave test case -->
  </problem_definition>
  <variables>
    <variable name="Denergy" language="python">
from fluidity_tools import stat_parser
s = stat_parser("kelvin_wave.stat")
energy0 = s["LinearEnergy"]["Value"][0]
energy1 = s["LinearEnergy"]["Value"][-1]
print energy0,energy1
Denergy = abs(energy1-energy0)/energy0
    </variable>
  </variables>
  <pass_tests>
    <test name="Energy conservation" language="python">
assert Denergy &lt; 1e-5
    </test>
  </pass_tests>
  <warn_tests>
  </warn_tests>
</testproblem>

Make this consistent with the better naming scheme for registered diagnostics
Make this consistent with the better naming scheme for registered diagnostics
