Skip to content
This repository was archived by the owner on Sep 24, 2021. It is now read-only.

Commit d39aab1

Browse files
efiringefiring
authored
Merge pull request #40 from castelao/cleanup
Taking the unimplemented functions out of the namespace
2 parents b1643b9 + e02a664 commit d39aab1

File tree

8 files changed

+228
-224
lines changed

8 files changed

+228
-224
lines changed

‎gsw/gibbs/conversions.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
'SA_from_Sstar',
2525
'SP_from_SA',
2626
'SP_from_SR',
27-
'SP_from_Sstar', # TODO
27+
#'SP_from_Sstar', # TODO
2828
'SR_from_SP',
2929
'Sstar_from_SA',
3030
'deltaSA_from_SP', # TODO
@@ -297,8 +297,8 @@ def SP_from_SR(SR):
297297
return 1. / uPS * SR
298298

299299

300-
def SP_from_Sstar():
301-
pass
300+
#def SP_from_Sstar():
301+
# pass
302302

303303

304304
@match_args_return

‎gsw/gibbs/density_enthalpy_48_ct.py‎

Lines changed: 58 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4,101 +4,102 @@
44

55
import numpy as np
66

7-
__all__ = ['alpha_CT', # TODO
8-
'beta_CT', # TODO
9-
'CT_from_rho', # TODO
10-
'CT_maxdensity', # TODO
11-
'dynamic_enthalpy_CT', # TODO
12-
'enthalpy_CT', # TODO
13-
'enthalpy_diff_CT', # TODO
14-
'internal_energy_CT', # TODO
15-
'rho_CT', # TODO
16-
'rho_alpha_beta_CT', # TODO
17-
'SA_from_rho_CT', # TODO
18-
'sigma0_CT', # TODO
19-
'sigma1_CT', # TODO
20-
'sigma2_CT', # TODO
21-
'sigma3_CT', # TODO
22-
'sigma4_CT', # TODO
23-
'sound_speed_CT', # TODO
24-
'specvol_CT', # TODO
25-
'specvol_anom_CT'] # TODO
7+
__all__ = []
8+
# 'alpha_CT', # TODO
9+
# 'beta_CT', # TODO
10+
# 'CT_from_rho', # TODO
11+
# 'CT_maxdensity', # TODO
12+
# 'dynamic_enthalpy_CT', # TODO
13+
# 'enthalpy_CT', # TODO
14+
# 'enthalpy_diff_CT', # TODO
15+
# 'internal_energy_CT', # TODO
16+
# 'rho_CT', # TODO
17+
# 'rho_alpha_beta_CT', # TODO
18+
# 'SA_from_rho_CT', # TODO
19+
# 'sigma0_CT', # TODO
20+
# 'sigma1_CT', # TODO
21+
# 'sigma2_CT', # TODO
22+
# 'sigma3_CT', # TODO
23+
# 'sigma4_CT', # TODO
24+
# 'sound_speed_CT', # TODO
25+
# 'specvol_CT', # TODO
26+
# 'specvol_anom_CT'] # TODO
2627

2728

28-
def alpha_CT():
29-
pass
29+
#def alpha_CT():
30+
# pass
3031

3132

32-
def beta_CT():
33-
pass
33+
#def beta_CT():
34+
# pass
3435

3536

36-
def CT_from_rho():
37-
pass
37+
#def CT_from_rho():
38+
# pass
3839

3940

40-
def CT_maxdensity():
41-
pass
41+
#def CT_maxdensity():
42+
# pass
4243

4344

44-
def dynamic_enthalpy_CT():
45-
pass
45+
#def dynamic_enthalpy_CT():
46+
# pass
4647

4748

48-
def enthalpy_CT():
49-
pass
49+
#def enthalpy_CT():
50+
# pass
5051

5152

52-
def enthalpy_diff_CT():
53-
pass
53+
#def enthalpy_diff_CT():
54+
# pass
5455

5556

56-
def internal_energy_CT():
57-
pass
57+
#def internal_energy_CT():
58+
# pass
5859

5960

60-
def rho_CT():
61-
pass
61+
#def rho_CT():
62+
# pass
6263

6364

64-
def rho_alpha_beta_CT():
65-
pass
65+
#def rho_alpha_beta_CT():
66+
# pass
6667

6768

68-
def SA_from_rho_CT():
69-
pass
69+
#def SA_from_rho_CT():
70+
# pass
7071

7172

72-
def sigma0_CT():
73-
pass
73+
#def sigma0_CT():
74+
# pass
7475

7576

76-
def sigma1_CT():
77-
pass
77+
#def sigma1_CT():
78+
# pass
7879

7980

80-
def sigma2_CT():
81-
pass
81+
#def sigma2_CT():
82+
# pass
8283

8384

84-
def sigma3_CT():
85-
pass
85+
#def sigma3_CT():
86+
# pass
8687

8788

