That's right, I made a mistake with the direction of the safety factor. I know, I know... tired I suppose!
Also yes that's correct the method does not account for valve characteristics - you need to experiment with valve closure rates to ensure a constant pressure increase rate, or modify the...
Just one more thought on the water hammer thread - it's true that the correct and standard method is a highly professional task, separating harmonic DE's as per the method of characteristics, but there is an easy approximation that does just as well:
For a slow control operation such as closing...