lp:~fluidity-core/fluidity/ocean_forcing

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:fluidity at revision 3572

Simon Mouradian: Approve on 2011-09-05

Diff: 1474 lines (+1331/-39)

10 files modified

main/Usage.cpp (+17/-11)
ocean_forcing/bulk_parameterisations.F90 (+0/-1)
ocean_forcing/forcingERA40.cpp (+11/-2)
schemas/fluidity_options.rnc (+14/-9)
schemas/fluidity_options.rng (+25/-16)
tests/forcing_inst_vals/Makefile (+7/-0)
tests/forcing_inst_vals/forcing-ncar.flml (+587/-0)
tests/forcing_inst_vals/forcing-ncar_inst.flml (+589/-0)
tests/forcing_inst_vals/forcing_inst_vals.xml (+56/-0)
tests/forcing_inst_vals/src/column.geo (+25/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3585. By Jon Hill on 2012-05-01

Merge from trunk

3584. By Jon Hill on 2012-04-24

Merge from trunk

3583. By Jon Hill on 2012-02-28

Merge from trunk

3582. By Jon Hill on 2012-01-24

Update from trunk

3581. By Jon Hill on 2011-12-05

Merge from trunk

3580. By Jon Hill on 2011-11-01

Making this test work

3579. By Jon Hill on 2011-11-01

merge from trunk

3578. By Jon Hill on 2011-09-28

merge from trunk

3577. By Jon Hill on 2011-09-09

merge from trunk.

3576. By Jon Hill on 2011-09-08

Few fixes to the code and a quick tidy