Skip to content

Commit 257befb

Browse files
committed
Fix spelling errors
1 parent b333472 commit 257befb

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

gsw/_utilities.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def masked_array_support(f):
2929
If a where keyword argument is present, it will be used instead of the
3030
masked derived value.
3131
32-
All args/kwargs are then passed directly to the wrapped fuction
32+
All args/kwargs are then passed directly to the wrapped function
3333
"""
3434

3535
@wraps(f)

gsw/_wrapped_ufuncs.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ def enthalpy_first_derivatives(SA, CT, p, **kwargs):
960960
(1) h_SA, the derivative with respect to Absolute Salinity at
961961
constant CT and p, and
962962
(2) h_CT, derivative with respect to CT at constant SA and p.
963-
Note that h_P is specific volume (1/rho) it can be caclulated by calling
963+
Note that h_P is specific volume (1/rho) it can be calculated by calling
964964
gsw_specvol(SA,CT,p).
965965
966966
Parameters
@@ -993,7 +993,7 @@ def enthalpy_first_derivatives_CT_exact(SA, CT, p, **kwargs):
993993
(1) h_SA, the derivative with respect to Absolute Salinity at
994994
constant CT and p, and
995995
(2) h_CT, derivative with respect to CT at constant SA and p.
996-
Note that h_P is specific volume, v, it can be calulated by calling
996+
Note that h_P is specific volume, v, it can be calculated by calling
997997
gsw_specvol_CT_exact(SA,CT,p).
998998
999999
Parameters
@@ -1322,7 +1322,7 @@ def frazil_properties(SA_bulk, h_bulk, p, **kwargs):
13221322
"""
13231323
Calculates the mass fraction of ice (mass of ice divided by mass of ice
13241324
plus seawater), w_Ih_final, which results from given values of the bulk
1325-
Absolute Salinity, SA_bulk, bulk enthalpy, h_bulk, occuring at pressure
1325+
Absolute Salinity, SA_bulk, bulk enthalpy, h_bulk, occurring at pressure
13261326
p. The final values of Absolute Salinity, SA_final, and Conservative
13271327
Temperature, CT_final, of the interstitial seawater phase are also
13281328
returned. This code assumes that there is no dissolved air in the
@@ -1364,11 +1364,11 @@ def frazil_properties_potential(SA_bulk, h_pot_bulk, p, **kwargs):
13641364
Calculates the mass fraction of ice (mass of ice divided by mass of ice
13651365
plus seawater), w_Ih_eq, which results from given values of the bulk
13661366
Absolute Salinity, SA_bulk, bulk potential enthalpy, h_pot_bulk,
1367-
occuring at pressure p. The final equilibrium values of Absolute
1367+
occurring at pressure p. The final equilibrium values of Absolute
13681368
Salinity, SA_eq, and Conservative Temperature, CT_eq, of the
13691369
interstitial seawater phase are also returned. This code assumes that
13701370
there is no dissolved air in the seawater (that is, saturation_fraction
1371-
is assumed to be zero thoughout the code).
1371+
is assumed to be zero throughout the code).
13721372
13731373
Parameters
13741374
----------
@@ -1405,11 +1405,11 @@ def frazil_properties_potential_poly(SA_bulk, h_pot_bulk, p, **kwargs):
14051405
Calculates the mass fraction of ice (mass of ice divided by mass of ice
14061406
plus seawater), w_Ih_eq, which results from given values of the bulk
14071407
Absolute Salinity, SA_bulk, bulk potential enthalpy, h_pot_bulk,
1408-
occuring at pressure p. The final equilibrium values of Absolute
1408+
occurring at pressure p. The final equilibrium values of Absolute
14091409
Salinity, SA_eq, and Conservative Temperature, CT_eq, of the
14101410
interstitial seawater phase are also returned. This code assumes that
14111411
there is no dissolved air in the seawater (that is, saturation_fraction
1412-
is assumed to be zero thoughout the code).
1412+
is assumed to be zero throughout the code).
14131413
14141414
Parameters
14151415
----------
@@ -1510,7 +1510,7 @@ def frazil_ratios_adiabatic_poly(SA, p, w_Ih, **kwargs):
15101510
def gibbs_ice_part_t(t, p, **kwargs):
15111511
"""
15121512
part of the the first temperature derivative of Gibbs energy of ice
1513-
that is the outout is gibbs_ice(1,0,t,p) + S0
1513+
that is the output is gibbs_ice(1,0,t,p) + S0
15141514
15151515
Parameters
15161516
----------
@@ -1532,7 +1532,7 @@ def gibbs_ice_part_t(t, p, **kwargs):
15321532
def gibbs_ice_pt0(pt0, **kwargs):
15331533
"""
15341534
part of the the first temperature derivative of Gibbs energy of ice
1535-
that is the outout is "gibbs_ice(1,0,pt0,0) + s0"
1535+
that is the output is "gibbs_ice(1,0,pt0,0) + s0"
15361536
15371537
Parameters
15381538
----------
@@ -2149,10 +2149,10 @@ def melting_seaice_into_seawater(SA, CT, p, w_seaice, SA_seaice, t_seaice, **kwa
21492149
-------
21502150
SA_final : array-like, g/kg
21512151
Absolute Salinity of the mixture of the melted sea ice
2152-
(or ice) and the orignal seawater
2152+
(or ice) and the original seawater
21532153
CT_final : array-like, deg C
21542154
Conservative Temperature of the mixture of the melted
2155-
sea ice (or ice) and the orignal seawater
2155+
sea ice (or ice) and the original seawater
21562156
21572157
21582158
"""
@@ -2633,7 +2633,7 @@ def pt_from_CT(SA, CT, **kwargs):
26332633
Calculates potential temperature (with a reference sea pressure of
26342634
zero dbar) from Conservative Temperature. This function uses 1.5
26352635
iterations through a modified Newton-Raphson (N-R) iterative solution
2636-
proceedure, starting from a rational-function-based initial condition
2636+
procedure, starting from a rational-function-based initial condition
26372637
for both pt and dCT_dpt.
26382638
26392639
Parameters
@@ -2842,7 +2842,7 @@ def rho(SA, CT, p, **kwargs):
28422842
@masked_array_support
28432843
def rho_alpha_beta(SA, CT, p, **kwargs):
28442844
"""
2845-
Calculates in-situ density, the appropiate thermal expansion coefficient
2845+
Calculates in-situ density, the appropriate thermal expansion coefficient
28462846
and the appropriate saline contraction coefficient of seawater from
28472847
Absolute Salinity and Conservative Temperature. This function uses the
28482848
computationally-efficient expression for specific volume in terms of
@@ -2944,7 +2944,7 @@ def rho_ice(t, p, **kwargs):
29442944
"""
29452945
Calculates in-situ density of ice from in-situ temperature and pressure.
29462946
Note that the output, rho_ice, is density, not density anomaly; that
2947-
is, 1000 kg/m^3 is not subracted from it.
2947+
is, 1000 kg/m^3 is not subtracted from it.
29482948
29492949
Parameters
29502950
----------
@@ -3050,7 +3050,7 @@ def rho_t_exact(SA, t, p, **kwargs):
30503050
"""
30513051
Calculates in-situ density of seawater from Absolute Salinity and
30523052
in-situ temperature. Note that the output, rho, is density,
3053-
not density anomaly; that is, 1000 kg/m^3 is not subracted from it.
3053+
not density anomaly; that is, 1000 kg/m^3 is not subtracted from it.
30543054
30553055
Parameters
30563056
----------
@@ -3773,7 +3773,7 @@ def specvol(SA, CT, p, **kwargs):
37733773
@masked_array_support
37743774
def specvol_alpha_beta(SA, CT, p, **kwargs):
37753775
"""
3776-
Calculates specific volume, the appropiate thermal expansion coefficient
3776+
Calculates specific volume, the appropriate thermal expansion coefficient
37773777
and the appropriate saline contraction coefficient of seawater from
37783778
Absolute Salinity and Conservative Temperature. This function uses the
37793779
computationally-efficient expression for specific volume in terms of
@@ -3809,9 +3809,9 @@ def specvol_anom_standard(SA, CT, p, **kwargs):
38093809
Calculates specific volume anomaly from Absolute Salinity, Conservative
38103810
Temperature and pressure. It uses the computationally-efficient
38113811
expression for specific volume as a function of SA, CT and p (Roquet
3812-
et al., 2015). The reference value to which the anomally is calculated
3812+
et al., 2015). The reference value to which the anomaly is calculated
38133813
has an Absolute Salinity of SSO and Conservative Temperature equal to
3814-
0 degress C.
3814+
0 degrees C.
38153815
38163816
Parameters
38173817
----------
@@ -4264,7 +4264,7 @@ def t_freezing_first_derivatives(SA, p, saturation_fraction, **kwargs):
42644264
@masked_array_support
42654265
def t_freezing_first_derivatives_poly(SA, p, saturation_fraction, **kwargs):
42664266
"""
4267-
Calculates the frist derivatives of the in-situ temperature at which
4267+
Calculates the first derivatives of the in-situ temperature at which
42684268
seawater freezes with respect to Absolute Salinity SA and pressure P (in
42694269
Pa). These expressions come from differentiating the expression that
42704270
defines the freezing temperature, namely the equality between the

0 commit comments

Comments
 (0)