Merge pull request #82 from NREL/plexos_forecast_fix

fix forecast_fpath
NREL · Jan 29, 2021 · d216964 · d216964
2 parents ec2124a + 8cfc8bb
commit d216964
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/reVX/plexos/rev_reeds_plexos.py b/reVX/plexos/rev_reeds_plexos.py
@@ -204,7 +204,7 @@ def _build_sc_profile(self, row_idx, profile):
                 with Outputs(self._cf_fpath, mode='r') as cf_outs:
                     cf_profile = cf_outs['cf_profile', :, gen_gid]
             else:
-                gen_gid = self._forecast_map[gen_gid]
+                gen_gid = int(self._forecast_map[gen_gid])
                 with Outputs(self._forecast_fpath, mode='r') as cf_outs:
                     cf_profile = cf_outs['cf_profile', :, gen_gid]
 
@@ -1148,6 +1148,8 @@ def run(cls, job, out_dir, scenario=None, cf_year=2012,
         if isinstance(job, str):
             job = pd.read_csv(job)
 
+        job = job.where(pd.notnull(job), None)
+
         if isinstance(build_years, int):
             build_years = [build_years]
 

diff --git a/reVX/version.py b/reVX/version.py
@@ -3,4 +3,4 @@
 reVX version number
 """
 
-__version__ = "0.3.16"
+__version__ = "0.3.17"