Skip to content

Commit f15fa07

Browse files
smitharapacesm
andauthored
New MAG ML datasets (#108)
* Adding GRACE-FO MAG ML dataset * GOCE MAG ML configuration adapted to the new 0301 baseline - removing KP_DST_FLAG - adding MAGNETIC_ACTIVITY_FLAG * Fixing missing comma. * GRACE_FO_ML: B_FGM corrected to B_MAG There was an error in the original files, later corrected by GFZ. * Update documentation --------- Co-authored-by: Martin Paces <[email protected]>
1 parent 3e4b3e1 commit f15fa07

File tree

4 files changed

+28
-4
lines changed

4 files changed

+28
-4
lines changed

docs/available_parameters.rst

+3-2
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ Collection full name Collection type Available measurement names
137137
CS_OPER_MAG MAG_CS ``F,B_NEC,B_mod_NEC,B_NEC1,B_NEC2,B_NEC3,B_FGM1,B_FGM2,B_FGM3,q_NEC_CRF,q_error``
138138
GRACE_x_MAG (x=A/B) MAG_GRACE ``F,B_NEC,B_NEC_raw,B_FGM,B_mod_NEC,q_NEC_CRF,q_error``
139139
GFx_OPER_FGM_ACAL_CORR (x=1/2) MAG_GFO ``F,B_NEC,B_FGM,dB_MTQ_FGM,dB_XI_FGM,dB_NY_FGM,dB_BT_FGM,dB_ST_FGM,dB_SA_FGM,dB_BAT_FGM,q_NEC_FGM,B_FLAG``
140+
GFx_MAG_ACAL_CORR_ML (x=1/2) MAG_GFO_ML ``F,B_MAG,B_NEC,q_NEC_FGM,B_FLAG,KP_DST_FLAG,Latitude_QD,Longitude_QD``
140141
GO_MAG_ACAL_CORR MAG_GOCE ``F,B_MAG,B_NEC,dB_MTQ_SC,dB_XI_SC,dB_NY_SC,dB_BT_SC,dB_ST_SC,dB_SA_SC,dB_BAT_SC,dB_HK_SC,dB_BLOCK_CORR,q_SC_NEC,q_MAG_SC,B_FLAG``
141-
GO_MAG_ACAL_CORR_ML MAG_GOCE_ML ``B_MAG,B_NEC,q_FGM_NEC,B_FLAG,KP_DST_FLAG,NaN_FLAG,Latitude_QD,Longitude_QD``
142+
GO_MAG_ACAL_CORR_ML MAG_GOCE_ML ``F,B_MAG,B_NEC,q_FGM_NEC,B_FLAG,MAGNETIC_ACTIVITY_FLAG,NaN_FLAG,Latitude_QD,Longitude_QD``
142143
=============================== ================ ===================================================================================================================================
143144

144145
The ``measurements``, ``models``, and ``auxiliaries`` chosen will match the cadence of the ``collection`` chosen.
@@ -302,7 +303,7 @@ NB: When using model names containing a hyphen (``-``) then extra single (``'``)
302303
AscendingNodeLongitude, QDLat, QDLon, QDBasis, MLT, SunDeclination,
303304
SunHourAngle, SunRightAscension, SunAzimuthAngle, SunZenithAngle,
304305
SunLongitude, SunVector, DipoleAxisVector, NGPLatitude, NGPLongitude,
305-
DipoleTiltAngle
306+
DipoleTiltAngle, F107_avg81d, F107_avg81d_count
306307

307308

308309
.. note::

docs/release_notes.rst

+11
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,17 @@ Release notes
44
Change log
55
----------
66

7+
Changes from 0.11.6 to 0.11.7
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
- Added auxiliaries ``["F107_avg81d", "F107_avg81d_count"]``
11+
- Updated and added ML-calibrated variants of GOCE & GRACE-FO magnetic datasets, ``GO_MAG_ACAL_CORR_ML`` & ``GFx_MAG_ACAL_CORR_ML``
12+
13+
Changes from 0.11.5 to 0.11.6
14+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
15+
16+
- Fix to allow multiple VOBS to be fetched in one request
17+
718
Changes from 0.11.4 to 0.11.5
819
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
920

src/viresclient/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@
3535
from ._config import ClientConfig, set_token
3636
from ._data_handling import ReturnedData, ReturnedDataFile
3737

38-
__version__ = "0.11.6"
38+
__version__ = "0.11.7"

src/viresclient/_client_swarm.py

+13-1
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@
218218
"MAG_CS": ("https://doi.org/10.1186/s40623-020-01171-9",),
219219
"MAG_GRACE": ("https://doi.org/10.1186/s40623-021-01373-9",),
220220
"MAG_GFO": ("https://doi.org/10.1186/s40623-021-01364-w",),
221+
"MAG_GFO_ML": ("https://doi.org/10.5880/GFZ.2.3.2023.001",),
221222
"EFI_IDM": (
222223
"https://earth.esa.int/eogateway/documents/20142/2860886/SLIDEM_Product_Definition.pdf",
223224
),
@@ -626,6 +627,7 @@ class SwarmRequest(ClientRequest):
626627
"MAG_CS": ["CS_OPER_MAG"],
627628
"MAG_GRACE": ["GRACE_A_MAG", "GRACE_B_MAG"],
628629
"MAG_GFO": ["GF1_OPER_FGM_ACAL_CORR", "GF2_OPER_FGM_ACAL_CORR"],
630+
"MAG_GFO_ML": ["GF1_MAG_ACAL_CORR_ML", "GF2_MAG_ACAL_CORR_ML"],
629631
"MAG_GOCE": ["GO_MAG_ACAL_CORR"],
630632
"MAG_GOCE_ML": ["GO_MAG_ACAL_CORR_ML"],
631633
# Swarm spacecraft positions
@@ -1091,6 +1093,16 @@ class SwarmRequest(ClientRequest):
10911093
"q_NEC_FGM",
10921094
"B_FLAG",
10931095
],
1096+
"MAG_GFO_ML": [
1097+
"F",
1098+
"B_MAG",
1099+
"B_NEC",
1100+
"q_NEC_FGM",
1101+
"B_FLAG",
1102+
"KP_DST_FLAG",
1103+
"Latitude_QD",
1104+
"Longitude_QD",
1105+
],
10941106
"MAG_GOCE": [
10951107
"F",
10961108
"B_MAG",
@@ -1114,7 +1126,7 @@ class SwarmRequest(ClientRequest):
11141126
"B_NEC",
11151127
"q_FGM_NEC",
11161128
"B_FLAG",
1117-
"KP_DST_FLAG",
1129+
"MAGNETIC_ACTIVITY_FLAG",
11181130
"NaN_FLAG",
11191131
"Latitude_QD",
11201132
"Longitude_QD",

0 commit comments

Comments
 (0)