Changed viscosity to fix felix bug, added in low TQFM

PennyWieser · Mar 13, 2023 · 33f310f · 33f310f
1 parent e10640e
commit 33f310f
Show file tree

Hide file tree

Showing 12 changed files with 352 additions and 185 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        
+
 
     - name: Install my package
       run: |
@@ -74,7 +74,7 @@ jobs:
         python -m pip install build
         pip install setuptools wheel twine
         python setup.py sdist bdist_wheel
-        
+
     - uses: actions/upload-artifact@v2
       with:
         name: dist

diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -1,6 +1,14 @@
 ================================================
 Change Log
 ================================================
+
+Version 1.0.14 March 13th, 2023
+================================
+Felix boschetty showed that viscosity doesnt work if sample name is a string. Have changed to drop the sample column during the norm step.
+
+Conversion between fo2 and melt redox only used high T QFM value. Have now changed to allocate based on entered T_K
+
+
 Version 1.0.12, Feb 13th, 2023
 ================================
 If a user entered Kspar comps into plag-liq functions, returned Nan for eq tests, broke loop. Have fixed to add warning if you enter An<0.05, and also to not return yes or no if T is Nan

diff --git a/docs/Examples/Error_propagation/Cpx_Liq_Error_prop_Feig2010_example.xlsx b/docs/Examples/Error_propagation/Cpx_Liq_Error_prop_Feig2010_example.xlsx