abs salinity lat lon swapped

vturpin · Apr 22, 2020 · 65c5b40 · 65c5b40
1 parent a5fa295
commit 65c5b40
Show file tree

Hide file tree

Showing 3 changed files with 2,801 additions and 2,329 deletions.
diff --git a/.gitignore b/.gitignore
@@ -67,3 +67,4 @@ target/
 **/.DS_Store
 .DS_Store
 junit.xml
+**/.ipynb_checkpoints/**
diff --git a/glidertools/physics.py b/glidertools/physics.py
@@ -13,7 +13,7 @@
     from gsw import alpha as alpha_thermal, beta as beta_saline
 except ImportError:
     _gsw_avail = False
-    from seawater import alpha as alpha_thermal, beta as beta_saline
+    from seawater import alpha as alpha_thermal, beta as beta_saline  # noqa
 
     message = (
         "'gsw' could not be imported (Python 2.x is not compatible "
@@ -133,7 +133,7 @@ def potential_density(salt_PSU, temp_C, pres_db, lat, lon, pres_ref=0):
     try:
         import gsw
 
-        salt_abs = gsw.SA_from_SP(salt_PSU, pres_db, lat, lon)
+        salt_abs = gsw.SA_from_SP(salt_PSU, pres_db, lon, lat)
         temp_pot = gsw.t_from_CT(salt_abs, temp_C, pres_db)
         pot_dens = gsw.pot_rho_t_exact(salt_abs, temp_pot, pres_db, pres_ref)
     except ImportError: