Code review comment for lp:~fluidity-core/fluidity/excise-fldecomp

The detector bug has been corrected and merged with the trunk. The environment reading has been moved into a module in the ocean_options directory and also merged into the trunk.

The remaining changes were to re-merge from the latest trunk and make sure there were no calls to fldecomp left in the tests, longtests and examples. The fldecomp tests (i.e. the ones that test fldecomp itself) were put back. And there was a mesh file left out of the gyre_parallel longtest which I've added.

Buildbot succeeded.

I haven't re-tested the longtests and examples: is that necessary before the merge into trunk? The gyre_parallel test has run past dump 11.