[cig-commits] [commit] pull_39: fix test output (d9ae13d)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Dec 8 12:30:19 PST 2014
Repository : https://github.com/geodynamics/burnman
On branch : pull_39
Link : https://github.com/geodynamics/burnman/compare/0000000000000000000000000000000000000000...ac2c35dff40d9f0fb90b442d0086964ebe5d5976
>---------------------------------------------------------------
commit d9ae13df2fc4c70d818526fdb112d47e31ec6aa3
Author: Timo Heister <timo.heister at gmail.com>
Date: Sun Dec 7 17:37:47 2014 -0500
fix test output
>---------------------------------------------------------------
d9ae13df2fc4c70d818526fdb112d47e31ec6aa3
misc/ref/example_grid.py.out | 80 ++++++++++++++---------------
misc/ref/example_user_input_material.py.out | 2 +-
misc/ref/paper_onefit.py.out | 2 +-
tests/test_model.py | 32 ++++++------
4 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/misc/ref/example_grid.py.out b/misc/ref/example_grid.py.out
index c137bcb..4012047 100644
--- a/misc/ref/example_grid.py.out
+++ b/misc/ref/example_grid.py.out
@@ -6,44 +6,44 @@ temperatures:
[ 1900. 1935.71428571 1971.42857143 2007.14285714 2042.85714286
2078.57142857 2114.28571429 2150. 2185.71428571 2221.42857143
2257.14285714 2292.85714286 2328.57142857 2364.28571429 2400. ]
-[[ 6406.98875888 6393.88415244 6380.69739903 6367.42778806
- 6354.07457001 6340.6369575 6327.11412615 6313.50521534
- 6299.80932878 6286.02553496 6272.1528675 6258.19032534
- 6244.13687284 6229.99143987 6215.75292163]
- [ 6583.28333731 6571.62015058 6559.89366541 6548.10353134
- 6536.24936849 6524.33076889 6512.34729769 6500.29855365
- 6488.18393233 6476.00298326 6463.75517319 6451.43994599
- 6439.05672317 6426.60490432 6414.08386739]
- [ 6738.39907442 6727.85264384 6717.25536194 6706.60707887
- 6695.90761986 6685.15678675 6674.35435923 6663.50009605
- 6652.59373602 6641.63499896 6630.62358648 6619.55918273
- 6608.44145505 6597.27005455 6586.04461658]
- [ 6876.82948162 6867.1787712 6857.48612549 6847.75108659
- 6837.97381727 6828.15424523 6818.2922786 6808.38780713
- 6798.44070325 6788.45082309 6778.41800729 6768.34208186
- 6758.22287422 6748.06016883 6737.85375161]
- [ 7001.82644522 6992.9140081 6983.96577666 6974.98179944
- 6965.96210399 6956.9066984 6947.81557263 6938.68869978
- 6929.52603712 6920.32752715 6911.09309848 6901.82266661 6892.5161347
- 6883.17339421 6873.79432551]
- [ 7115.90029539 7107.61038714 7099.28949344 7090.93771486
- 7082.55513194 7074.14180665 7065.6977838 7057.22309221
- 7048.71774589 7040.18174498 7031.61507671 7023.01771615
- 7014.38962706 7005.73054222 6997.04084439]
- [ 7220.86896366 7213.11357873 7205.33094896 7197.52121099
- 7189.68448203 7181.82086134 7173.93043158 7166.01326008
- 7158.06939992 7150.09889093 7142.10176062 7134.07802499
- 7126.02768928 7117.95074866 7109.84718884]
- [ 7318.18953497 7310.90039999 7303.58700079 7296.24949995 7288.888041
- 7281.50274998 7274.0937368 7266.66109639 7259.20490992
- 7251.72524568 7244.22216011 7236.69569853 7229.14589592
- 7221.57277762 7213.97635995]
- [ 7409.13540648 7402.25906233 7395.3608797 7388.44104019
- 7381.49970672 7374.53702505 7367.55312507 7360.54812207
- 7353.52211783 7346.47520162 7339.40745109 7332.3189331 7325.20970449
- 7318.07981275 7310.92929661]
- [ 7494.99432576 7488.48939252 7481.9646371 7475.42025546
- 7468.85642509 7462.2733066 7455.67104496 7449.0497708 7442.40960146
- 7435.75064198 7429.07298605 7422.37671676 7415.66190742
- 7408.92862218 7402.17691669]]
+[[ 6406.98810903 6393.88348321 6380.69671017 6367.42707933
+ 6354.07384117 6340.6362083 6327.11335633 6313.50442463
+ 6299.80851692 6286.02470169 6272.15201253 6258.18944839
+ 6244.13597363 6229.9905181 6215.751977 ]
+ [ 6583.28276176 6571.61955832 6559.89305625 6548.10290511
+ 6536.24872501 6524.33010798 6512.34661916 6500.29785732 6488.183218
+ 6476.00225074 6463.75442227 6451.43917648 6439.05593488
+ 6426.60409702 6414.08304088]
+ [ 6738.39855644 6727.85211109 6717.2548143 6706.6065162 6695.90704202
+ 6685.15619359 6674.35375061 6663.49947184 6652.59309607
+ 6641.63434312 6630.62291459 6619.55849466 6608.44075064
+ 6597.26933363 6586.043879 ]
+ [ 6876.82900979 6867.17828611 6857.48562703 6847.75057466
+ 6837.97329175 6828.15370601 6818.29172557 6808.38724017
+ 6798.44012225 6788.45022793 6778.41739786 6768.34145803
+ 6758.22223589 6748.05951586 6737.85308388]
+ [ 7001.82601141 6992.91356223 6983.96531864 6974.98132917
+ 6965.96162139 6956.90620337 6947.81506509 6938.68817962
+ 6929.52550426 6920.32698149 6911.09253993 6901.82209507
+ 6892.51555007 6883.17279639 6873.79371441]
+ [ 7115.89989362 7107.60997429 7099.28906942 7090.93727961
+ 7082.55468538 7074.1413487 7065.69731438 7057.22261126
+ 7048.71725331 7040.18124071 7031.61456065 7023.01718824 7014.3890872
+ 7005.72999034 6997.04028041]
+ [ 7220.86858938 7213.11319418 7205.33055408 7197.52080572 7189.6840663
+ 7181.82043509 7173.92999474 7166.01281259 7158.0689417 7150.09842193
+ 7142.10128076 7134.07753421 7126.02718751 7117.95023583
+ 7109.84666488]
+ [ 7318.18918464 7310.90004009 7303.58663128 7296.24912076
+ 7288.88765208 7281.50235128 7274.09332825 7266.66067794
+ 7259.20448151 7251.72480726 7244.22171161 7236.69523989
+ 7229.14542709 7221.57229855 7213.97587057]
+ [ 7409.13507733 7402.25872423 7395.3605326 7388.44068404
+ 7381.49934147 7374.53665065 7367.55274147 7360.54772922
+ 7353.52171568 7346.47479012 7339.40703019 7332.31850275
+ 7325.20926464 7318.07936334 7310.92883759]
+ [ 7494.99401565 7488.489074 7481.96431013 7475.41991998
+ 7468.85608108 7462.27295399 7455.67068373 7449.04940089
+ 7442.40922283 7435.75025459 7429.07258984 7422.3763117 7415.66149346
+ 7408.92819928 7402.17648481]]
(15, 10) (15, 10) (10, 15)
diff --git a/misc/ref/example_user_input_material.py.out b/misc/ref/example_user_input_material.py.out
index 41aae10..aa209d4 100644
--- a/misc/ref/example_user_input_material.py.out
+++ b/misc/ref/example_user_input_material.py.out
@@ -1,3 +1,3 @@
Calculations are done for:
'__main__.own_material'
-247.935799475 138.485603794 987.797836864
+247.935871157 138.485634022 987.797719475
diff --git a/misc/ref/paper_onefit.py.out b/misc/ref/paper_onefit.py.out
index 6b64f29..31e3dba 100644
--- a/misc/ref/paper_onefit.py.out
+++ b/misc/ref/paper_onefit.py.out
@@ -11,5 +11,5 @@ Debye_0 & 905.9 && 871 && 767 && 454 & \
grueneisen_0 & 1.44 && 1.57 && 1.36 && 1.53 & \
q_0 & 1.09 && 1.1 && 1.7 && 1.7 & \
eta_s_0 & 2.13 && 2.3 && 2.8 && -0.1 & \
-errors: 6.04361955548e-06 7.87235291321e-07 5.05950445163e-06 1.96879812529e-07
+errors: 6.04361785322e-06 7.87264629724e-07 5.05947174541e-06 1.96881478083e-07
wrote onefit.pdf
diff --git a/tests/test_model.py b/tests/test_model.py
index e5573c4..5ebfef3 100644
--- a/tests/test_model.py
+++ b/tests/test_model.py
@@ -55,26 +55,26 @@ class test_model(BurnManTest):
def test_model1(self):
m = self.model1()
- self.assertArraysAlmostEqual(m.K()/1e11, [2.80999713])
- self.assertArraysAlmostEqual(m.G()/1e11, [1.67031746])
+ self.assertArraysAlmostEqual(m.K()/1e11, [2.80999688])
+ self.assertArraysAlmostEqual(m.G()/1e11, [1.67031704])
def test_vs1(self):
m = self.model1()
- self.assertArraysAlmostEqual(m.v_s(), [6359.44860613])
+ self.assertArraysAlmostEqual(m.v_s(), [6359.4479532])
def test_vp1(self):
m = self.model1()
- self.assertArraysAlmostEqual(m.v_p(), [11043.57489092])
+ self.assertArraysAlmostEqual(m.v_p(), [11043.5742579])
def test_vphi1(self):
m = self.model1()
- self.assertArraysAlmostEqual(m.v_phi(), [8248.46031729])
+ self.assertArraysAlmostEqual(m.v_phi(), [8248.46014099])
def test_heatstuff1(self):
m = self.model1()
- self.assertArraysAlmostEqual(m.heat_capacity_p(), [52.32168504])
+ self.assertArraysAlmostEqual(m.heat_capacity_p(), [52.32175110])
self.assertArraysAlmostEqual(m.thermal_expansivity(), [2.40018801e-05])
- self.assertArraysAlmostEqual(m.heat_capacity_v(), [49.342414])
+ self.assertArraysAlmostEqual(m.heat_capacity_v(), [49.3424724])
# reproduce by hand:
min = m.rock
@@ -88,13 +88,13 @@ class test_model(BurnManTest):
m2 = self.model2()
m12 = self.model12()
- self.assertArraysAlmostEqual(m1.heat_capacity_v(), [49.342414])
- self.assertArraysAlmostEqual(m2.heat_capacity_v(), [49.34895224])
- self.assertArraysAlmostEqual(m12.heat_capacity_v(), [49.34764459])
+ self.assertArraysAlmostEqual(m1.heat_capacity_v(), [49.34247236])
+ self.assertArraysAlmostEqual(m2.heat_capacity_v(), [49.3490106])
+ self.assertArraysAlmostEqual(m12.heat_capacity_v(), [49.34770297])
- self.assertArraysAlmostEqual(m1.heat_capacity_p(), [52.32168504])
- self.assertArraysAlmostEqual(m2.heat_capacity_p(), [52.7768764])
- self.assertArraysAlmostEqual(m12.heat_capacity_p(), [52.68583813])
+ self.assertArraysAlmostEqual(m1.heat_capacity_p(), [52.32175110])
+ self.assertArraysAlmostEqual(m2.heat_capacity_p(), [52.77694375])
+ self.assertArraysAlmostEqual(m12.heat_capacity_p(), [52.68590522])
self.assertArraysAlmostEqual(m1.thermal_expansivity(), [2.40018801e-5])
self.assertArraysAlmostEqual(m2.thermal_expansivity(), [2.74743810e-5])
@@ -105,9 +105,9 @@ class test_model(BurnManTest):
m2 = self.model2()
m12 = self.model12()
- self.assertArraysAlmostEqual(m1.density(), [4130.09554071])
- self.assertArraysAlmostEqual(m2.density(), [4619.86457261])
- self.assertArraysAlmostEqual(m12.density(), [4512.83334315])
+ self.assertArraysAlmostEqual(m1.density(), [4130.09535243])
+ self.assertArraysAlmostEqual(m2.density(), [4619.86433138])
+ self.assertArraysAlmostEqual(m12.density(), [4512.8331140])
More information about the CIG-COMMITS
mailing list