Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renaming CMEMS to Copernicus Marine Service and CMS in documentation #1583

Merged
merged 1 commit into from
Jun 3, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions docs/examples/documentation_MPI.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@
"from parcels import AdvectionRK4, FieldSet, JITParticle, ParticleSet\n",
"\n",
"\n",
"def set_cmems_fieldset(cs):\n",
"def set_cms_fieldset(cs):\n",
" data_dir_head = \"/data/oceanparcels/input_data\"\n",
" data_dir = os.path.join(data_dir_head, \"CMEMS/GLOBAL_REANALYSIS_PHY_001_030/\")\n",
" data_dir = os.path.join(data_dir_head, \"CMS/GLOBAL_REANALYSIS_PHY_001_030/\")\n",
" files = sorted(glob(data_dir + \"mercatorglorys12v1_gl12_mean_201607*.nc\"))\n",
" variables = {\"U\": \"uo\", \"V\": \"vo\"}\n",
" dimensions = {\"lon\": \"longitude\", \"lat\": \"latitude\", \"time\": \"time\"}\n",
Expand All @@ -242,7 +242,7 @@
"mem_used_GB = []\n",
"chunksize = [128, 256, 512, 768, 1024, 1280, 1536, 1792, 2048, 2610, \"auto\", False]\n",
"for cs in chunksize:\n",
" fieldset = set_cmems_fieldset(cs)\n",
" fieldset = set_cms_fieldset(cs)\n",
" pset = ParticleSet(\n",
" fieldset=fieldset, pclass=JITParticle, lon=[0], lat=[0], repeatdt=delta(hours=1)\n",
" )\n",
Expand Down Expand Up @@ -342,7 +342,7 @@
"\n",
"It may - depending on your simulation goal - be necessary to tweak the chunksize to leave more memory space for additional particles that are being simulated. Since particles and fields share the same memory space, lower memory utilisation by the `FieldSet` means more memory available for a larger `ParticleSet`.\n",
"\n",
"Also note that the above example is for a 2D application. For 3D applications, the `chunksize=False` will almost always be slower than `chunksize='auto'` or any dictionary, and is likely to run into insufficient memory issues, raising a `MemoryError`. The plot below shows the same analysis as above, but this time for a set of simulations using the full 3D CMEMS code. In this case, the `chunksize='auto'` is about two orders of magnitude faster than running without chunking, and about 7.5 times faster than with minimal chunk capacity (i.e. `chunksize=(1, 128, 128)`).\n",
"Also note that the above example is for a 2D application. For 3D applications, the `chunksize=False` will almost always be slower than `chunksize='auto'` or any dictionary, and is likely to run into insufficient memory issues, raising a `MemoryError`. The plot below shows the same analysis as above, but this time for a set of simulations using the full 3D Copernicus Marine Service code. In this case, the `chunksize='auto'` is about two orders of magnitude faster than running without chunking, and about 7.5 times faster than with minimal chunk capacity (i.e. `chunksize=(1, 128, 128)`).\n",
"\n",
"Choosing too small chunksizes can make the code slower, again highlighting that it is wise to explore which chunksize is best for your experiment before you perform it.\n"
]
Expand All @@ -368,9 +368,9 @@
"from parcels import AdvectionRK4_3D\n",
"\n",
"\n",
"def set_cmems_fieldset_3D(cs):\n",
"def set_cms_fieldset_3D(cs):\n",
" data_dir_head = \"/data/oceanparcels/input_data\"\n",
" data_dir = os.path.join(data_dir_head, \"CMEMS/GLOBAL_REANALYSIS_PHY_001_030/\")\n",
" data_dir = os.path.join(data_dir_head, \"CMS/GLOBAL_REANALYSIS_PHY_001_030/\")\n",
" files = sorted(glob(data_dir + \"mercatorglorys12v1_gl12_mean_201607*.nc\"))\n",
" variables = {\"U\": \"uo\", \"V\": \"vo\"}\n",
" dimensions = {\n",
Expand All @@ -393,7 +393,7 @@
"chunksize_3D = [128, 256, 512, 768, 1024, 1280, 1536, 1792, 2048, 2610, \"auto\", False]\n",
"func_time3D = []\n",
"for cs in chunksize_3D:\n",
" fieldset = set_cmems_fieldset_3D(cs)\n",
" fieldset = set_cms_fieldset_3D(cs)\n",
" pset = ParticleSet(\n",
" fieldset=fieldset, pclass=JITParticle, lon=[0], lat=[0], repeatdt=delta(hours=1)\n",
" )\n",
Expand Down
Loading