; (B) considering aggregating small distributed hydropower assets; and (C) identifying barriers to grid scale implementation of hydropower and pumped storage technologies; (11) improve computational fluid dynamic modeling methods; (12) improve flow measurement methods, including maintenance of continuous flow measurement equipment; (13) identify best methods for compiling data on all hydropower resources and assets, including identifying potential for increased capacity; and (14) identify mechanisms to test and validate performance of hydropower and pumped storage technologies. 635. Marine energy research, development, and demonstration (a) In general The Secretary, in consultation with the Department of Defense, Secretary of Commerce (acting through the Under Secretary of Commerce for Oceans and Atmosphere) and other relevant Federal agencies, shall conduct a program of research, development, demonstration, and commercial application of marine energy technology, including activities to— (1) assist technology development to improve the components, processes, and systems used for power generation from marine energy resources at a variety of scales; (2) establish and expand critical testing infrastructure and facilities necessary to— (A) demonstrate and prove marine energy devices at a range of scales in a manner that is cost-effective and efficient; and (B) accelerate the technological readiness and commercial application of such devices; (3) address marine energy resource variability issues, including through the application of energy storage technologies; (4) advance efficient and reliable integration of marine energy with the electric grid, which may include smart building systems; (5) identify and study critical short-term and long-term needs to maintaining a sustainable marine energy supply chain based in the United States; (6) increase the reliability, security, and resilience of marine energy technologies