update to iri2016 2020-04 code and coeff

space-physics · Apr 13, 2020 · 1f57fbd · 1f57fbd
1 parent 71a44ea
commit 1f57fbd
Show file tree

Hide file tree

Showing 9 changed files with 2,300 additions and 1,693 deletions.
diff --git a/README.md b/README.md
@@ -90,7 +90,7 @@ cmake --build iri2016/build
 
 ### setting JF flags
 
-[iri2016.for](./iri2016/src/irisub.for) has a few dozen logical flags stored in variable JF. To reconfigure those flags, edit [iri2016_driver.f90](./iri2016/src/iri2016_driver.f90) and recompile iri2016_driver.exe.
+[irisub.for](./iri2016/src/irisub.for) has a few dozen logical flags stored in variable JF. To reconfigure those flags, edit [iri2016_driver.f90](./iri2016/src/iri2016_driver.f90) and recompile iri2016_driver.exe.
 
 ### Matlab / GNU Octave
 

diff --git a/iri2016/base.py b/iri2016/base.py
@@ -76,6 +76,6 @@ def IRI(time: datetime, altkmrange: typing.Sequence[float], glat: float, glon: f
 
     iono["TEC"] = (("time"), [arr[36]])
     iono["EqVertIonDrift"] = (("time"), [arr[43]])
-    iono["foF2"] = (("time"), [arr[88]])
+    iono["foF2"] = (("time"), [arr[99]])
 
     return iono
diff --git a/iri2016/data/igrf/dgrf2015.dat b/iri2016/data/igrf/dgrf2015.dat
@@ -0,0 +1,197 @@
+    dgrf2015 
+ 13  6371.2 2015.0
+-29441.46
+-1501.77
+4795.99
+-2445.88
+3012.2
+-2845.41
+1676.35
+-642.17
+1350.33
+-2352.26
+-115.29
+1225.85
+245.04
+581.69
+-538.7
+907.42
+813.68
+283.54
+120.49
+-188.43
+-334.85
+180.95
+70.38
+-329.23
+-232.91
+360.14
+46.98
+192.35
+196.98
+-140.94
+-119.14
+-157.4
+15.98
+4.3
+100.12
+69.55
+67.57
+-20.61
+72.79
+33.3
+-129.85
+58.74
+-28.93
+-66.64
+13.14
+7.35
+-70.85
+62.41
+81.29
+-75.99
+-54.27
+-6.79
+-19.53
+51.82
+5.59
+15.07
+24.45
+9.32
+3.27
+-2.88
+-27.5
+6.61
+-2.32
+23.98
+8.89
+10.04
+-16.78
+-18.26
+-3.16
+13.18
+-20.56
+-14.6
+13.33
+16.16
+11.76
+5.69
+-15.98
+-9.1
+-2.02
+2.26
+5.33
+8.83
+-21.77
+3.02
+10.76
+-3.22
+11.74
+0.67
+-6.74
+-13.2
+-6.88
+-0.1
+7.79
+8.68
+1.04
+-9.06
+-3.89
+-10.54
+8.44
+-2.01
+-6.26
+3.28
+0.17
+-0.4
+0.55
+4.55
+-0.55
+4.4
+1.7
+-7.92
+-0.67
+-0.61
+2.13
+-4.16
+2.33
+-2.85
+-1.8
+-1.12
+-3.59
+-8.72
+3
+-1.4
+0
+-2.3
+2.11
+2.08
+-0.6
+-0.79
+-1.05
+0.58
+0.76
+-0.7
+-0.2
+0.14
+-2.12
+1.7
+-1.44
+-0.22
+-2.57
+0.44
+-2.01
+3.49
+-2.34
+-2.09
+-0.16
+-1.08
+0.46
+0.37
+1.23
+1.75
+-0.89
+-2.19
+0.85
+0.27
+0.1
+0.72
+0.54
+-0.09
+-0.37
+0.29
+-0.43
+0.23
+0.22
+-0.89
+-0.94
+-0.16
+-0.03
+0.72
+-0.02
+-0.92
+-0.88
+0.42
+0.49
+0.63
+1.56
+-0.42
+-0.5
+0.96
+-1.24
+-0.19
+-0.1
+0.81
+0.42
+-0.13
+-0.04
+0.38
+0.48
+0.08
+0.48
+0.46
+-0.3
+-0.35
+-0.43
+-0.36
+-0.71