From 4e0bee5457d44d719c723422b4f0a8aa258e9bf4 Mon Sep 17 00:00:00 2001
From: Martin Schlecker <19270173+matiscke@users.noreply.github.com>
Date: Fri, 12 May 2023 17:23:46 -0700
Subject: [PATCH] Include package data in source distributions (#26)

* add Data directory to MANIFEST.in

* don't forget the luminosity tracks

* include radius differences from Dorn&Lichtenberg 2021
---
 MANIFEST.in                                   |  2 ++
 .../Data/deltaR_DornLichtenberg21_Fig3b.csv   | 22 +++++++++++++++++++
 bioverse/functions.py                         |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 bioverse/Data/deltaR_DornLichtenberg21_Fig3b.csv

diff --git a/MANIFEST.in b/MANIFEST.in
index b0da3a5..1ab8054 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,7 @@
 include bioverse/*.dat
 include bioverse/*.csv
 include bioverse/*.txt
+include bioverse/Data/*
+include bioverse/Data/luminosity_tracks/*
 recursive-include bioverse/Objects *
 recursive-include bioverse/UI *
diff --git a/bioverse/Data/deltaR_DornLichtenberg21_Fig3b.csv b/bioverse/Data/deltaR_DornLichtenberg21_Fig3b.csv
new file mode 100644
index 0000000..46c52d2
--- /dev/null
+++ b/bioverse/Data/deltaR_DornLichtenberg21_Fig3b.csv
@@ -0,0 +1,22 @@
+# Radius deviations from Dorn & Lichtenberg (2021) for different planet masses and water mass fractions
+wrr,0.3,0.8,2.4,6.7
+0.0001,0.010183595237169593,-0.003179681657302576,-0.004858815200368914,-0.0031481780359906685
+0.00015240751494606397,0.0033820611641274573,-0.006283344615851151,-0.006113620121508607,-0.0034522026131364866
+0.00023228050612034688,-0.006791302969819406,-0.010039238566276261,-0.00756474208289982,-0.0038433038323212676
+0.0003540129470821607,-0.01787156174804423,-0.013715789592390107,-0.008500478982525468,-0.003926947327322945
+0.000539542335235245,-0.027357517727206668,-0.01734575336576691,-0.009150041484017489,-0.0036632711353579103
+0.0008223030652139986,-0.037709872056433454,-0.020432311534257112,-0.009759736826537888,-0.0038006082886913213
+0.001253251667017967,-0.044472601999094453,-0.02288024770645343,-0.010507474318812592,-0.0038147853051336516
+0.001910049721722202,-0.04976914036611297,-0.025227204520992006,-0.011167454451776181,-0.0038349822689970657
+0.002911059315111015,-0.056773643497837104,-0.027811562783936483,-0.011546865245814938,-0.004054227506959154
+0.004436673160766608,-0.06336403444391218,-0.029772118536760955,-0.012160145700648673,-0.004677800936869391
+0.0067618233106033765,-0.07060989911358086,-0.031052746256203828,-0.012996856711133193,-0.005623661708997584
+0.010305526872734267,-0.07671283771987242,-0.03234468370148275,-0.014596504616528562,-0.007148371159593493
+0.015706397408833117,-0.07781404223416365,-0.03457001619516761,-0.01667749792504605,-0.008950076838093658
+0.023937729978355513,-0.07970062401658437,-0.0379568143075941,-0.01953309879995991,-0.011141204049427006
+0.03648289939451061,-0.07868818682732723,-0.0425351338849149,-0.022955253642546945,-0.013963575367132124
+0.055602680347446184,-0.07245027925752447,-0.04597941886670647,-0.02688214327125227,-0.017083888225943776
+0.08474266336094621,-0.06505114099557793,-0.04358764666096325,-0.03128149421560861,-0.019717176522711446
+0.1291541873275268,-0.04928448284540402,-0.03418860501356062,-0.03390529288488201,-0.02153618574286372
+0.19684068735466764,-0.029849471651219518,-0.02133738942348017,-0.03157682768152708,-0.02278606851905533
+0.3,-0.010575600981805083,,,
diff --git a/bioverse/functions.py b/bioverse/functions.py
index 7240483..9c5ad85 100644
--- a/bioverse/functions.py
+++ b/bioverse/functions.py
@@ -1250,7 +1250,7 @@ def magma_ocean(d, wrr=0.005, S_thresh=280., simplified=False, diff_frac=0.54, f
             mask = d['has_magmaocean']
 
             # Read radius differences from DL21 Fig. 3b
-            delta_R = pd.read_csv(DATA_DIR + 'deltaR_DornLichtenberg21_Fig3b.csv')
+            delta_R = pd.read_csv(DATA_DIR + 'deltaR_DornLichtenberg21_Fig3b.csv', comment='#')
 
             # interpolate within planet masses for the given water mass fraction wrr
             dr_wrr = delta_R.iloc[(delta_R['wrr'] - wrr).abs().argsort()[0], :][1:]