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

Commit b1643b9

Browse files
castelaoefiring
authored andcommitted
specvol() 75-term (#31)
specvol() based on 75-term equation doctest values obtained from GSW-Matlab 3.0.5 Temporarily disabling test_profile on specvol. This is not the best way to do it, but test_profile was meant for 48-term and looks like it wasn't validated for Matlab's specvol anyways. Therefore, approval of test_profile() doesn't guarantee it is correct anyways. Once there are more converted functions, it would be a good idea to update and reactivate test_profile for specvol().
1 parent a09478a commit b1643b9

File tree

4 files changed

+457
-4
lines changed

4 files changed

+457
-4
lines changed

gsw/gibbs/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from .water_column_48 import *
1414
from .practical_salinity import *
1515
from .density_enthalpy_48 import *
16+
from .density_enthalpy_75 import *
1617
from .neutral_nonlinear_48 import *
1718
from .thermodynamics_from_t import *
1819
from .density_enthalpy_48_ct import *

gsw/gibbs/constants.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,12 @@
9797

9898
sfac = 0.0248826675584615
9999
"""
100-
sfac = 1 / (40. * (SSO / 35.))
100+
sfac = 1 / (40 * uPS) = 1 / (40. * (SSO / 35.))
101+
"""
102+
103+
soffset = 5.971840214030754e-1
104+
"""
105+
soffset = deltaS * sfac.
101106
"""
102107

103108
R = 8.314472

0 commit comments

Comments
 (0)