Merge pull request #249 from ClimateImpactLab/clean_dscim

Clean dscim. Remove outdated scripts and functions.

Author: kemccusker

CHANGELOG.md

@@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Removed
+
+- Removed [`preprocessing/climate`](https://github.com/ClimateImpactLab/dscim/tree/25dfb39637d5716662a3ec636028d5066ddb10bb/src/dscim/preprocessing/climate) and [`preprocessing/misc`](https://github.com/ClimateImpactLab/dscim/tree/25dfb39637d5716662a3ec636028d5066ddb10bb/src/dscim/preprocessing/misc) subpackages. ([PR #249](https://github.com/ClimateImpactLab/dscim/pull/249), [@JMGilbert](https://github.com/JMGilbert))
+    - The modules in these subpackages referenced hard coded filepaths and were used for old versions of climate files and inputs that are now properly formatted by default
+- Removed [`utils/generate_yaml`](https://github.com/ClimateImpactLab/dscim/blob/25dfb39637d5716662a3ec636028d5066ddb10bb/src/dscim/utils/generate_yaml.py) and [`utils/plotting_utils`](https://github.com/ClimateImpactLab/dscim/blob/25dfb39637d5716662a3ec636028d5066ddb10bb/src/dscim/utils/plotting_utils.py) modules. ([PR #249](https://github.com/ClimateImpactLab/dscim/pull/249), [@JMGilbert](https://github.com/JMGilbert))
+    - `generate_yaml` seems to have been designed for an old version of `dscim-epa` and that functionality has now been transferred to the `scripts/directory_setup.py` script in the `dscim-epa` and `dscim-facts-epa` repositories
+    - `plotting utils` was only in use for a single diagnostic and was transferred to the script that generated that diagnostic
+- Removed `midprocessing` [`update_damage_function_library`](https://github.com/ClimateImpactLab/dscim/blob/25dfb39637d5716662a3ec636028d5066ddb10bb/src/dscim/preprocessing/midprocessing.py#L8-L26) and `utils` [`constant_equivalent_discount_rate`](https://github.com/ClimateImpactLab/dscim/blob/main/src/dscim/utils/functions.py#L25-L61), [`calculate_constant_equivalent_discount_rate`](https://github.com/ClimateImpactLab/dscim/blob/main/src/dscim/utils/functions.py#L64-L142), and [`get_model_weights`](https://github.com/ClimateImpactLab/dscim/blob/main/src/dscim/utils/functions.py#L145-L216) functions. ([PR #249](https://github.com/ClimateImpactLab/dscim/pull/249), [@JMGilbert](https://github.com/JMGilbert))
+    - `update_damage_function_library` was previously used to move files prior to the functionality that directly saved files into the appropriate location
+    - `constant_equivalent_discount_rate` and `calculate_constant_equivalent_discount_rate` are used for integration paper tables, and have been transferred to the appropriate scripts
+    - `get_model_weights` is used for a few diagnostics and has been transferred to the appropriate scripts
+
+
 ## [0.6.0] - 2024-04-24
 
 ### Added

src/dscim/preprocessing/climate/all_masks_rff.py

@@ -290,9 +290,9 @@ def calculate_labor_batch_damages(batch, ec, input_path, save_path):
 
 
 def calculate_labor_damages(
-    path_econ="/shares/gcp/integration/float32/dscim_input_data/econvars/zarrs/integration-econ-bc39.zarr",
-    input_path="/shares/gcp/outputs/labor/impacts-woodwork/mc_correct_rebasing_for_integration",
-    save_path="/shares/gcp/integration/float32/input_data_histclim/labor_data/replication/",
+    path_econ,
+    input_path,
+    save_path,
 ):
     ec = EconVars(path_econ)
     # process in 3 rounds to limit memory usage

src/dscim/preprocessing/climate/ssp_clipped_rff.py

@@ -1,31 +1,9 @@
 import os
-import shutil
 
 USER = os.getenv("USER")
 import xarray as xr
 
 
-def update_damage_function_library(
-    input,
-    output,
-    recipe,
-    disc,
-    eta,
-    rho,
-    fit=True,
-):
-    os.makedirs(output, exist_ok=True)
-    shutil.copy2(
-        f"{input}/{recipe}_{disc}_eta{eta}_rho{rho}_damage_function_coefficients.nc4",
-        output,
-    )
-
-    if fit:
-        shutil.copy2(
-            f"{input}/{recipe}_{disc}_eta{eta}_rho{rho}_damage_function_fit.nc4", output
-        )
-
-
 def combine_CAMEL_coefs(
     recipe,
     disc,