diff --git a/scripts/build_biomass_potentials.py b/scripts/build_biomass_potentials.py index 69b886fc..a2cb6d6a 100644 --- a/scripts/build_biomass_potentials.py +++ b/scripts/build_biomass_potentials.py @@ -28,7 +28,8 @@ 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)]) + pop = pd.DataFrame(pop, columns=["total"]) # add missing manually pop["AL"] = 2893 diff --git a/scripts/build_gas_input_locations.py b/scripts/build_gas_input_locations.py index 2edfd81b..1e957fed 100644 --- a/scripts/build_gas_input_locations.py +++ b/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") diff --git a/scripts/build_population_layouts.py b/scripts/build_population_layouts.py index ba64e10f..7936d831 100644 --- a/scripts/build_population_layouts.py +++ b/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