Merge pull request #309 from PyPSA/fix-minor-warnings

Fixing some warnings in biomass_potentials, gas_input_locations and population_layouts

scripts/build_biomass_potentials.py

@@ -28,7 +28,7 @@ def build_nuts_population_data(year=2013):
     swiss = [swiss.groupby(swiss.index.str[:i]).sum() for i in range(2, 6)]
 
     # merge Europe + Switzerland
-    pop = pd.DataFrame(pop.append(swiss), columns=["total"])
+    pop = pd.concat([pop, pd.concat(swiss)]).to_frame("total")
     
     # add missing manually
     pop["AL"] = 2893

scripts/build_gas_input_locations.py

@@ -31,8 +31,6 @@ def build_gem_lng_data(lng_fn):
               & Country != @remove_country \
               & TerminalName != @remove_terminal \
               & CapacityInMtpa != '--'")
-    
-    df.CapacityInMtpa = df.CapacityInMtpa.astype(float)
 
     geometry = gpd.points_from_xy(df['Longitude'], df['Latitude'])
     return gpd.GeoDataFrame(df, geometry=geometry, crs="EPSG:4326")

scripts/build_population_layouts.py

@@ -16,7 +16,7 @@ if __name__ == '__main__':
 
     cutout = atlite.Cutout(snakemake.config['atlite']['cutout'])
 
-    grid_cells = cutout.grid_cells()
+    grid_cells = cutout.grid.geometry
 
     # nuts3 has columns country, gdp, pop, geometry
     # population is given in dimensions of 1e3=k