The objectives of this project are to develop an efficient, general-purpose, finite-element simulator with unstructured grids to model complex reservoirs. Most reservoirs are fractured to a certain degree, and now there are better tools to characterize and map faults and fractures, fieldwide. Generation of reservoir domains with faults and fractures using relevant geological information is one of the tasks. This project would make it possible to incorporate this enhanced characterization directly into a reservoir simulation framework.