improved reservoir model and tests
Vector functions completed