[cig-commits] [commit] inversion, master, validate_MT_params: spaces to tabs (08034fe)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Dec 12 18:27:34 PST 2014
Repository : https://github.com/geodynamics/burnman
On branches: inversion,master,validate_MT_params
Link : https://github.com/geodynamics/burnman/compare/80c2a295c42dfdb38f83f6c1334bf7d8f97a8463...409647ff05dfad6a686198cac1481bd46b5e2e62
>---------------------------------------------------------------
commit 08034feb3497ae36702bf9904434f117a4d39b7a
Author: I <kmanunterborn at gmail.com>
Date: Thu Dec 11 21:48:01 2014 -0800
spaces to tabs
Tabs to spaces
>---------------------------------------------------------------
08034feb3497ae36702bf9904434f117a4d39b7a
tests/test_eos.py | 37 ++++++++++++++++++-------------------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/tests/test_eos.py b/tests/test_eos.py
index 5d2268d..ce6ec82 100644
--- a/tests/test_eos.py
+++ b/tests/test_eos.py
@@ -38,27 +38,26 @@ class eos(BurnManTest):
eoses = [burnman.slb.SLB2(),burnman.slb.SLB3(),burnman.birch_murnaghan.BM2(),burnman.birch_murnaghan.BM3()]
for i in eoses:
- Volume_test = i.volume(pressure, temperature,rock.params)
- self.assertFloatEqual(Volume_test,rock.params['V_0'])
- K_test = i.adiabatic_bulk_modulus(pressure, temperature,rock.params['V_0'],rock.params)
- self.assertFloatEqual(K_test,rock.params['K_0'])
- G_test = i.shear_modulus(pressure, temperature,rock.params['V_0'],rock.params)
- self.assertFloatEqual(G_test,rock.params['G_0'])
- Density_test = i.density(pressure, temperature, rock.params)
- self.assertFloatEqual(Density_test,rock.params['molar_mass']/rock.params['V_0'])
- Cp_test= i.heat_capacity_p(pressure, temperature,rock.params['V_0'],rock.params)
- #self.assertFloatEqual(Cp_test,...)
- Cv_test= i.heat_capacity_v(pressure, temperature,rock.params['V_0'],rock.params)
- Kt_test = i.isothermal_bulk_modulus(pressure, temperature,rock.params['V_0'],rock.params)
- self.assertFloatEqual(Kt_test,rock.params['K_0'])
- alpha_test = i.thermal_expansivity(pressure, temperature,rock.params['V_0'],rock.params)
- Cp_test= i.heat_capacity_p(pressure, temperature,rock.params['V_0'],rock.params)
- Cv_test= i.heat_capacity_v(pressure, temperature,rock.params['V_0'],rock.params)
- Grun_test = i.grueneisen_parameter(pressure, temperature,rock.params['V_0'],rock.params)
+ Volume_test = i.volume(pressure, temperature,rock.params)
+ self.assertFloatEqual(Volume_test,rock.params['V_0'])
+ K_test = i.adiabatic_bulk_modulus(pressure, temperature,rock.params['V_0'],rock.params)
+ self.assertFloatEqual(K_test,rock.params['K_0'])
+ G_test = i.shear_modulus(pressure, temperature,rock.params['V_0'],rock.params)
+ self.assertFloatEqual(G_test,rock.params['G_0'])
+ Density_test = i.density(pressure, temperature, rock.params)
+ self.assertFloatEqual(Density_test,rock.params['molar_mass']/rock.params['V_0'])
+ Cp_test= i.heat_capacity_p(pressure, temperature,rock.params['V_0'],rock.params)
+ Cv_test= i.heat_capacity_v(pressure, temperature,rock.params['V_0'],rock.params)
+ Kt_test = i.isothermal_bulk_modulus(pressure, temperature,rock.params['V_0'],rock.params)
+ self.assertFloatEqual(Kt_test,rock.params['K_0'])
+ alpha_test = i.thermal_expansivity(pressure, temperature,rock.params['V_0'],rock.params)
+ Cp_test= i.heat_capacity_p(pressure, temperature,rock.params['V_0'],rock.params)
+ Cv_test= i.heat_capacity_v(pressure, temperature,rock.params['V_0'],rock.params)
+ Grun_test = i.grueneisen_parameter(pressure, temperature,rock.params['V_0'],rock.params)
eoses_thermal = [burnman.slb.SLB2(),burnman.slb.SLB3()]
- for i in eoses_thermal:
- Cp_test= i.heat_capacity_p(pressure, temperature,rock.params['V_0'],rock.params)
+ for i in eoses_thermal
+ Cp_test= i.heat_capacity_p(pressure, temperature,rock.params['V_0'],rock.params)
self.assertFloatEqual(Cp_test,37.076768469502042)
Cv_test= i.heat_capacity_v(pressure, temperature,rock.params['V_0'],rock.params)
self.assertFloatEqual(Cv_test,36.577717628901553)
More information about the CIG-COMMITS
mailing list