lp:~fluidity-core/fluidity/fluidity-initialisation-from_netcdf

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:fluidity

Stephan Kramer: Pending requested 2012-03-02

Diff: 2679 lines (+1141/-1170)

23 files modified

femtools/Makefile.dependencies (+1/-1)
femtools/SampleNetCDF_fortran.F90 (+35/-3)
ocean_forcing/SampleNetCDF.cpp (+44/-1)
ocean_forcing/SampleNetCDF.h (+7/-1)
preprocessor/Boundary_Conditions_From_Options.F90 (+93/-61)
preprocessor/Initialise_Fields.F90 (+31/-7)
preprocessor/Makefile.dependencies (+2/-1)
schemas/input_output.rnc (+10/-3)
schemas/input_output.rng (+11/-3)
schemas/prognostic_field_options.rnc (+2/-194)
schemas/prognostic_field_options.rng (+2/-272)
schemas/shallow_water_options.rnc (+0/-12)
schemas/shallow_water_options.rng (+15/-31)
schemas/test_advection_diffusion_options.rnc (+0/-241)
schemas/test_advection_diffusion_options.rng (+15/-339)
tests/sample_netcdf_test/Makefile (+9/-0)
tests/sample_netcdf_test/create_netcdf_test.py (+70/-0)
tests/sample_netcdf_test/sample.flml (+658/-0)
tests/sample_netcdf_test/sample_netcdf_test.xml (+24/-0)
tests/sample_netcdf_test/src/box_on_sphere.geo (+17/-0)
tests/sample_netcdf_test/src/definitions.geo (+41/-0)
tests/sample_netcdf_test/src/shorelines.geo (+8/-0)
tests/sample_netcdf_test/src/shorelines_with_boundaries.geo (+46/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3943. By Stephan Kramer on 2012-03-27

Fix initialising prescribed fields from "netcdf" format in parallel.

3942. By Stephan Kramer on 2012-03-02

Merging from trunk.

3941. By Stephan Kramer on 2012-03-02

Cleaning up before merge request.

3940. By Stephan Kramer on 2012-03-01

Should have committed these file for the test as well.

3939. By Stephan Kramer on 2012-03-01

Merging in from trunk.

3938. By Stephan Kramer on 2012-02-27

Actually testing the values brought up two more bugs. Now pretty confident it actually works.

3937. By Stephan Kramer on 2012-02-27

Add prescribed field initialised from netcdf, to be compared with a python diagnostic field using the same function used to create the netcdf file.
Fixed mem leak in initialsing form netcdf.

3936. By Stephan Kramer on 2012-02-27

Several bug fixes. Test now runs through and seems to give sensible answers.

3935. By Stephan Kramer on 2012-02-27

Start of a new test to test SampleNetCDF and tidal boundary conditions.
Does not yet work.
Accidentily removed tidal boundary conditions also from "Pressure" - putting back in.

3934. By Stephan Kramer on 2012-02-21

This commit address 2 issues:
* interpolating errors along the phase=360 lines of tidal forcing read netcdf files
* the tidal forcing is no longer read every timestep, but only once in populate_state - this prevents reading the entire netcdf tidal atlas on every processor every timestep.

In femtools/SampleNetCDF_fortran.F90:
- fix intents of id argument of most SampleNetCDF_XXX() routines.
- add SampleNetCDF_to_field that sets a scalar field from netcdf values.
In preprocessor/Boundary_Conditions_From_Options.F90
- add new populate_tidal_bc() routine, that initialises the tidal bc calculation by computing the real and complex components of A(x)exp(i*alpha(x)), where A(x) is amplitude and alpha(x) the phase, and store these components as surface fields under the bc.
- in set_tidal_bc_value() it now uses these to compute the free surface contributions of the different tidal components.
In schemas/:
- taking away the dirichlet/from_file/tidal option under various balance pressure fields. For these cases (other than field%name=="Pressure") the tidal forcing was never multiplied by g, so this would not have worked.
- because this was also still present under the no longer existing "prognostic free surface", this has now finally been taken out of the schema - which meant also deleting it from the shallow water and test_advection_diffussion schemes.