Skip to content

Update to 3 06 16 #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
efiring merged 2 commits into from
Oct 9, 2022
Merged

Update to 3 06 16 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94b4f14
Update to match gsw_matlab_v3_06_16.zip where possible.
efiring Oct 8, 2022
4055740
Make and apply a typo-fixer for _wrapped_ufuncs.py.
efiring Oct 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ repos:
- id: codespell
exclude: >
(?x)^(
.*\.c
.*\.c|
tools/fix_wrapped_ufunc_typos\.py
)$
args:
- --ignore-words-list=nin,preformed,wih,
Binary file modified gsw/tests/geo_strf_dyn_height.npy
View file
Open in desktop
Binary file not shown.
Binary file modified gsw/tests/geo_strf_velocity.npy
View file
Open in desktop
Binary file not shown.
163 changes: 120 additions & 43 deletions gsw/tests/gsw_check_functions_save.m
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified gsw/tests/gsw_cv_v3_0.npz
View file
Open in desktop
Binary file not shown.
52 changes: 26 additions & 26 deletions src/_ufuncs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ This is python 3-only (for simplicity) to begin with.


/* 1 in, 1 out */
static void loop1d_d_d(char **args, npy_intp const *dimensions,
npy_intp const* steps, void* data)
static void loop1d_d_d(char **args, npy_intp *dimensions,
npy_intp* steps, void* data)
{
npy_intp i;
npy_intp n = dimensions[0];
Expand Down Expand Up @@ -59,8 +59,8 @@ static char types_d_d[] = {
};

/* 2 in, 1 out */
static void loop1d_dd_d(char **args, npy_intp const *dimensions,
npy_intp const* steps, void* data)
static void loop1d_dd_d(char **args, npy_intp *dimensions,
npy_intp* steps, void* data)
{
npy_intp i;
npy_intp n = dimensions[0];
Expand Down Expand Up @@ -95,8 +95,8 @@ static char types_dd_d[] = {
};

/* 3 in, 1 out */
static void loop1d_ddd_d(char **args, npy_intp const *dimensions,
npy_intp const* steps, void* data)
static void loop1d_ddd_d(char **args, npy_intp *dimensions,
npy_intp* steps, void* data)
{
npy_intp i;
npy_intp n = dimensions[0];
Expand Down Expand Up @@ -134,8 +134,8 @@ static char types_ddd_d[] = {
};

/* 4 in, 1 out */
static void loop1d_dddd_d(char **args, npy_intp const *dimensions,
npy_intp const* steps, void* data)
static void loop1d_dddd_d(char **args, npy_intp *dimensions,
npy_intp* steps, void* data)
{
npy_intp i;
npy_intp n = dimensions[0];
Expand Down Expand Up @@ -176,8 +176,8 @@ static char types_dddd_d[] = {
};

/* 5 in, 1 out */
static void loop1d_ddddd_d(char **args, npy_intp const *dimensions,
npy_intp const* steps, void* data)
static void loop1d_ddddd_d(char **args, npy_intp *dimensions,
npy_intp* steps, void* data)
{
npy_intp i;
npy_intp n = dimensions[0];
Expand Down Expand Up @@ -221,8 +221,8 @@ static char types_ddddd_d[] = {
};

/* 2 in, 2 out */
static void loop1d_dd_dd(char **args, npy_intp const *dimensions,
npy_intp const* steps, void* data)
static void loop1d_dd_dd(char **args, npy_intp *dimensions,
npy_intp* steps, void* data)
{
npy_intp i;
npy_intp n = dimensions[0];
Expand Down Expand Up @@ -261,8 +261,8 @@ static char types_dd_dd[] = {
};

/* 3 in, 2 out */
static void loop1d_ddd_dd(char **args, npy_intp const *dimensions,
npy_intp const* steps, void* data)
static void loop1d_ddd_dd(char **args, npy_intp *dimensions,
npy_intp* steps, void* data)
{
npy_intp i;
npy_intp n = dimensions[0];
Expand Down Expand Up @@ -304,8 +304,8 @@ static char types_ddd_dd[] = {
};

/* 3 in, 3 out */
static void loop1d_ddd_ddd(char **args, npy_intp const *dimensions,
npy_intp const* steps, void* data)
static void loop1d_ddd_ddd(char **args, npy_intp *dimensions,
npy_intp* steps, void* data)
{
npy_intp i;
npy_intp n = dimensions[0];
Expand Down Expand Up @@ -351,8 +351,8 @@ static char types_ddd_ddd[] = {
};

/* 6 in, 2 out */
static void loop1d_dddddd_dd(char **args, npy_intp const *dimensions,
npy_intp const* steps, void* data)
static void loop1d_dddddd_dd(char **args, npy_intp *dimensions,
npy_intp* steps, void* data)
{
npy_intp i;
npy_intp n = dimensions[0];
Expand Down Expand Up @@ -403,8 +403,8 @@ static char types_dddddd_dd[] = {
};

/* 2 in, 3 out */
static void loop1d_dd_ddd(char **args, npy_intp const *dimensions,
npy_intp const* steps, void* data)
static void loop1d_dd_ddd(char **args, npy_intp *dimensions,
npy_intp* steps, void* data)
{
npy_intp i;
npy_intp n = dimensions[0];
Expand Down Expand Up @@ -447,8 +447,8 @@ static char types_dd_ddd[] = {
};

/* 4 in, 3 out */
static void loop1d_dddd_ddd(char **args, npy_intp const *dimensions,
npy_intp const* steps, void* data)
static void loop1d_dddd_ddd(char **args, npy_intp *dimensions,
npy_intp* steps, void* data)
{
npy_intp i;
npy_intp n = dimensions[0];
Expand Down Expand Up @@ -497,8 +497,8 @@ static char types_dddd_ddd[] = {
};

/* 5 in, 3 out */
static void loop1d_ddddd_ddd(char **args, npy_intp const *dimensions,
npy_intp const* steps, void* data)
static void loop1d_ddddd_ddd(char **args, npy_intp *dimensions,
npy_intp* steps, void* data)
{
npy_intp i;
npy_intp n = dimensions[0];
Expand Down Expand Up @@ -550,8 +550,8 @@ static char types_ddddd_ddd[] = {
};

/* 3 in, 5 out */
static void loop1d_ddd_ddddd(char **args, npy_intp const *dimensions,
npy_intp const* steps, void* data)
static void loop1d_ddd_ddddd(char **args, npy_intp *dimensions,
npy_intp* steps, void* data)
{
npy_intp i;
npy_intp n = dimensions[0];
Expand Down
Loading