Adding global concentration maps to the download function, and to the particle set creation method

Author: michaeldenes

plasticparcels/constructors.py

@@ -39,7 +39,7 @@ def create_hydrodynamic_fieldset(settings):
     wfiles = select_files(dirread_model, 'W_%4i*.nc', start_date, runtime, dt_margin=3)
     tfiles = select_files(dirread_model, 'T_%4i*.nc', start_date, runtime, dt_margin=3)
     sfiles = select_files(dirread_model, 'S_%4i*.nc', start_date, runtime, dt_margin=3)
-
+    
     filenames = {'U': {'lon': ocean_mesh, 'lat': ocean_mesh, 'depth': wfiles[0], 'data': ufiles},
                  'V': {'lon': ocean_mesh, 'lat': ocean_mesh, 'depth': wfiles[0], 'data': vfiles},
                  'W': {'lon': ocean_mesh, 'lat': ocean_mesh, 'depth': wfiles[0], 'data': wfiles},
@@ -225,7 +225,7 @@ def create_particleset_from_map(fieldset, settings):
         'coastal': 'MPW_Cell',
         'rivers': 'Emissions',
         'fisheries': 'fishing_hours',
-        'global_concentrations': None  # TODO: Not implemented yet
+        'global_concentrations': 'Concentration'
     }
     release_quantity_name = release_quantity_names[release_type]
 
@@ -242,6 +242,8 @@ def create_particleset_from_map(fieldset, settings):
         particle_locations = particle_locations[particle_locations['Country'] == settings['release']['country']]
     if 'economicstatus' in settings['release'].keys():
         particle_locations = particle_locations[particle_locations['Economic status'] == settings['release']['economicstatus']]
+    if 'concentration_type' in settings['release'].keys():
+        particle_locations = particle_locations[particle_locations['ConcentrationType'] == settings['release']['concentrationtype']]
 
     particle_locations = particle_locations.groupby(['Longitude', 'Latitude'])[release_quantity_name].agg('sum').reset_index()
     particle_locations = particle_locations[particle_locations[release_quantity_name] > 0]

plasticparcels/utils.py

@@ -132,6 +132,7 @@ def download_plasticparcels_dataset(dataset: str, settings, data_home=None):
             (("release_maps", "coastal"), "coastal_population_MPW_NEMO0083.csv"),
             (("release_maps", "rivers"), "river_emissions_NEMO0083.csv"),
             (("release_maps", "fisheries"), "agg_data_fisheries_info_NEMO0083.csv"),
+            (("release_maps", "global_concentrations"), "global_concentrations_NEMO0083.csv"),
             (("unbeaching", "filename"), "land_current_NEMO0083.nc"),
         ],
     }