Skip to content

Commit

Permalink
final updates before publication to docs and bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@PennyWieser
PennyWieser committed Apr 25, 2023
1 parent 5287b2b commit b709929
Show file tree
Hide file tree
Showing 56 changed files with 13,949 additions and 15,538 deletions.
48 changes: 32 additions & 16 deletions docs/Examples/Data_Input/Importing_MeltsTBL.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": 9,
"id": "a22fd623-0f02-4761-b23e-9019ddc2c69f",
"metadata": {},
"outputs": [],
Expand All @@ -36,17 +36,17 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 10,
"id": "de2eb82f-d84c-4b75-a571-ee9f8bf95194",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"'0.0.13'"
"'0.0.17'"
]
},
"execution_count": 2,
"execution_count": 10,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -62,7 +62,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 11,
"id": "63830dcd-141e-4a5b-a853-4330443526d6",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -685,7 +685,7 @@
"4 0.000081 0.000006 1453.15 4.0 4 "
]
},
"execution_count": 3,
"execution_count": 11,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -705,7 +705,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 12,
"id": "c8f7b492-6260-4e48-ba79-f640c085eb7a",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -1638,7 +1638,7 @@
"4 4 0.65 "
]
},
"execution_count": 4,
"execution_count": 12,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -1653,7 +1653,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": 13,
"id": "e9d05df9-af47-4747-806a-732db09f0816",
"metadata": {},
"outputs": [
Expand All @@ -1663,7 +1663,7 @@
"Text(0.5, 0, 'FeO$_{T}$ Liq (Wt%)')"
]
},
"execution_count": 5,
"execution_count": 13,
"metadata": {},
"output_type": "execute_result"
},
Expand Down Expand Up @@ -1698,7 +1698,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 14,
"id": "cf50c3a2-4ce1-4d83-a51c-545bf3f707e8",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -2321,7 +2321,7 @@
"4 0.000128 0.000018 1469.15 1.0 4 "
]
},
"execution_count": 6,
"execution_count": 14,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -2341,7 +2341,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 15,
"id": "97781c63-0104-4ab9-890a-37153c146638",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -3174,7 +3174,7 @@
"4 0.0 "
]
},
"execution_count": 7,
"execution_count": 15,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -3186,7 +3186,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 16,
"id": "8e03e7ed-e0d8-48a1-a6e3-00f66777ed3c",
"metadata": {},
"outputs": [
Expand All @@ -3196,7 +3196,7 @@
"Text(0, 0.5, 'SCAS (ppm)')"
]
},
"execution_count": 8,
"execution_count": 16,
"metadata": {},
"output_type": "execute_result"
},
Expand Down Expand Up @@ -3233,6 +3233,22 @@
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "c197255d-94c5-413c-9767-16f6876f51d5",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "64b0ea52-aac9-4e5a-afbc-4edf2fdecdc1",
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand Down
76 changes: 50 additions & 26 deletions docs/Examples/Data_Input/Importing_Petrolog.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
{
"data": {
"text/plain": [
"'0.0.9'"
"'0.0.17'"
]
},
"execution_count": 2,
Expand Down Expand Up @@ -235,7 +235,7 @@
" <td>08:21:15</td>\n",
" <td>1526.431</td>\n",
" <td>1</td>\n",
" <td>99.9900</td>\n",
" <td>0.999900</td>\n",
" <td>0</td>\n",
" </tr>\n",
" <tr>\n",
Expand Down Expand Up @@ -304,7 +304,7 @@
" <td>08:21:15</td>\n",
" <td>1516.580</td>\n",
" <td>1</td>\n",
" <td>98.9950</td>\n",
" <td>0.989950</td>\n",
" <td>1</td>\n",
" </tr>\n",
" <tr>\n",
Expand Down Expand Up @@ -373,7 +373,7 @@
" <td>08:21:15</td>\n",
" <td>1506.214</td>\n",
" <td>1</td>\n",
" <td>97.9904</td>\n",
" <td>0.979904</td>\n",
" <td>2</td>\n",
" </tr>\n",
" <tr>\n",
Expand Down Expand Up @@ -442,7 +442,7 @@
" <td>08:21:15</td>\n",
" <td>1495.511</td>\n",
" <td>1</td>\n",
" <td>96.9959</td>\n",
" <td>0.969959</td>\n",
" <td>3</td>\n",
" </tr>\n",
" <tr>\n",
Expand Down Expand Up @@ -511,7 +511,7 @@
" <td>08:21:15</td>\n",
" <td>1484.230</td>\n",
" <td>1</td>\n",
" <td>95.9923</td>\n",
" <td>0.959923</td>\n",
" <td>4</td>\n",
" </tr>\n",
" </tbody>\n",
Expand Down Expand Up @@ -597,11 +597,11 @@
"4 0 4.0077 PetrologDefault 08:21:15 1484.230 \n",
"\n",
" P_kbar Fraction_melt Sample_ID_Liq \n",
"0 1 99.9900 0 \n",
"1 1 98.9950 1 \n",
"2 1 97.9904 2 \n",
"3 1 96.9959 3 \n",
"4 1 95.9923 4 "
"0 1 0.999900 0 \n",
"1 1 0.989950 1 \n",
"2 1 0.979904 2 \n",
"3 1 0.969959 3 \n",
"4 1 0.959923 4 "
]
},
"execution_count": 3,
Expand Down Expand Up @@ -873,7 +873,7 @@
" <td>08:21:15</td>\n",
" <td>1526.431</td>\n",
" <td>1</td>\n",
" <td>99.9900</td>\n",
" <td>0.999900</td>\n",
" <td>0</td>\n",
" <td>0.65</td>\n",
" </tr>\n",
Expand Down Expand Up @@ -983,7 +983,7 @@
" <td>08:21:15</td>\n",
" <td>1516.580</td>\n",
" <td>1</td>\n",
" <td>98.9950</td>\n",
" <td>0.989950</td>\n",
" <td>1</td>\n",
" <td>0.65</td>\n",
" </tr>\n",
Expand Down Expand Up @@ -1093,7 +1093,7 @@
" <td>08:21:15</td>\n",
" <td>1506.214</td>\n",
" <td>1</td>\n",
" <td>97.9904</td>\n",
" <td>0.979904</td>\n",
" <td>2</td>\n",
" <td>0.65</td>\n",
" </tr>\n",
Expand Down Expand Up @@ -1203,7 +1203,7 @@
" <td>08:21:15</td>\n",
" <td>1495.511</td>\n",
" <td>1</td>\n",
" <td>96.9959</td>\n",
" <td>0.969959</td>\n",
" <td>3</td>\n",
" <td>0.65</td>\n",
" </tr>\n",
Expand Down Expand Up @@ -1313,7 +1313,7 @@
" <td>08:21:15</td>\n",
" <td>1484.230</td>\n",
" <td>1</td>\n",
" <td>95.9923</td>\n",
" <td>0.959923</td>\n",
" <td>4</td>\n",
" <td>0.65</td>\n",
" </tr>\n",
Expand All @@ -1323,11 +1323,11 @@
],
"text/plain": [
" SCSS2_ppm_ideal_Smythe2017 SCSS2_ppm_ideal_Smythe2017_1sigma T_Input_K \\\n",
"0 1163.632126 317.869126 1526.431 \n",
"1 1132.187652 309.279446 1516.580 \n",
"2 1099.523987 300.356720 1506.214 \n",
"3 1066.279038 291.275205 1495.511 \n",
"4 1031.735153 281.838860 1484.230 \n",
"0 1163.632126 317.869126 1526.431 \n",
"1 1132.187652 309.279446 1516.580 \n",
"2 1099.523987 300.356720 1506.214 \n",
"3 1066.279038 291.275205 1495.511 \n",
"4 1031.735153 281.838860 1484.230 \n",
"\n",
" P_Input_kbar Fe_FeNiCu_Sulf Fe3Fet_Liq_input Si_wt_atom Ti_wt_atom \\\n",
"0 1 0.65 0.098489 0.458760 0.006900 \n",
Expand Down Expand Up @@ -1456,11 +1456,11 @@
"4 0 N 0 4.0077 PetrologDefault \n",
"\n",
" Unnamed:58 T_K P_kbar Fraction_melt Sample_ID_Liq \\\n",
"0 08:21:15 1526.431 1 99.9900 0 \n",
"1 08:21:15 1516.580 1 98.9950 1 \n",
"2 08:21:15 1506.214 1 97.9904 2 \n",
"3 08:21:15 1495.511 1 96.9959 3 \n",
"4 08:21:15 1484.230 1 95.9923 4 \n",
"0 08:21:15 1526.431 1 0.999900 0 \n",
"1 08:21:15 1516.580 1 0.989950 1 \n",
"2 08:21:15 1506.214 1 0.979904 2 \n",
"3 08:21:15 1495.511 1 0.969959 3 \n",
"4 08:21:15 1484.230 1 0.959923 4 \n",
"\n",
" Fe_FeNiCu_Sulf_calc \n",
"0 0.65 \n",
Expand Down Expand Up @@ -1523,6 +1523,30 @@
"ax1.set_ylabel('SCSS (ppm)')\n",
"ax1.set_xlabel('FeO$_{T}$ Liq (Wt%)')"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "8c2c08f3-999a-4770-a63e-e2c8988a24b0",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "7f8a784a-e4ae-4319-8b45-66662bd4c1d0",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "c902e7ab-6fe7-4b81-adca-7ea3226ec6d4",
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand Down
Loading

0 comments on commit b709929

Please sign in to comment.