integrated changes to weather, flow, and s temp models