Skip to content
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

Jump to bottom

Hotfix: QD coordinates #36

Merged
merged 3 commits into from
Jun 30, 2020
Merged

Hotfix: QD coordinates #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
781ccd3
Removing deprecated, incorrect and no-longer used make_apex function.
pacesm Jun 24, 2020
4111fc6
Fixing input coefficients for calculation of QD coordinates.
pacesm Jun 24, 2020
9eee738
Version bump.
pacesm Jun 24, 2020
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
2 changes: 1 addition & 1 deletion eoxmagmod/eoxmagmod/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ HDR_MM=pymm_aux.h pymm_sheval.h pymm_sphargrd.h pymm_spharpot.h\
OBJ_MM=pymm.o
DST_MM=_pymm.so

HDR_QD=pymm_aux.h pyqd_eval_qdlatlon.h pyqd_eval_mlt.h pyqd_eval_subsol.h pyqd_eval_apex.h
HDR_QD=pymm_aux.h pyqd_eval_qdlatlon.h pyqd_eval_mlt.h pyqd_eval_subsol.h
OBJ_QD=pyqd.o
DST_QD=_pyqd.so

Expand Down
2 changes: 1 addition & 1 deletion eoxmagmod/eoxmagmod/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
except ImportError:
pass

__version__ = '0.9.8'
__version__ = '0.9.9'
__author__ = 'Martin Paces ([email protected])'
__copyright__ = 'Copyright (C) 2014 EOX IT Services GmbH'
__licence__ = 'EOX licence (MIT style)'
3 changes: 2 additions & 1 deletion eoxmagmod/eoxmagmod/data/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,5 @@
# magnetic models used by the apex point calculation
APEX_2015 = join(_DIRNAME, 'apexsh_1995-2015.txt')
APEX_2020 = join(_DIRNAME, 'apexsh_1980-2020.txt')
APEX = APEX_2020
APEX_2025 = join(_DIRNAME, 'apexsh_1980-2025.txt')
APEX = APEX_2025
2 changes: 2 additions & 0 deletions eoxmagmod/eoxmagmod/data/apexsh_1980-2025.txt
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions eoxmagmod/eoxmagmod/pyqd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@
/* common python utilities */
#include "py_common.h"

/* quasi dipole coordinates evaluation - old API with wrong MLT */
#include "pyqd_eval_apex.h"

/* Quasi-Dipole coordinates evaluation */
#include "pyqd_eval_qdlatlon.h"

Expand All @@ -53,7 +50,7 @@
/* module's doc string */

#define DOC_PYQD \
"library evaluation magnetic quasi-dipole coordinates and local magnetic time."
"A library calculating magnetic coordinated (e.g., QD and MLT) and related parameters."

/*---------------------------------------------------------------------------*/
/*define module's methods */
Expand All @@ -62,7 +59,6 @@ static PyMethodDef pyqd_methods[] =
{"eval_qdlatlon", (PyCFunction)eval_qdlatlon, METH_VARARGS|METH_KEYWORDS, DOC_EVAL_QDLATLON},
{"eval_mlt", (PyCFunction)eval_mlt, METH_VARARGS|METH_KEYWORDS, DOC_EVAL_MLT},
{"eval_subsol", (PyCFunction)eval_subsol, METH_VARARGS|METH_KEYWORDS, DOC_EVAL_SUBSOL},
{"eval_apex", (PyCFunction)eval_apex, METH_VARARGS|METH_KEYWORDS, DOC_EVAL_APEX},
{NULL, NULL, 0, NULL} /* Sentinel - DO NOT REMOVE! */
} ;

Expand Down
179 changes: 0 additions & 179 deletions eoxmagmod/eoxmagmod/pyqd_eval_apex.h
View file
Open in desktop

This file was deleted.

Loading