[cig-commits] [commit] master: Updated table.py (6ae0407)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/a2a7ea5dbd2bbbb7bb8c207b3e569e3967a4c47b...662f3b48414451d57acbf8ab74d8422c055d52a2

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

commit 6ae04072c38e7e1e437f2b1847b35a80b503fa16
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Sat Dec 13 16:03:12 2014 -0800

    Updated table.py


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

6ae04072c38e7e1e437f2b1847b35a80b503fa16
 misc/table.py | 60 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/misc/table.py b/misc/table.py
index 871a780..f768f5a 100644
--- a/misc/table.py
+++ b/misc/table.py
@@ -18,11 +18,22 @@ from burnman import tools
 
 if __name__ == "__main__":    
 
-    names = set()
-    phasenames = []
+    def create_list(name, mineral):
+        ownname = mineral.to_string().replace("'","").replace("burnman.minerals.","")
+        if name!=ownname:
+            name=name+" ("+ownname+")"
+        row = [ name ]
+        for param in params:
+            
+            row.append(str(p.params[param] if param in p.params else ""))
+        return row
 
     libs = dir(minerals)
     for l in libs:
+
+        names = set()
+        phasenames = []
+
         mineralgroup = getattr(minerals, l)
         
         if mineralgroup.__class__.__name__ == "module":
@@ -44,34 +55,27 @@ if __name__ == "__main__":
                         except:
                             print "Could not create '%s'" % name
 
-    
-    params = ['V_0','K_0','Kprime_0','G_0','Gprime_0','molar_mass','n','Debye_0','grueneisen_0','q_0','eta_s_0']
-    
-    
-    def create_list(name, mineral):
-        ownname = mineral.to_string().replace("'","").replace("burnman.minerals.","")
-        if name!=ownname:
-            name=name+" ("+ownname+")"
-        row = [ name ]
-        for param in params:
-            
-            row.append(str(p.params[param] if param in p.params else ""))
-        return row
-    
+            eos=phasenames[0][1].params['equation_of_state']
+            if eos == 'mtait':
+                params = ['V_0','K_0','Kprime_0','Kdprime_0','molar_mass','n','Cp']
+            elif eos == 'slb2' or eos== 'slb3' or eos == 'mgd2' or eos== 'mgd3':
+                params = ['V_0','K_0','Kprime_0','G_0','Gprime_0','molar_mass','n','Debye_0','grueneisen_0','q_0','eta_s_0']
+            elif eos == 'cork':
+                params = ['cork_params','cork_T','cork_P','Cp']
 
     
-    table = [ ['Name'] + params ]
-    tablel = []
+            table = [ ['Name'] + params ]
+            tablel = []
 
-    sortedlist = sorted(phasenames, key=lambda x: x[0])
+            sortedlist = sorted(phasenames, key=lambda x: x[0])
             
-    for (name,p) in sortedlist:
-        p.set_state(1e9,300)
-        row = create_list(name,p)
-        table.append(row)
-        tablel.append(row)    
+            for (name,p) in sortedlist:
+                p.set_state(1e9,300)
+                row = create_list(name,p)
+                table.append(row)
+                tablel.append(row)    
  
-    if (len(sys.argv)==1):
-        tools.pretty_print_table(table, False)
-    elif sys.argv[1]=="tab":
-        tools.pretty_print_table(table, True)
+            if (len(sys.argv)==1):
+                tools.pretty_print_table(table, False)
+            elif sys.argv[1]=="tab":
+                tools.pretty_print_table(table, True)