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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:fluidity at revision 4224

Stephan Kramer: Pending requested 2013-06-25

Diff: 679 lines (+586/-9)

8 files modified

assemble/Adapt_State.F90 (+1/-3)
preprocessor/Populate_State.F90 (+6/-6)
tests/periodic_adaptivity_at_first_timestep/Makefile (+6/-0)
tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep.flml (+239/-0)
tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep.stat (+64/-0)
tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep.xml (+24/-0)
tests/periodic_adaptivity_at_first_timestep/periodic_adaptivity_at_first_timestep_periodised.flml (+234/-0)
tests/periodic_adaptivity_at_first_timestep/src/MMS_B.geo (+12/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3936. By James Robert Percival on 2012-02-22

 Added Cian's fix to the choice of topology mesh for adaptivity on first timestep, plus a simple test (based on Patrick's) for whether the routine works.

3935. By Axelle Vire on 2012-02-22

Forgot an option check. Sorry for the noise.

3934. By Axelle Vire on 2012-02-22

Correct Brendan's option check regarding the use of CV for continuity with two-way coupling. Apologies that it hasn't been done before the merge.

3933. By Axelle Vire on 2012-02-21

Relax a tolerance on this test with Brendan's consent. The test was passing locally but failed on independent buildbot branches.

3932. By Axelle Vire on 2012-02-21

Loose the tolerance on this test slightly (with Brendan's consent) since it makes the trunk fails locally on my Maverick machine.

3931. By Stephan Kramer on 2012-02-20

Bug-fix for SampleNetCDF which is used in tidal boundary conditions. This bug would occur whenever a node was interpolated that is located exactly on one any of the constant longitutde or latitude lines of the input netcdf grid. In this case instead of interpolating between the value of the 2 nearest nodes, the value was extrapolated.

This code clearly needs some more tests. Coming up...

3930. By Tim Greaves on 2012-02-16

Minor Intel-specific fixes, reducing line lengths which overrun in the
middle of quoted strings.

3929. By Brendan Tollit on 2012-02-15

Correct a variable name in a ele_ngi check that was in a #ifdef DDEBUG
in assemble/Advection_Diffusion_CG.F90

3928. By Brendan Tollit on 2012-02-15

This merge will tidy up, improve, test and document the single phase porous
media Darcy flow model. This will sync the porous_media options model with
all the darcy_... test cases that have appeared over the past couple of months.
The model that used to be initiated by the porous_media option is effectively
removed as it contained code that was never finished, consistent, tested or
documented and was made by people that are not involved in Fluidity any more.
It is now favoured to define the Darcy velocity absorption field via python
diagnostics rather than a hard coded internal algorithm. Sections are added
to the manual to explain the model equations, discretisation and necessary
options.

Old tests cases are removed and new ones added.

3927. By Adam Candy on 2012-02-13

A new test case: netcdf_read_errors
This checks the errors reported when an attempt to read an invalid NetCDF file is made. Here 'invalid' refers to a file that is itself an invalid, non-conforming NetCDF file, or is of a format not supported by Fluidity.

Five types of NetCDF files are checked:
 - One which does not provide all the data requested,
 - One is missing a dimension (i.e. it provides only a 1d field),
 - One is missing the main variable,
 - One contains an incorrectly-labelled dimension (as 'lat', not 'x'), and
 - One has the variable incorrectly labelled (as 'height', not 'z').