update data and plots to run through feb 2023; include time series of…

… annual maxima at different durations in data/outputs
jdossgollin · Jan 17, 2024 · cc5a85d · cc5a85d
1 parent 8d47a23
commit cc5a85d
Show file tree

Hide file tree

Showing 24 changed files with 542 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+nohup.out
+
 data/raw/
 data/processed/
 .snakemake/

diff --git a/Snakefile b/Snakefile
@@ -192,7 +192,7 @@ rule ghcn_subset:
         script=scriptdir("ghcn_subset.py"),
         stations=datadir("raw", "ghcnd_stations.txt"),
     output:
-        datadir("processed", "ghnd", "valid_stations.csv"),
+        datadir("processed", "ghcnd", "valid_stations.csv"),
     shell:
         "python {input.script} -i {input.stations} -o {output}"
 
@@ -201,7 +201,7 @@ rule ghcn_subset:
 rule historical_exceedance:
     input:
         script=scriptdir("ghcn_return_period.py"),
-        stations=datadir("processed", "ghnd", "valid_stations.csv"),
+        stations=datadir("processed", "ghcnd", "valid_stations.csv"),
     output:
         datadir("processed", "ghcnd", "return_periods.csv"),
     shell:

diff --git a/data/outputs/hdd_annual_ercot.nc b/data/outputs/hdd_annual_ercot.nc
diff --git a/fig/ERCOT_HDD_IDF_MLE_popweighted.jpg b/fig/ERCOT_HDD_IDF_MLE_popweighted.jpg
diff --git a/fig/ERCOT_HDD_IDF_MLE_popweighted.pdf b/fig/ERCOT_HDD_IDF_MLE_popweighted.pdf
diff --git a/fig/ERCOT_HDD_IDF_MLE_unweighted.jpg b/fig/ERCOT_HDD_IDF_MLE_unweighted.jpg
diff --git a/fig/ERCOT_HDD_IDF_MLE_unweighted.pdf b/fig/ERCOT_HDD_IDF_MLE_unweighted.pdf
diff --git a/fig/ERCOT_HDD_IDF_plotpos_popweighted.jpg b/fig/ERCOT_HDD_IDF_plotpos_popweighted.jpg
diff --git a/fig/ERCOT_HDD_IDF_plotpos_popweighted.pdf b/fig/ERCOT_HDD_IDF_plotpos_popweighted.pdf
diff --git a/fig/ERCOT_HDD_IDF_plotpos_unweighted.jpg b/fig/ERCOT_HDD_IDF_plotpos_unweighted.jpg
diff --git a/fig/ERCOT_HDD_IDF_plotpos_unweighted.pdf b/fig/ERCOT_HDD_IDF_plotpos_unweighted.pdf
diff --git a/fig/HDD_pop_weighted_ts.pdf b/fig/HDD_pop_weighted_ts.pdf
diff --git a/fig/historic_events_bk.pdf b/fig/historic_events_bk.pdf
diff --git a/fig/historic_events_era5.jpg b/fig/historic_events_era5.jpg
diff --git a/fig/historic_events_era5.pdf b/fig/historic_events_era5.pdf
diff --git a/fig/historic_events_era5_TX.jpg b/fig/historic_events_era5_TX.jpg
diff --git a/fig/historic_events_era5_TX.pdf b/fig/historic_events_era5_TX.pdf
diff --git a/fig/local_rt_era5.jpg b/fig/local_rt_era5.jpg
diff --git a/fig/local_rt_era5.pdf b/fig/local_rt_era5.pdf
diff --git a/fig/local_rt_ghcnd.jpg b/fig/local_rt_ghcnd.jpg
diff --git a/fig/local_rt_ghcnd.pdf b/fig/local_rt_ghcnd.pdf
diff --git a/scripts/era5_return.py b/scripts/era5_return.py
@@ -24,7 +24,13 @@ def main() -> None:
     parser.add_argument("-o", "--outfile", type=str)
     args = parser.parse_args()
 
-    temp = xr.open_mfdataset(args.infiles)["t2m"].compute()
+    # this makes the workflow easier to debug and run in a notebook vs 
+    # using args.infiles and args.outfile
+    infiles = args.infiles
+    outfile = args.outfile
+
+    # read in the raw data
+    temp = xr.open_mfdataset(infiles)["t2m"].compute().isel(expver=1).drop_vars("expver")
     temp_roll = xr.concat(
         [
             temp.rolling(time=dur).mean().assign_coords({"duration": dur})
@@ -57,7 +63,7 @@ def main() -> None:
                     dict(longitude=lon, latitude=lat, duration=duration)
                 ] = rt_estimate
 
-    era5_return.to_netcdf(args.outfile, format="NETCDF4")
+    era5_return.to_netcdf(outfile, format="NETCDF4")
 
 
 if __name__ == "__main__":

diff --git a/scripts/hdd_idf.ipynb b/scripts/hdd_idf.ipynb
diff --git a/scripts/local_return_period.ipynb b/scripts/local_return_period.ipynb