Selectively revert 1620: Remove SE from dimension from industry for performance

[JakobBD]

Purpose of this PR

Pull request #1620 (with the follow-up #1641 and #1648) introduces a secondary energy dimension in subsector-specific industry FE demand.
It was designed to fix performance issues, but in fact convergence is better without it (see images below).
This is due to a flat optimum in the new dimension, as it does not make a difference which SE ends up in which subsector.

This PR reverts the main changes in these PRs while keeping some others, like a price change limit between calibration iterations.

Credit for all the performance tests go to @0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q; Thanks for that!

Type of change

(Make sure to delete from the Type-of-change list the items not relevant to your PR)

• Bug fix
• Refactoring
• New feature
• Minor change (default scenarios show only small differences)
• Fundamental change
• This change requires a documentation update

Checklist:

• My code follows the coding etiquette
• I performed a self-review of my own code
• I explained my changes within the PR, particularly in hard-to-understand areas
• I checked that the in-code documentation is up-to-date
• I adjusted the reporting in remind2 where it was needed
• I adjusted forbiddenColumnNames in readCheckScenarioConfig.R in case the PR leads to deprecated switches
• All automated model tests pass (FAIL 0 in the output of make test)
• The changelog CHANGELOG.md has been updated correctly

Further information (optional):

• Test runs are here: /p/tmp/pehl/Remind_selectively_revert_1620/output/
• Comparison of results (what changes by this PR?):

H12:

EU21: