Merge pull request #172 from knutfrode/dev

Fixed some misprints

Author: knutfrode

examples/example_concentration.py

@@ -36,7 +36,7 @@
 plt.show()
 
 #%% 
-# We see that the cell area decreases slightly sway from equator.
+# We see that the cell area decreases slightly away from equator.
 # This is accounted for when calculating area/volume concentration.
 ds_c.cell_area.plot()
 plt.show()
@@ -49,9 +49,8 @@
 
 #%% 
 # Calculate the concentration of elements for this new grid, also weighted with element property "mass_oil"
-weights = 'mass_oil'
 ds = ds.isel(time=12)  # Pre-selecting a single time before calculating concentrations
-ds_c = ds.traj.concentration(grid3d, weights=weights)
+ds_c = ds.traj.concentration(grid3d, weights='mass_oil')
 
 #%% 
 # Plot the oil concentration (mass/volume, kg/m3) at depths 1-3m and 20-30m

trajan/traj.py

@@ -1301,15 +1301,15 @@ def concentration(self, grid, weights=None):
             The same grid Xarray Dataset as input, with the following variables added:
               - number: the number of elements within each grid cell
               - number_area_concentration: the number of elements per area of each grid cell
-                    (only if grid does not contain z)
+                (only if grid does not contain z)
               - number_volume_concentration: the number of elements per volume of each grid cell
-                    (only if grid does not contain z)
+                (only if grid does not contain z)
               - <weights>_sum: the sum of property <weights> within each grid cell
               - <weights>_mean: the mean of property <weights> within each grid cell
               - <weights>_area_concentration: the concentration of <weights> per area of each grid cell
-                    (only if grid does not contain z)
+                (only if grid does not contain z)
               - <weights>_volume_concentration: the volume concentration of <weights> per volume of each grid cell
-                    (only if grid contains z)
+                (only if grid contains z)
         """
 
         # TODO: support other projections