Start with the water space you actually have
The most useful rectangular-tank calculation uses internal length, internal width and the actual water height. External measurements include glass, trim and framing. Full glass height can include an air gap that never contains water.
