Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes and improvements in inequality and damage modules #1417

Merged
merged 8 commits into from
Oct 5, 2023

Conversation

fpiontek
Copy link
Contributor

@fpiontek fpiontek commented Sep 20, 2023

Purpose of this PR

  • bug fixes in inequality module
  • bug fix in KW_SE formulation of damage module
  • add temperature and SCC convergence as convergence criterium in the case of integrated runs - the levels can be set in the config through cm_tempConvergence and cm_sccConvergence

Type of change

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

  • Bug fix
  • New feature
  • Minor change (default scenarios show only small differences)

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
  • All automated model tests pass (FAIL 0 in the output of make test)

Copy link
Contributor

@orichters orichters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have some comments, the rest looks fine from my side (did not check the welfare stuff, though)

core/sets.gms Outdated
@@ -754,123 +754,131 @@ sets
ext_regi "extended regions list (includes subsets of H12 regions)"
/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand these changes to core/sets.gms. Do they come from using REMIND-EU? I think they should not be pushed to the repository.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keine Ahnung, woher das kam. ich habe das rausgenommen.

@@ -44,6 +44,7 @@ if ((cm_emiscen ne 1),
Execute_Loadpoint 'input_bau' p02_taxrev_redistr0_ref=v02_taxrev_Add.l;
Execute_Loadpoint 'input_bau' p02_cons_ref=vm_cons.l;
Execute_Loadpoint 'input_bau' p02_energyExp_ref=v02_energyExp.l;
Execute_Loadpoint 'input_bau' p02_damageFactor_ref=vm_damageFactor.l;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are you sure this is correct with input_bau here? Because if that is correct, I'm not sure whether this code is correct, that may potentially remove the path_gdx_bau as not needed if the 45 / 46 realizations don't need it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed it to input_ref. Didn't know about this code.

@@ -8,7 +8,7 @@
*** Load CES parameters based on current model configuration
*** ATTENTION the file name is replaced by the function start_run()
*##################### R SECTION START (CES INPUT) ##########################
$include "./modules/29_CES_parameters/load/input/indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP2EU-GDP_gdp_SSP2EU-En_gdp_SSP2EU-Kap_debt_limit-Reg_62eff8f7.inc"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think also this should not be pushed to the repo

if(sameas(convMessage80,"damage"),
display "#### 11) The damage iteration did not converge.";
display "#### Check out below the values for pm_gmt_conv and pm_sccConvergenceMaxDeviation."
display "#### The should be below 0.05."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a y missing after The

@fpiontek fpiontek merged commit 9b38af8 into remindmodel:develop Oct 5, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants