Skip to content

Commit 903d479

Browse files
Adding example_Italy_coastline
1 parent 2a1dc33 commit 903d479

3 files changed

Lines changed: 253 additions & 16 deletions

File tree

docs/examples/default_settings.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
"use_3D": true,
33
"allow_time_extrapolation": false,
44
"verbose_delete": false,
5-
"mixing_f": false,
6-
"biofouling_f": false,
7-
"stokes_f": false,
8-
"wind_f": false,
5+
"use_mixing": false,
6+
"use_biofouling": false,
7+
"use_stokes": false,
8+
"use_wind": false,
99
"ocean": {
1010
"modelname": "NEMO0083",
11-
"directory": "data/input_data/MOi/",
11+
"directory": "/storage/shared/oceanparcels/input_data/MOi/",
1212
"filename_style": "psy4v3r1/psy4v3r1-daily_",
13-
"ocean_mesh": "domain_ORCA0083-N006/coordinates.nc",
14-
"bathymetry_mesh": "domain_ORCA0083-N006/bathymetry_ORCA12_V3.3.nc",
13+
"ocean_mesh": "domain_ORCA0083-N006/PSY4V3R1_mesh_hgr.nc",
14+
"bathymetry_mesh": "domain_ORCA0083-N006/PSY4V3R1_mesh_zgr.nc",
1515
"variables": {
1616
"U": "vozocrtx",
1717
"V": "vomecrty",
@@ -53,7 +53,7 @@
5353
},
5454
"indices": {},
5555
"bathymetry_variables": {
56-
"bathymetry": "Bathymetry"
56+
"bathymetry": "mbathy"
5757
},
5858
"bathymetry_dimensions": {
5959
"lon": "nav_lon",
@@ -70,7 +70,7 @@
7070
}
7171
},
7272
"bgc": {
73-
"directory": "data/input_data/MOi/",
73+
"directory": "/storage/shared/oceanparcels/input_data/MOi/",
7474
"filename_style": "biomer4v2r1/biomer4v2r1-weekly_",
7575
"bgc_mesh": "domain_ORCA025-N006/mesh_hgr_PSY4V3_deg.nc",
7676
"variables": {
@@ -113,7 +113,7 @@
113113
}
114114
},
115115
"stokes": {
116-
"directory": "data/input_data/ERA5/waves/",
116+
"directory": "/storage/shared/oceanparcels/output_data/data_Michael/ERA5/waves/",
117117
"filename_style": "ERA5_global_waves_monthly_",
118118
"variables": {
119119
"Stokes_U": "ust",
@@ -128,7 +128,7 @@
128128
"indices": {}
129129
},
130130
"wind": {
131-
"directory": "data/input_data/ERA5/wind/",
131+
"directory": "/storage/shared/oceanparcels/output_data/data_Michael/ERA5/wind/",
132132
"filename_style": "ERA5_global_wind_monthly_",
133133
"variables": {
134134
"Wind_U": "u10",
@@ -142,7 +142,7 @@
142142
"indices": {}
143143
},
144144
"unbeaching": {
145-
"directory": "data/output_data/masks/",
145+
"directory": "input_data/NEMO0083/",
146146
"filename": "land_current_NEMO0083.nc",
147147
"variables": {
148148
"unbeach_U": "land_current_u",
@@ -160,9 +160,9 @@
160160
"dt_timestep": null
161161
},
162162
"release_maps": {
163-
"coastal": "data/release/generated_files/coastal_population_MPW_NEMO0083.csv",
164-
"rivers": "data/release/generated_files/river_emissions_NEMO0083.csv",
165-
"fisheries": "data/release/generated_files/agg_data_fisheries_info_NEMO0083.csv",
163+
"coastal": "input_data/NEMO0083/coastal_population_MPW_NEMO0083.csv",
164+
"rivers": "input_data/NEMO0083/river_emissions_NEMO0083.csv",
165+
"fisheries": "input_data/NEMO0083/agg_data_fisheries_info.csv",
166166
"global_concentrations": null
167167
}
168168
}

docs/examples/example_Italy_coast.ipynb

Lines changed: 237 additions & 0 deletions
Large diffs are not rendered by default.

plasticparcels/constructors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def create_fieldset(settings):
182182

183183
# Apply unbeaching currents when Stokes/Wind can push particles into land cells
184184
if fieldset.use_stokes or fieldset.use_wind > 0:
185-
unbeachfiles = settings['unbeaching']['filename']
185+
unbeachfiles = os.path.join(settings['unbeaching']['directory'], settings['unbeaching']['filename'])
186186
filenames_unbeach = {'unbeach_U': unbeachfiles,
187187
'unbeach_V': unbeachfiles}
188188

0 commit comments

Comments
 (0)