Updates to weather demo to allow it to handle different numbers of layers
Tweaked support for different numbers of layers again