[cig-commits] [commit] master: Apply patch from Timo (6cb3468)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/burnman

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/3f851f06618bcb112ae159cb61326e211911be2e...1f0b803e9189e4c6cc1ff3065bbc5da699dc80b6

>---------------------------------------------------------------

commit 6cb34686f727aa856cfcb3b32fe871c53b191f99
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Mon Dec 29 12:58:09 2014 -0800

    Apply patch from Timo


>---------------------------------------------------------------

6cb34686f727aa856cfcb3b32fe871c53b191f99
 misc/paper_onefit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/paper_onefit.py b/misc/paper_onefit.py
index 589094b..4228e12 100644
--- a/misc/paper_onefit.py
+++ b/misc/paper_onefit.py
@@ -87,7 +87,7 @@ def array_to_rock(arr, names):
         if isinstance(phase, HelperSolidSolution):
             for min in phase.base_materials:
                 for key in min.params:
-                    if key != 'equation_of_state':
+                    if key != 'equation_of_state' and key != 'F_0':
                         assert(names[idx]==min.to_string()+'.'+key)
                         min.params[key] = arr[idx]
                         idx += 1