Merge pull request #32 from ClimateImpactLab/release_prep0.4.0

v0.4.0 release prep

Author: kemccusker

scripts/batch_scghg.py

@@ -85,10 +85,10 @@
         "2.5% Ramsey": [1.421158116, 0.00461878399],
     }
 
-    eta_rhos = []
+    etas_rhos = []
     for er in target_disc:
         if er in eta_rho_conversion_dict:
-            eta_rhos.append(eta_rho_conversion_dict[er])
+            etas_rhos.append(eta_rho_conversion_dict[er])
         else:
             raise ValueError("Invalid etas_rhos selection")
 
@@ -121,10 +121,10 @@
             conf_name,
             gas_conversion_dict,
             dom,
-            eta_rhos,
+            etas_rhos,
             risk_combos,
             pulse_years=pulse_years,
             gcnp=gcnp,
             uncollapsed=uncollapsed,
         )
-    print(f"Full results are available in {str(Path(conf['save_path']))}")
+    print(f"All results are available in {str(Path(conf['save_path']))}")

scripts/command_line_scghg.py

@@ -35,11 +35,11 @@
             ],
             default=[
                 CAMEL_v,
-                "coastal_v" + coastal_v,
-                "agriculture",
-                "mortality_v" + mortality_v,
-                "energy",
-                "labor",
+                # "coastal_v" + coastal_v,
+                # "agriculture",
+                # "mortality_v" + mortality_v,
+                # "energy",
+                # "labor",
             ],
         ),
         inquirer.Checkbox(
@@ -66,7 +66,9 @@
             "U.S.",
             message="Select valuation type",
             choices=[("Global", False), ("Territorial U.S.", True)],
-            default=[False, True],
+            default=[False, 
+                    #  True
+                     ],
         ),
         inquirer.Checkbox(
             "files",
@@ -118,4 +120,4 @@
             gcnp=gcnp,
             uncollapsed=uncollapsed,
         )
-    print(f"Full results are available in {str(Path(conf['save_path']))}")
+    print(f"All results are available in {str(Path(conf['save_path']))}")

scripts/scghg_utils.py

@@ -12,7 +12,7 @@
 from datetime import date
 
 # EDIT this line upon each release of dscim-facts-epa
-VERSION = "0.2.0"
+VERSION = "0.4.0"
 
 discount_conversion_dict = {
     "1.016010255_9.149608e-05": "1.5% Ramsey",
@@ -92,7 +92,7 @@ def generate_meta(
         dict(
             machine=machine_name,
             commit=gitlabel,
-            url=f"https://github.com/ClimateImpactLab/dscim-epa/commit/{gitlabel}",
+            url=f"https://github.com/ClimateImpactLab/dscim-facts-epa/commit/{gitlabel}",
         )
     )
 
@@ -184,7 +184,7 @@ def epa_scghg(
 ):
 
     if menu_option != "risk_aversion":
-        raise Exception("DSCIM-EPA provides only 'risk_aversion' SCGHGs")
+        raise Exception("DSCIM-FACTS-EPA provides only 'risk_aversion' SCGHGs")
 
     # Manually add other config parameters that are not meant to change run to run
     conf["global_parameters"] = {
@@ -520,18 +520,23 @@ def epa_scghgs(
                 for key, value in attrs.items():
                     f.write("%s:%s\n" % (key, value))
 
-    # Saves global consumption no pulse
-    # Fewer GCNPs are saved because they vary across fewer dimensions than SCGHGs
-    if gcnp:
-        out_dir = Path(conf["save_path"]) / "gcnp"
-        makedir(out_dir)
-        df_full_gcnp.attrs = attrs
-        print(f"Saving {sector_short} global consumption no pulse (gcnp)")
-        df_full_gcnp.to_netcdf(
-            out_dir / f"{conf_savename}gcnp-dscim-{sector_short}.nc4"
-        )
-        print(f"gcnp is available in {str(out_dir)}")
+            # save global consumption no pulse for each sector. Does not vary by pulse_year
+            if pulse_year == pulse_years[0]:
+                # Fewer GCNPs are saved because they vary across fewer dimensions than SCGHGs
+                if gcnp:
+                    out_dir = Path(conf["save_path"]) / "gcnp"
+                    makedir(out_dir)
+                    df_full_gcnp.attrs = attrs
+                    print(f"Saving {sector_short} global consumption no pulse (gcnp)")
+                    df_full_gcnp.to_netcdf(
+                        out_dir / f"{conf_savename}gcnp-dscim-{sector_short}.nc4"
+                    )
+                    print(f"gcnp is available in {str(out_dir)}")
 
     print(
         f"{'territorial_us' if terr_us else 'global'}_scghgs are available in {str(Path(conf['save_path']))}/{'territorial_us' if terr_us else 'global'}_scghgs"
     )
+    if uncollapsed:
+        print(
+            f"Full distributions of {'territorial_us' if terr_us else 'global'}_scghgs are available in {str(Path(conf['save_path']))}/{'territorial_us' if terr_us else 'global'}_scghgs/full_distributions"
+        )