Summary of changes:
- Changes contributed by Jon Hand based upon original changes made by
  Achim Geissler.
- Relocation of electrical power common blocks into power.h as a code
  tidy. Correct typing of variables in ENETSIMP.
- These changes have no impact on simulation predictions.

Testing:
- Visual difference of all changes
- Syntax check of both master and variant
- Ran tester.pl master vs variant with no reported differences.
Merge branch 'master' of https://github.com/ESP-rCommunity/ESP-rSource

# By ibeausol
# Via ibeausol
* 'master' of https://github.com/ESP-rCommunity/ESP-rSource:
  Summary of changes: - Changes contributed by Jon Hand based upon original changes made by   Achim Geissler. - Relocation of electrical power common blocks into power.h as a code   tidy. Correct typing of variables in ENETSIMP. - These changes have no impact on simulation predictions.
Merge remote-tracking branch 'ESP-r_fork/master' into el-net1

* ESP-r_fork/master:
  Summary of changes: - Changes contributed by Jon Hand based upon original changes made by   Achim Geissler. - Relocation of electrical power common blocks into power.h as a code   tidy. Correct typing of variables in ENETSIMP. - These changes have no impact on simulation predictions.

Conflicts:
	src/cetc/elec_net_utilities.F
	src/esrupfs/enetsetu.F
	src/esrupfs/enetsolv.F
	src/include/power.h

Resolved by "using theirs".