improved the robustness of the peakBudget-finding algorithm for iterative target_adj = 9 and of diffCurvPhaseIn2Lin. Also updated the description in default.cfg

bugfix: make sure p_factorRescale_taxCO2_Funneled and p_factorRescale_taxCO2 always have a value in iterative_target_adj eq 9

Switch CO2 MAC for land use emissions OFF for standalone runs (as already done for coupled run). For each SSP-RCP use emission trajectories from coupled runs (via MOINPUT) without applying the MAC since CO2 LUC emissions are almost the same across (policy) RCPs for a SSP (no MAC needed).

testing

limits the share of traditional biomass taking the level of industrial
demand into account

vm_effGr and vm_damageFactor are declared in the modules 20_growth and 50_damages respectively.

bugfix 0935e7ee, reintroduced an if/else condition for a bound on biomass and renamed c_1stgen_phaseout into cm_1stgen_phaseout

The code should now run. Some namechanges had to be corrected/reversed. These module additions do not affect the results. Further improvements will be commited at a later date.

This is part of a larger refactoring effort of the remind core. Here, code related to the trade of permits and primary energy carriers is moved from the core to the new module. Some renaming is required. For now only one module realization exists, 'standard', which corresponds exactly to what was in the core before. The results are not effected!

This is part of the larger refactoing of the core.

move scripts for magicc into the folder core/magicc, delete outdated script performance_test.R, integrate script submit_compare.cmd into multiComparison.R

Refactoring: - part 2: restructure start scripts (try to minimize workload for the login node on the cluster when starting a REMIND run by moving code into scripts that are included in the slurm job)

*refactoring* Deleted q30_pebiolc_price_base and vm_pebiolc_price_shifted since it was a remainder of old implementations and had no function anymore.

These are mainly naming inconsitencies in the welfare module.