Merge lp:~j-percival/fluidity/periodic-adaptivity-at-first-timestep into lp:fluidity

[Stephan Kramer]

This pulls out Cian's two fixes with regard to peroiodic adaptivity and adds a test (pretty much copied exactly from Patrick's to confirm that the functionality works. Note that while the test fails on an unfixed branch, it may need extending for more insidious failure modes.

This was previously submitted as lp:~j-percival/fluidity/periodic-adaptivity-at-first-timestep. The current branch is simply a continuation of that with merges from the trunk.

=== modified file 'assemble/Adapt_State.F90'
--- assemble/Adapt_State.F90	2012-05-15 18:58:56 +0000
+++ assemble/Adapt_State.F90	2013-06-25 15:34:40 +0000
@@ -879,7 +879,6 @@
 
     character(len = *), parameter :: base_path = "/mesh_adaptivity/hr_adaptivity/adapt_at_first_timestep"
     integer :: adapt_iterations, i
-    type(mesh_type), pointer :: old_mesh
     type(tensor_field) :: metric
     type(vector_field), pointer :: output_positions
     real :: dt
@@ -909,8 +908,7 @@
       end if
 
       ! Form the new metric
-      old_mesh => extract_mesh(states(1), "CoordinateMesh")
-      call allocate(metric, old_mesh, "ErrorMetric")
+      call allocate(metric, extract_mesh(states(1), topology_mesh_name), "ErrorMetric")
       call assemble_metric(states, metric)
 
       ! Adapt state, initialising fields from the options tree rather than

=== modified file 'preprocessor/Populate_State.F90'
--- preprocessor/Populate_State.F90	2013-05-23 07:34:08 +0000
+++ preprocessor/Populate_State.F90	2013-06-25 15:34:40 +0000
@@ -1917,12 +1917,12 @@
     adapt_path=trim(path)//"/adaptivity_options"
     if(have_option(trim(adapt_path)//"/absolute_measure")) then
        adapt_path=trim(adapt_path)//"/absolute_measure/scalar_field::InterpolationErrorBound"
-       call allocate_and_insert_scalar_field(adapt_path, state, parent_mesh=mesh_name, &
+       call allocate_and_insert_scalar_field(adapt_path, state, parent_mesh=topology_mesh_name, &
           parent_name=lfield_name, &
           dont_allocate_prognostic_value_spaces=dont_allocate_prognostic_value_spaces)
     else if(have_option(trim(adapt_path)//"/relative_measure")) then
        adapt_path=trim(adapt_path)//"/relative_measure/scalar_field::InterpolationErrorBound"
-       call allocate_and_insert_scalar_field(adapt_path, state, parent_mesh=mesh_name, &
+       call allocate_and_insert_scalar_field(adapt_path, state, parent_mesh=topology_mesh_name, &
           parent_name=lfield_name, &
           dont_allocate_prognostic_value_spaces=dont_allocate_prognostic_value_spaces)
     end if
@@ -2050,11 +2050,11 @@
     adapt_path=trim(path)//"/adaptivity_options"
     if(have_option(trim(adapt_path)//"/absolute_measure")) then
        adapt_path=trim(adapt_path)//"/absolute_measure/vector_field::InterpolationErrorBound"
-       call allocate_and_insert_vector_field(adapt_path, state, mesh_name, lfield_name, &
+       call allocate_and_insert_vector_field(adapt_path, state, topology_mesh_name, lfield_name, &
           dont_allocate_prognostic_value_spaces=dont_allocate_prognostic_value_spaces)
     else if(have_option(trim(adapt_path)//"/relative_measure")) then
        adapt_path=trim(adapt_path)//"/relative_measure/vector_field::InterpolationErrorBound"
-       call allocate_and_insert_vector_field(adapt_path, state, mesh_name, lfield_name, &
+       call allocate_and_insert_vector_field(adapt_path, state, topology_mesh_name, lfield_name, &
           dont_allocate_prognostic_value_spaces=dont_allocate_prognostic_value_spaces)
     end if
 
@@ -2170,11 +2170,11 @@
     adapt_path=trim(path)//"/adaptivity_options"
     if(have_option(trim(adapt_path)//"/absolute_measure")) then
        adapt_path=trim(adapt_path)//"/absolute_measure/tensor_field::InterpolationErrorBound"
-       call allocate_and_insert_tensor_field(adapt_path, state, mesh_name, field_name, &
+       call allocate_and_insert_tensor_field(adapt_path, state, topology_mesh_name, field_name, &
             dont_allocate_prognostic_value_spaces=dont_allocate_prognostic_value_spaces)
     else if(have_option(trim(adapt_path)//"/relative_measure")) then
        adapt_path=trim(adapt_path)//"/relative_measure/tensor_field::InterpolationErrorBound"
-       call allocate_and_insert_tensor_field(adapt_path, state, mesh_name, field_name, &
+       call allocate_and_insert_tensor_field(adapt_path, state, topology_mesh_name, field_name, &
             dont_allocate_prognostic_value_spaces=dont_allocate_prognostic_value_spaces)
     end if
 

=== added directory 'tests/periodic_adaptivity_at_first_timestep'
=== added file 'tests/periodic_adaptivity_at_first_timestep/Makefile'
--- tests/periodic_adaptivity_at_first_timestep/Makefile	1970-01-01 00:00:00 +0000
+++ tests/periodic_adaptivity_at_first_timestep/Makefile	2013-06-25 15:34:40 +0000
@@ -0,0 +1,6 @@
+input:
+	gmsh -2 src/MMS_B.geo -o MMS_B.msh
+	../../bin/gmsh2triangle --2d MMS_B.msh
+
+clean:
+	rm -f *.vtu *.log-? *.err-? *.msh *.edge *.ele *.node periodic_adaptivity.stat periodic_adaptivity_periodised.flml

=== added file 'tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep.flml'
--- tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep.flml	1970-01-01 00:00:00 +0000
+++ tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep.flml	2013-06-25 15:34:40 +0000
@@ -0,0 +1,239 @@
+<?xml version='1.0' encoding='utf-8'?>
+<fluidity_options>
+  <simulation_name>
+    <string_value lines="1">periodic_adaptivity_at_first_timestep</string_value>
+  </simulation_name>
+  <problem_type>
+    <string_value lines="1">fluids</string_value>
+  </problem_type>
+  <geometry>
+    <dimension>
+      <integer_value rank="0">2</integer_value>
+    </dimension>
+    <mesh name="CoordinateMesh">
+      <from_file file_name="MMS_B">
+        <format name="triangle"/>
+        <stat>
+          <include_in_stat/>
+        </stat>
+      </from_file>
+    </mesh>
+    <mesh name="VelocityMesh">
+      <from_mesh>
+        <mesh name="PeriodicMesh"/>
+        <stat>
+          <exclude_from_stat/>
+        </stat>
+      </from_mesh>
+    </mesh>
+    <mesh name="PressureMesh">
+      <from_mesh>
+        <mesh name="PeriodicMesh"/>
+        <stat>
+          <exclude_from_stat/>
+        </stat>
+      </from_mesh>
+    </mesh>
+    <mesh name="PeriodicMesh">
+      <from_mesh>
+        <mesh name="CoordinateMesh"/>
+        <periodic_boundary_conditions name="x">
+          <physical_boundary_ids>
+            <integer_value shape="1" rank="1">10</integer_value>
+          </physical_boundary_ids>
+          <aliased_boundary_ids>
+            <integer_value shape="1" rank="1">8</integer_value>
+          </aliased_boundary_ids>
+          <coordinate_map>
+            <string_value lines="20" type="python">def val(X,t):
+   from math import pi
+   return(X[0]-1, X[1])</string_value>
+          </coordinate_map>
+          <inverse_coordinate_map>
+            <string_value lines="20" type="python">def val(X,t):
+   from math import pi
+   return(X[0]+1, X[1])</string_value>
+          </inverse_coordinate_map>
+        </periodic_boundary_conditions>
+        <stat>
+          <exclude_from_stat/>
+        </stat>
+      </from_mesh>
+    </mesh>
+    <quadrature>
+      <degree>
+        <integer_value rank="0">4</integer_value>
+      </degree>
+    </quadrature>
+  </geometry>
+  <io>
+    <dump_format>
+      <string_value>vtk</string_value>
+    </dump_format>
+    <dump_period_in_timesteps>
+      <constant>
+        <integer_value rank="0">1</integer_value>
+      </constant>
+    </dump_period_in_timesteps>
+    <output_mesh name="CoordinateMesh"/>
+    <stat>
+      <output_at_start/>
+      <output_before_adapts/>
+      <output_after_adapts/>
+    </stat>
+  </io>
+  <timestepping>
+    <current_time>
+      <real_value rank="0">0.0</real_value>
+    </current_time>
+    <timestep>
+      <real_value rank="0">1.0</real_value>
+    </timestep>
+    <finish_time>
+      <real_value rank="0">0.0</real_value>
+    </finish_time>
+  </timestepping>
+  <physical_parameters/>
+  <material_phase name="Main">
+    <vector_field name="Velocity" rank="1">
+      <prescribed>
+        <mesh name="VelocityMesh"/>
+        <value name="WholeMesh">
+          <constant>
+            <real_value shape="2" dim1="dim" rank="1">0.0 0.0</real_value>
+          </constant>
+        </value>
+        <output/>
+        <stat>
+          <include_in_stat/>
+        </stat>
+        <detectors>
+          <exclude_from_detectors/>
+        </detectors>
+      </prescribed>
+    </vector_field>
+    <scalar_field name="Unity" rank="0">
+      <prescribed>
+        <mesh name="VelocityMesh"/>
+        <value name="WholeMesh">
+          <python>
+            <string_value lines="20" type="python">def val(X, t):
+  #return (X[0]**2 - X[0])/-0.25
+  return 1.0</string_value>
+          </python>
+        </value>
+        <output/>
+        <stat/>
+        <detectors>
+          <exclude_from_detectors/>
+        </detectors>
+        <adaptivity_options>
+          <absolute_measure>
+            <scalar_field name="InterpolationErrorBound" rank="0">
+              <prescribed>
+                <value name="WholeMesh">
+                  <constant>
+                    <real_value rank="0">0.01</real_value>
+                  </constant>
+                </value>
+                <output/>
+                <stat/>
+                <detectors>
+                  <exclude_from_detectors/>
+                </detectors>
+              </prescribed>
+            </scalar_field>
+          </absolute_measure>
+        </adaptivity_options>
+      </prescribed>
+    </scalar_field>
+    <scalar_field name="PrognosticFieldConsistent" rank="0">
+      <prognostic>
+        <mesh name="VelocityMesh"/>
+        <equation name="AdvectionDiffusion"/>
+        <spatial_discretisation>
+          <continuous_galerkin>
+            <stabilisation>
+              <no_stabilisation/>
+            </stabilisation>
+            <advection_terms/>
+            <mass_terms/>
+          </continuous_galerkin>
+          <conservative_advection>
+            <real_value rank="0">1.0</real_value>
+          </conservative_advection>
+        </spatial_discretisation>
+        <temporal_discretisation>
+          <theta>
+            <real_value rank="0">0.5</real_value>
+          </theta>
+        </temporal_discretisation>
+        <solver>
+          <iterative_method name="gmres">
+            <restart>
+              <integer_value rank="0">30</integer_value>
+            </restart>
+          </iterative_method>
+          <preconditioner name="sor"/>
+          <relative_error>
+            <real_value rank="0">1.0e-8</real_value>
+          </relative_error>
+          <max_iterations>
+            <integer_value rank="0">10000</integer_value>
+          </max_iterations>
+          <never_ignore_solver_failures/>
+          <diagnostics>
+            <monitors/>
+          </diagnostics>
+        </solver>
+        <initial_condition name="WholeMesh">
+          <constant>
+            <real_value rank="0">1.0</real_value>
+          </constant>
+        </initial_condition>
+        <output/>
+        <stat/>
+        <convergence>
+          <include_in_convergence/>
+        </convergence>
+        <detectors>
+          <include_in_detectors/>
+        </detectors>
+        <steady_state>
+          <include_in_steady_state/>
+        </steady_state>
+        <consistent_interpolation/>
+      </prognostic>
+    </scalar_field>
+  </material_phase>
+  <mesh_adaptivity>
+    <hr_adaptivity>
+      <period>
+        <real_value rank="0">2.0</real_value>
+      </period>
+      <maximum_number_of_nodes>
+        <integer_value rank="0">10000</integer_value>
+      </maximum_number_of_nodes>
+      <disable_gradation/>
+      <tensor_field name="MinimumEdgeLengths">
+        <anisotropic_symmetric>
+          <constant>
+            <real_value symmetric="true" dim2="dim" shape="2 2" dim1="dim" rank="2">0.01 0.0 0.0 0.01</real_value>
+          </constant>
+        </anisotropic_symmetric>
+      </tensor_field>
+      <tensor_field name="MaximumEdgeLengths">
+        <anisotropic_symmetric>
+          <constant>
+            <real_value symmetric="true" dim2="dim" shape="2 2" dim1="dim" rank="2">0.1 0.0 0.0 0.1</real_value>
+          </constant>
+        </anisotropic_symmetric>
+      </tensor_field>
+      <adapt_at_first_timestep>
+        <number_of_adapts>
+          <integer_value rank="0">2</integer_value>
+        </number_of_adapts>
+      </adapt_at_first_timestep>
+    </hr_adaptivity>
+  </mesh_adaptivity>
+</fluidity_options>

=== added file 'tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep.stat'
--- tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep.stat	1970-01-01 00:00:00 +0000
+++ tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep.stat	2013-06-25 15:34:40 +0000
@@ -0,0 +1,64 @@
+<header>
+<constant name="FluidityVersion" type="string" value="fluidity.3931" />
+<constant name="CompileTime" type="string" value="Feb 22 2012 15:47:10" />
+<constant name="StartTime" type="string" value="20120222 161555.083+0000" />
+<constant name="HostName" type="string" value="Unknown" />
+<constant name="format" type="string" value="plain_text" />
+<field column="1" name="ElapsedTime" statistic="value"/>
+<field column="2" name="dt" statistic="value"/>
+<field column="3" name="ElapsedWallTime" statistic="value"/>
+<field column="4" name="PeriodicMesh" statistic="nodes"/>
+<field column="5" name="PeriodicMesh" statistic="elements"/>
+<field column="6" name="PeriodicMesh" statistic="surface_elements"/>
+<field column="7" name="CoordinateMesh" statistic="nodes"/>
+<field column="8" name="CoordinateMesh" statistic="elements"/>
+<field column="9" name="CoordinateMesh" statistic="surface_elements"/>
+<field column="10" name="TotalMemory" statistic="current" material_phase="Memory"/>
+<field column="11" name="TotalMemory" statistic="min" material_phase="Memory"/>
+<field column="12" name="TotalMemory" statistic="max" material_phase="Memory"/>
+<field column="13" name="MeshMemory" statistic="current" material_phase="Memory"/>
+<field column="14" name="MeshMemory" statistic="min" material_phase="Memory"/>
+<field column="15" name="MeshMemory" statistic="max" material_phase="Memory"/>
+<field column="16" name="ScalarFieldMemory" statistic="current" material_phase="Memory"/>
+<field column="17" name="ScalarFieldMemory" statistic="min" material_phase="Memory"/>
+<field column="18" name="ScalarFieldMemory" statistic="max" material_phase="Memory"/>
+<field column="19" name="VectorFieldMemory" statistic="current" material_phase="Memory"/>
+<field column="20" name="VectorFieldMemory" statistic="min" material_phase="Memory"/>
+<field column="21" name="VectorFieldMemory" statistic="max" material_phase="Memory"/>
+<field column="22" name="TensorFieldMemory" statistic="current" material_phase="Memory"/>
+<field column="23" name="TensorFieldMemory" statistic="min" material_phase="Memory"/>
+<field column="24" name="TensorFieldMemory" statistic="max" material_phase="Memory"/>
+<field column="25" name="MatrixSparsityMemory" statistic="current" material_phase="Memory"/>
+<field column="26" name="MatrixSparsityMemory" statistic="min" material_phase="Memory"/>
+<field column="27" name="MatrixSparsityMemory" statistic="max" material_phase="Memory"/>
+<field column="28" name="MatrixMemory" statistic="current" material_phase="Memory"/>
+<field column="29" name="MatrixMemory" statistic="min" material_phase="Memory"/>
+<field column="30" name="MatrixMemory" statistic="max" material_phase="Memory"/>
+<field column="31" name="TransformCacheMemory" statistic="current" material_phase="Memory"/>
+<field column="32" name="TransformCacheMemory" statistic="min" material_phase="Memory"/>
+<field column="33" name="TransformCacheMemory" statistic="max" material_phase="Memory"/>
+<field column="34" name="Unity" statistic="min" material_phase="Main"/>
+<field column="35" name="Unity" statistic="max" material_phase="Main"/>
+<field column="36" name="Unity" statistic="l2norm" material_phase="Main"/>
+<field column="37" name="Unity" statistic="integral" material_phase="Main"/>
+<field column="38" name="UnityInterpolationErrorBound" statistic="min" material_phase="Main"/>
+<field column="39" name="UnityInterpolationErrorBound" statistic="max" material_phase="Main"/>
+<field column="40" name="UnityInterpolationErrorBound" statistic="l2norm" material_phase="Main"/>
+<field column="41" name="UnityInterpolationErrorBound" statistic="integral" material_phase="Main"/>
+<field column="42" name="PrognosticFieldConsistent" statistic="min" material_phase="Main"/>
+<field column="43" name="PrognosticFieldConsistent" statistic="max" material_phase="Main"/>
+<field column="44" name="PrognosticFieldConsistent" statistic="l2norm" material_phase="Main"/>
+<field column="45" name="PrognosticFieldConsistent" statistic="integral" material_phase="Main"/>
+<field column="46" name="Velocity%magnitude" statistic="min" material_phase="Main"/>
+<field column="47" name="Velocity%magnitude" statistic="max" material_phase="Main"/>
+<field column="48" name="Velocity%magnitude" statistic="l2norm" material_phase="Main"/>
+<field column="49" name="Velocity%1" statistic="min" material_phase="Main"/>
+<field column="50" name="Velocity%1" statistic="max" material_phase="Main"/>
+<field column="51" name="Velocity%1" statistic="l2norm" material_phase="Main"/>
+<field column="52" name="Velocity%1" statistic="integral" material_phase="Main"/>
+<field column="53" name="Velocity%2" statistic="min" material_phase="Main"/>
+<field column="54" name="Velocity%2" statistic="max" material_phase="Main"/>
+<field column="55" name="Velocity%2" statistic="l2norm" material_phase="Main"/>
+<field column="56" name="Velocity%2" statistic="integral" material_phase="Main"/>
+</header>
+  0.00000000000000000E+000  0.10000000000000000E+001  0.61199999999999999E+000 78 144 24 85 144 24  0.50480000000000000E+005  0.00000000000000000E+000  0.92448000000000000E+005  0.14564000000000000E+005  0.00000000000000000E+000  0.36784000000000000E+005  0.18800000000000000E+004  0.00000000000000000E+000  0.24960000000000000E+004  0.26400000000000000E+004  0.00000000000000000E+000  0.66720000000000000E+004  0.25600000000000000E+004  0.00000000000000000E+000  0.10624000000000000E+005  0.78120000000000000E+004  0.00000000000000000E+000  0.21256000000000000E+005  0.34560000000000000E+004  0.00000000000000000E+000  0.86400000000000000E+004  0.17568000000000000E+005  0.00000000000000000E+000  0.17568000000000000E+005  0.10000000000000000E+001  0.10000000000000000E+001  0.99999999999999889E+000  0.99999999999999789E+000  0.10000000000000000E-001  0.10000000000000000E-001  0.99999999999999933E-002  0.10000000000000011E-001  0.10000000000000000E+001  0.10000000000000000E+001  0.99999999999999889E+000  0.99999999999999789E+000  0.00000000000000000E+000  0.00000000000000000E+000  0.00000000000000000E+000  0.00000000000000000E+000  0.00000000000000000E+000  0.00000000000000000E+000  0.00000000000000000E+000  0.00000000000000000E+000  0.00000000000000000E+000  0.00000000000000000E+000  0.00000000000000000E+000

=== added file 'tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep.xml'
--- tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep.xml	1970-01-01 00:00:00 +0000
+++ tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep.xml	2013-06-25 15:34:40 +0000
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='utf-8'?>
+<testproblem>
+  <name>Periodic adaptivity at first timestep</name>
+  <owner userid="jrper"/>
+  <tags>flml</tags>
+  <problem_definition length="short" nprocs="1">
+    <command_line>../../bin/periodise periodic_adaptivity_at_first_timestep.flml; fluidity -v2 -l periodic_adaptivity_at_first_timestep_periodised.flml</command_line>
+  </problem_definition>
+  <variables>
+    <variable name="consistent_max" language="python">
+import fluidity_tools
+s = fluidity_tools.stat_parser("periodic_adaptivity_at_first_timestep.stat")
+consistent_max = s['Main']['PrognosticFieldConsistent']['max'][-1]
+    </variable>
+  </variables>
+  <pass_tests>
+    <test name="references" language="python">assert "There are no references left" in open("fluidity.log-0").read()</test>
+    <test name="consistent_max" language="python">
+import fluidity_tools
+fluidity_tools.compare_variable(consistent_max, 1.0, 1.0e-10)
+    </test>
+  </pass_tests>
+  <warn_tests/>
+</testproblem>

=== added file 'tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep_periodised.flml'
--- tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep_periodised.flml	1970-01-01 00:00:00 +0000
+++ tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep_periodised.flml	2013-06-25 15:34:40 +0000
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<fluidity_options>
+    <simulation_name>
+        <string_value lines="1">periodic_adaptivity_at_first_timestep</string_value>
+    </simulation_name>
+    <problem_type>
+        <string_value lines="1">fluids</string_value>
+    </problem_type>
+    <geometry>
+        <dimension>
+            <integer_value rank="0">2</integer_value>
+        </dimension>
+        <mesh name="CoordinateMesh">
+            <from_mesh>
+                <mesh name="PeriodicMesh"></mesh>
+                <periodic_boundary_conditions name="x">
+                    <remove_periodicity></remove_periodicity>
+                    <coordinate_map>
+                        <string_value lines="20" type="python">def val(X,t):&#x0A;   from math import pi&#x0A;   return(X[0]-1, X[1])</string_value>
+                    </coordinate_map>
+                    <inverse_coordinate_map>
+                        <string_value lines="20" type="python">def val(X,t):&#x0A;   from math import pi&#x0A;   return(X[0]+1, X[1])</string_value>
+                    </inverse_coordinate_map>
+                    <aliased_boundary_ids>
+                        <integer_value rank="1" shape="1">8</integer_value>
+                    </aliased_boundary_ids>
+                    <physical_boundary_ids>
+                        <integer_value rank="1" shape="1">10</integer_value>
+                    </physical_boundary_ids>
+                </periodic_boundary_conditions>
+                <stat>
+                    <include_in_stat></include_in_stat>
+                </stat>
+            </from_mesh>
+        </mesh>
+        <mesh name="VelocityMesh">
+            <from_mesh>
+                <mesh name="PeriodicMesh"></mesh>
+                <stat>
+                    <exclude_from_stat></exclude_from_stat>
+                </stat>
+            </from_mesh>
+        </mesh>
+        <mesh name="PressureMesh">
+            <from_mesh>
+                <mesh name="PeriodicMesh"></mesh>
+                <stat>
+                    <exclude_from_stat></exclude_from_stat>
+                </stat>
+            </from_mesh>
+        </mesh>
+        <mesh name="PeriodicMesh">
+            <from_file file_name="MMS_B_periodic">
+                <format name="triangle"></format>
+                <stat>
+                    <include_in_stat></include_in_stat>
+                </stat>
+            </from_file>
+        </mesh>
+        <quadrature>
+            <degree>
+                <integer_value rank="0">4</integer_value>
+            </degree>
+        </quadrature>
+    </geometry>
+    <io>
+        <dump_format>
+            <string_value>vtk</string_value>
+        </dump_format>
+        <dump_period_in_timesteps>
+            <constant>
+                <integer_value rank="0">1</integer_value>
+            </constant>
+        </dump_period_in_timesteps>
+        <output_mesh name="CoordinateMesh"></output_mesh>
+        <stat>
+            <output_at_start></output_at_start>
+            <output_before_adapts></output_before_adapts>
+            <output_after_adapts></output_after_adapts>
+        </stat>
+    </io>
+    <timestepping>
+        <current_time>
+            <real_value rank="0">0</real_value>
+        </current_time>
+        <timestep>
+            <real_value rank="0">1</real_value>
+        </timestep>
+        <finish_time>
+            <real_value rank="0">0</real_value>
+        </finish_time>
+    </timestepping>
+    <physical_parameters></physical_parameters>
+    <material_phase name="Main">
+        <vector_field name="Velocity" rank="1">
+            <prescribed>
+                <mesh name="VelocityMesh"></mesh>
+                <value name="WholeMesh">
+                    <constant>
+                        <real_value rank="1" shape="2" dim1="dim">0 0</real_value>
+                    </constant>
+                </value>
+                <output></output>
+                <stat>
+                    <include_in_stat></include_in_stat>
+                </stat>
+                <detectors>
+                    <exclude_from_detectors></exclude_from_detectors>
+                </detectors>
+            </prescribed>
+        </vector_field>
+        <scalar_field name="Unity" rank="0">
+            <prescribed>
+                <mesh name="VelocityMesh"></mesh>
+                <value name="WholeMesh">
+                    <python>
+                        <string_value lines="20" type="python">def val(X, t):&#x0A;  #return (X[0]**2 - X[0])/-0.25&#x0A;  return 1.0</string_value>
+                    </python>
+                </value>
+                <output></output>
+                <stat></stat>
+                <detectors>
+                    <exclude_from_detectors></exclude_from_detectors>
+                </detectors>
+                <adaptivity_options>
+                    <absolute_measure>
+                        <scalar_field name="InterpolationErrorBound" rank="0">
+                            <prescribed>
+                                <value name="WholeMesh">
+                                    <constant>
+                                        <real_value rank="0">0.01</real_value>
+                                    </constant>
+                                </value>
+                                <output></output>
+                                <stat></stat>
+                                <detectors>
+                                    <exclude_from_detectors></exclude_from_detectors>
+                                </detectors>
+                            </prescribed>
+                        </scalar_field>
+                    </absolute_measure>
+                </adaptivity_options>
+            </prescribed>
+        </scalar_field>
+        <scalar_field name="PrognosticFieldConsistent" rank="0">
+            <prognostic>
+                <mesh name="VelocityMesh"></mesh>
+                <equation name="AdvectionDiffusion"></equation>
+                <spatial_discretisation>
+                    <continuous_galerkin>
+                        <stabilisation>
+                            <no_stabilisation></no_stabilisation>
+                        </stabilisation>
+                        <advection_terms></advection_terms>
+                        <mass_terms></mass_terms>
+                    </continuous_galerkin>
+                    <conservative_advection>
+                        <real_value rank="0">1</real_value>
+                    </conservative_advection>
+                </spatial_discretisation>
+                <temporal_discretisation>
+                    <theta>
+                        <real_value rank="0">0.5</real_value>
+                    </theta>
+                </temporal_discretisation>
+                <solver>
+                    <iterative_method name="gmres">
+                        <restart>
+                            <integer_value rank="0">30</integer_value>
+                        </restart>
+                    </iterative_method>
+                    <preconditioner name="sor"></preconditioner>
+                    <relative_error>
+                        <real_value rank="0">1e-08</real_value>
+                    </relative_error>
+                    <max_iterations>
+                        <integer_value rank="0">10000</integer_value>
+                    </max_iterations>
+                    <never_ignore_solver_failures></never_ignore_solver_failures>
+                    <diagnostics>
+                        <monitors></monitors>
+                    </diagnostics>
+                </solver>
+                <initial_condition name="WholeMesh">
+                    <constant>
+                        <real_value rank="0">1</real_value>
+                    </constant>
+                </initial_condition>
+                <output></output>
+                <stat></stat>
+                <convergence>
+                    <include_in_convergence></include_in_convergence>
+                </convergence>
+                <detectors>
+                    <include_in_detectors></include_in_detectors>
+                </detectors>
+                <steady_state>
+                    <include_in_steady_state></include_in_steady_state>
+                </steady_state>
+                <consistent_interpolation></consistent_interpolation>
+            </prognostic>
+        </scalar_field>
+    </material_phase>
+    <mesh_adaptivity>
+        <hr_adaptivity>
+            <period>
+                <real_value rank="0">2</real_value>
+            </period>
+            <maximum_number_of_nodes>
+                <integer_value rank="0">10000</integer_value>
+            </maximum_number_of_nodes>
+            <disable_gradation></disable_gradation>
+            <tensor_field name="MinimumEdgeLengths">
+                <anisotropic_symmetric>
+                    <constant>
+                        <real_value rank="2" shape="2 2" symmetric="true" dim2="dim" dim1="dim">0.01 0 0 0.01</real_value>
+                    </constant>
+                </anisotropic_symmetric>
+            </tensor_field>
+            <tensor_field name="MaximumEdgeLengths">
+                <anisotropic_symmetric>
+                    <constant>
+                        <real_value rank="2" shape="2 2" symmetric="true" dim2="dim" dim1="dim">0.1 0 0 0.1</real_value>
+                    </constant>
+                </anisotropic_symmetric>
+            </tensor_field>
+            <adapt_at_first_timestep>
+                <number_of_adapts>
+                    <integer_value rank="0">2</integer_value>
+                </number_of_adapts>
+            </adapt_at_first_timestep>
+        </hr_adaptivity>
+    </mesh_adaptivity>
+</fluidity_options>

=== added directory 'tests/periodic_adaptivity_at_first_timestep/src'
=== added file 'tests/periodic_adaptivity_at_first_timestep/src/MMS_B.geo'
--- tests/periodic_adaptivity_at_first_timestep/src/MMS_B.geo	1970-01-01 00:00:00 +0000
+++ tests/periodic_adaptivity_at_first_timestep/src/MMS_B.geo	2013-06-25 15:34:40 +0000
@@ -0,0 +1,12 @@
+Point(1) = {0,0,0,0.1};
+Extrude {1,0,0} {
+  Point{1}; Layers{3};
+}
+Extrude {0,1,0} {
+  Line{1}; Layers{3};
+}
+Physical Line(7) = {1};
+Physical Line(8) = {4};
+Physical Line(9) = {2};
+Physical Line(10) = {3};
+Physical Surface(10) = {5};