Energy baseline update

Summary
The energy baseline first issue was done in FINE1 is updated including adjustments of simulation input data if necessary and new technologies developed in S2R