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

Commit

Permalink
Merge pull request #40 from castelao/cleanup
Browse files Browse the repository at this point in the history
Taking the unimplemented functions out of the namespace
  • Loading branch information
efiring authored Apr 4, 2017
2 parents b1643b9 + e02a664 commit d39aab1
Show file tree
Hide file tree
Showing 8 changed files with 228 additions and 224 deletions.
6 changes: 3 additions & 3 deletions gsw/gibbs/conversions.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
'SA_from_Sstar',
'SP_from_SA',
'SP_from_SR',
'SP_from_Sstar', # TODO
#'SP_from_Sstar', # TODO
'SR_from_SP',
'Sstar_from_SA',
'deltaSA_from_SP', # TODO
Expand Down Expand Up @@ -297,8 +297,8 @@ def SP_from_SR(SR):
return 1. / uPS * SR


def SP_from_Sstar():
pass
#def SP_from_Sstar():
# pass


@match_args_return
Expand Down
115 changes: 58 additions & 57 deletions gsw/gibbs/density_enthalpy_48_ct.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,101 +4,102 @@

import numpy as np

__all__ = ['alpha_CT', # TODO
'beta_CT', # TODO
'CT_from_rho', # TODO
'CT_maxdensity', # TODO
'dynamic_enthalpy_CT', # TODO
'enthalpy_CT', # TODO
'enthalpy_diff_CT', # TODO
'internal_energy_CT', # TODO
'rho_CT', # TODO
'rho_alpha_beta_CT', # TODO
'SA_from_rho_CT', # TODO
'sigma0_CT', # TODO
'sigma1_CT', # TODO
'sigma2_CT', # TODO
'sigma3_CT', # TODO
'sigma4_CT', # TODO
'sound_speed_CT', # TODO
'specvol_CT', # TODO
'specvol_anom_CT'] # TODO
__all__ = []
# 'alpha_CT', # TODO
# 'beta_CT', # TODO
# 'CT_from_rho', # TODO
# 'CT_maxdensity', # TODO
# 'dynamic_enthalpy_CT', # TODO
# 'enthalpy_CT', # TODO
# 'enthalpy_diff_CT', # TODO
# 'internal_energy_CT', # TODO
# 'rho_CT', # TODO
# 'rho_alpha_beta_CT', # TODO
# 'SA_from_rho_CT', # TODO
# 'sigma0_CT', # TODO
# 'sigma1_CT', # TODO
# 'sigma2_CT', # TODO
# 'sigma3_CT', # TODO
# 'sigma4_CT', # TODO
# 'sound_speed_CT', # TODO
# 'specvol_CT', # TODO
# 'specvol_anom_CT'] # TODO


def alpha_CT():
pass
#def alpha_CT():
# pass


def beta_CT():
pass
#def beta_CT():
# pass


def CT_from_rho():
pass
#def CT_from_rho():
# pass


def CT_maxdensity():
pass
#def CT_maxdensity():
# pass


def dynamic_enthalpy_CT():
pass
#def dynamic_enthalpy_CT():
# pass


def enthalpy_CT():
pass
#def enthalpy_CT():
# pass


def enthalpy_diff_CT():
pass
#def enthalpy_diff_CT():
# pass


def internal_energy_CT():
pass
#def internal_energy_CT():
# pass


def rho_CT():
pass
#def rho_CT():
# pass


def rho_alpha_beta_CT():
pass
#def rho_alpha_beta_CT():
# pass


def SA_from_rho_CT():
pass
#def SA_from_rho_CT():
# pass


def sigma0_CT():
pass
#def sigma0_CT():
# pass


def sigma1_CT():
pass
#def sigma1_CT():
# pass


def sigma2_CT():
pass
#def sigma2_CT():
# pass


def sigma3_CT():
pass
#def sigma3_CT():
# pass


def sigma4_CT():
pass
#def sigma4_CT():
# pass