88-
def sigma4_CT():
89-
pass
89+
#def sigma4_CT():
90+
# pass
9091

9192

92-
def sound_speed_CT():
93-
pass
93+
#def sound_speed_CT():
94+
# pass
9495

9596

96-
def specvol_CT():
97-
pass
97+
#def specvol_CT():
98+
# pass
9899

99100

100-
def specvol_anom_CT():
101-
pass
101+
#def specvol_anom_CT():
102+
# pass
102103

103104

104105
if __name__ == '__main__':

‎gsw/gibbs/geostrophic.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44

55
import numpy as np
66

7-
__all__ = ['geostrophic_velocity'] # TODO
7+
__all__ = []
8+
#__all__ = ['geostrophic_velocity'] # TODO
89

910

10-
def geostrophic_velocity():
11-
pass
11+
#def geostrophic_velocity():
12+
# pass
1213

1314

1415
if __name__ == '__main__':

‎gsw/gibbs/geostrophic_48.py‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,37 @@
44

55
import numpy as np
66

7-
__all__ = ['geo_strf_Cunningham', # TODO
8-
'geo_strf_dyn_height', # TODO
9-
'geo_strf_dyn_height_pc', # TODO
10-
'geo_strf_isopycnal', # TODO
11-
'geof_str_isopycnal_pc', # TODO
12-
'geo_strf_Montgomery'] # TODO
7+
__all__ = []
8+
# 'geo_strf_Cunningham', # TODO
9+
# 'geo_strf_dyn_height', # TODO
10+
# 'geo_strf_dyn_height_pc', # TODO
11+
# 'geo_strf_isopycnal', # TODO
12+
# 'geof_str_isopycnal_pc', # TODO
13+
# 'geo_strf_Montgomery'] # TODO
1314

1415

15-
def geo_strf_Cunningham():
16-
pass
16+
#def geo_strf_Cunningham():
17+
# pass
1718

1819

19-
def geo_strf_dyn_height():
20-
pass
20+
#def geo_strf_dyn_height():
21+
# pass
2122

2223

23-
def geo_strf_dyn_height_pc():
24-
pass
24+
#def geo_strf_dyn_height_pc():
25+
# pass
2526

2627

27-
def geo_strf_isopycnal():
28-
pass
28+
#def geo_strf_isopycnal():
29+
# pass
2930

3031

31-
def geof_str_isopycnal_pc():
32-
pass
32+
#def geof_str_isopycnal_pc():
33+
# pass
3334

3435

35-
def geo_strf_Montgomery():
36-
pass
36+
#def geo_strf_Montgomery():
37+
# pass
3738

3839

3940
if __name__ == '__main__':

‎gsw/gibbs/isobaric.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
from ..utilities import match_args_return
77

88

9-
__all__ = ['latentheat_evap_CT',
10-
'latentheat_melting',
11-
'latentheat_evap_t']
9+
__all__ = ['latentheat_evap_t']
10+
# 'latentheat_evap_CT',
11+
# 'latentheat_melting',
1212

1313

14-
@match_args_return
15-
def latentheat_evap_CT(SA, CT):
16-
pass
14+
#@match_args_return
15+
#def latentheat_evap_CT(SA, CT):
16+
# pass
1717

1818

19-
@match_args_return
20-
def latentheat_melting(SA, p):
21-
pass
19+
#@match_args_return
20+
#def latentheat_melting(SA, p):
21+
# pass
2222

2323

2424
@match_args_return

‎gsw/gibbs/neutral_nonlinear_48.py‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,32 @@
44

55
import numpy as np
66

7-
__all__ = ['cabbeling', # TODO
8-
'isopycnal_slope_ratio', # TODO
9-
'isopycnal_vs_ntp_CT_ratio', # TODO
10-
'ntp_pt_vs_CT_ratio', # TODO
11-
'thermobaric'] # TODO
7+
__all__ = []
8+
# 'cabbeling', # TODO
9+
# 'isopycnal_slope_ratio', # TODO
10+
# 'isopycnal_vs_ntp_CT_ratio', # TODO
11+
# 'ntp_pt_vs_CT_ratio', # TODO
12+
# 'thermobaric'] # TODO
1213

1314

14-
def cabbeling():
15-
pass
15+
#def cabbeling():
16+
# pass
1617

1718

18-
def isopycnal_slope_ratio():
19-
pass
19+
#def isopycnal_slope_ratio():
20+
# pass
2021

2122

22-
def isopycnal_vs_ntp_CT_ratio():
23-
pass
23+
#def isopycnal_vs_ntp_CT_ratio():
24+
# pass
2425

2526

26-
def ntp_pt_vs_CT_ratio():
27-
pass
27+
#def ntp_pt_vs_CT_ratio():
28+
# pass
2829

2930

30-
def thermobaric():
31-
pass
31+
#def thermobaric():
32+
# pass
3233

3334
if __name__ == '__main__':
3435
import doctest

0 commit comments

Comments
 (0)