Skip to content

Commit

Permalink
Merge pull request #66 from NREL/never_drop_duplicate_plexos_year
Browse files Browse the repository at this point in the history
Ensures PLEXOS year duplicate values arent dropped
  • Loading branch information
daniellevie authored Nov 18, 2022
2 parents 79c911c + 4899cd0 commit 6d8bdbf
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion marmot/marmot_h5_formatter.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,11 @@ def run_formatter(
data_chunks.append(processed_data)

# Combine models
Processed_Data_Out = process_sim_model.combine_models(data_chunks)
if row["data_type"] == "year" and sim_model == "PLEXOS":
Processed_Data_Out = process_sim_model.combine_models(data_chunks, drop_duplicates=False)
else:
Processed_Data_Out = process_sim_model.combine_models(data_chunks)

if Processed_Data_Out.empty is False:
if row["data_type"] == "year" and sim_model == "PLEXOS":
self.logger.info(PLEXOS_YEAR_WARNING)
Expand Down

0 comments on commit 6d8bdbf

Please sign in to comment.