def sound_speed_CT():
pass
#def sound_speed_CT():
# pass


def specvol_CT():
pass
#def specvol_CT():
# pass


def specvol_anom_CT():
pass
#def specvol_anom_CT():
# pass


if __name__ == '__main__':
Expand Down
7 changes: 4 additions & 3 deletions gsw/gibbs/geostrophic.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@

import numpy as np

__all__ = ['geostrophic_velocity'] # TODO
__all__ = []
#__all__ = ['geostrophic_velocity'] # TODO


def geostrophic_velocity():
pass
#def geostrophic_velocity():
# pass


if __name__ == '__main__':
Expand Down
37 changes: 19 additions & 18 deletions gsw/gibbs/geostrophic_48.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,37 @@

import numpy as np

__all__ = ['geo_strf_Cunningham', # TODO
'geo_strf_dyn_height', # TODO
'geo_strf_dyn_height_pc', # TODO
'geo_strf_isopycnal', # TODO
'geof_str_isopycnal_pc', # TODO
'geo_strf_Montgomery'] # TODO
__all__ = []
# 'geo_strf_Cunningham', # TODO
# 'geo_strf_dyn_height', # TODO
# 'geo_strf_dyn_height_pc', # TODO
# 'geo_strf_isopycnal', # TODO
# 'geof_str_isopycnal_pc', # TODO
# 'geo_strf_Montgomery'] # TODO


def geo_strf_Cunningham():
pass
#def geo_strf_Cunningham():
# pass


def geo_strf_dyn_height():
pass
#def geo_strf_dyn_height():
# pass


def geo_strf_dyn_height_pc():
pass
#def geo_strf_dyn_height_pc():
# pass


def geo_strf_isopycnal():
pass
#def geo_strf_isopycnal():
# pass


def geof_str_isopycnal_pc():
pass
#def geof_str_isopycnal_pc():
# pass


def geo_strf_Montgomery():
pass
#def geo_strf_Montgomery():
# pass


if __name__ == '__main__':
Expand Down
18 changes: 9 additions & 9 deletions gsw/gibbs/isobaric.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
from ..utilities import match_args_return


__all__ = ['latentheat_evap_CT',
'latentheat_melting',
'latentheat_evap_t']
__all__ = ['latentheat_evap_t']
# 'latentheat_evap_CT',
# 'latentheat_melting',


@match_args_return
def latentheat_evap_CT(SA, CT):
pass
#@match_args_return
#def latentheat_evap_CT(SA, CT):
# pass


@match_args_return
def latentheat_melting(SA, p):
pass
#@match_args_return
#def latentheat_melting(SA, p):
# pass


@match_args_return
Expand Down
31 changes: 16 additions & 15 deletions gsw/gibbs/neutral_nonlinear_48.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,32 @@

import numpy as np

__all__ = ['cabbeling', # TODO
'isopycnal_slope_ratio', # TODO
'isopycnal_vs_ntp_CT_ratio', # TODO
'ntp_pt_vs_CT_ratio', # TODO
'thermobaric'] # TODO
__all__ = []
# 'cabbeling', # TODO
# 'isopycnal_slope_ratio', # TODO
# 'isopycnal_vs_ntp_CT_ratio', # TODO
# 'ntp_pt_vs_CT_ratio', # TODO
# 'thermobaric'] # TODO


def cabbeling():
pass
#def cabbeling():
# pass


def isopycnal_slope_ratio():
pass
#def isopycnal_slope_ratio():
# pass


def isopycnal_vs_ntp_CT_ratio():
pass
#def isopycnal_vs_ntp_CT_ratio():
# pass


def ntp_pt_vs_CT_ratio():
pass
#def ntp_pt_vs_CT_ratio():
# pass


def thermobaric():
pass
#def thermobaric():
# pass

if __name__ == '__main__':
import doctest
Expand Down
Loading

0 comments on commit d39aab1

Please sign in to comment.