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.

Sign up for GitHub

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

Jump to bottom

fix R complaining about if in output.R #1715

Merged
merged 1 commit into from
Jun 25, 2024
Merged

fix R complaining about if in output.R #1715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/70_water/heat/declarations.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ p70_cap_vintages(ttot, all_regi, all_te, ttot2) "capacity build
p70_cap_vintages_share(ttot, all_regi, all_te, ttot2) "fraction of capacity build in ttot2 still standing in ttot out of total capacity in ttot. Unit: 0-1"
p70_heat(ttot,all_regi,all_enty,all_enty,all_te) "excess heat. Unit: TWa"
p70_water_con(all_regi, all_te, coolte70) "water consumption coefficients per excess heat. Unit: m3/MWh"
p70_water_wtd(all_regi, all_te, coolte70) "water withdrawal coefficients per excess heat. Unit: m3/MWh)"
p70_water_wtd(all_regi, all_te, coolte70) "water withdrawal coefficients per excess heat. Unit: m3/MWh"

p70_water_output(ttot,all_regi,descr_water_ext) "output"

Expand Down
2 changes: 1 addition & 1 deletion output.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ if (comp %in% c("comparison", "export")) {

# output creation for --testOneRegi was switched off in start.R in this commit:
# https://github.com/remindmodel/remind/commit/5905d9dd814b4e4a62738d282bf1815e6029c965
if (all(is.na(output)) || output == "NA") {
if (all(output %in% c(NA, "NA"))) {
message("\nNo output generation, as output was set to NA, as for example for --testOneRegi or --quick.")
} else {
message("\nStarting output generation for ", outputdir, "\n")
Expand Down
Loading