Skip to content

Commit

Permalink
Merge branch 'main' into dev_da
Browse files Browse the repository at this point in the history
  • Loading branch information
romainsacchi authored May 23, 2024
2 parents 60b41a4 + 7d1ca43 commit 7458e6e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pathways/lca.py
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ def process_region(data: Tuple) -> dict[str, ndarray[Any, dtype[Any]] | list[int
id_array = uuid.uuid4()
np.save(file=DIR_CACHED_DB / f"{id_array}.npy", arr=np.stack(d))

# just making sure that the memory is freed. Maybe not needed- check later
# just making sure that the memory is freed. Maybe not needed-check later
del d

# returning a dictionary containing the id_array and the variables
Expand Down
4 changes: 1 addition & 3 deletions pathways/pathways.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,7 @@ def _get_scenarios(self, scenario_data: pd.DataFrame) -> xr.DataArray:
for var in mapping_vars:
if var not in scenario_data["variables"].values:
if self.debug:
logging.warning(
f"Variable {var} not found in scenario data among: {scenario_data['variables'].values.tolist()}."
)
logging.warning(f"Variable {var} not found in scenario data.")

# remove rows which do not have a value under the `variable`
# column that correspond to any value in self.mapping for `scenario variable`
Expand Down

0 comments on commit 7458e6e

Please sign in to comment.