Skip to content

Commit 93303fd

Browse files
bobmyhillbobmyhill
committed
formatted modular_mgd class
1 parent 4772ede commit 93303fd

File tree

1 file changed

+39
-23
lines changed

1 file changed

+39
-23
lines changed

‎tests/test_modular_mgd.py‎

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,13 @@ def test_SLB_derivatives(self):
4949

5050
dVrel = 1.0e-6
5151
Vrel = 0.7
52-
dtdVrel_numerical = (t(Vrel + dVrel, params) - t(Vrel - dVrel, params)) / (2.0 * dVrel)
53-
dtdVrel_analytical = t.dVrel(Vrel, params)
54-
d2tdVrel2_numerical = (t.dVrel(Vrel + dVrel, params) - t.dVrel(Vrel - dVrel, params)) / (
52+
dtdVrel_numerical = (t(Vrel + dVrel, params) - t(Vrel - dVrel, params)) / (
5553
2.0 * dVrel
5654
)
55+
dtdVrel_analytical = t.dVrel(Vrel, params)
56+
d2tdVrel2_numerical = (
57+
t.dVrel(Vrel + dVrel, params) - t.dVrel(Vrel - dVrel, params)
58+
) / (2.0 * dVrel)
5759
d2tdVrel2_analytical = t.d2dVrel2(Vrel, params)
5860
self.assertAlmostEqual(dtdVrel_numerical, dtdVrel_analytical, places=6)
5961
self.assertAlmostEqual(d2tdVrel2_numerical, d2tdVrel2_analytical, places=6)
@@ -63,7 +65,7 @@ def test_PLG_derivatives(self):
6365
params["reference_eos"] = create("bm3")
6466
params["debye_temperature_model"] = PLG()
6567
params["Debye_0"] = 1000.0
66-
params["grueneisen_0"] = 1.
68+
params["grueneisen_0"] = 1.0
6769
params["c_1"] = 0.2
6870
params["c_2"] = 0.1
6971
params["q_1"] = 1.0
@@ -73,11 +75,13 @@ def test_PLG_derivatives(self):
7375

7476
dVrel = 1.0e-6
7577
Vrel = 0.7
76-
dtdVrel_numerical = (t(Vrel + dVrel, params) - t(Vrel - dVrel, params)) / (2.0 * dVrel)
77-
dtdVrel_analytical = t.dVrel(Vrel, params)
78-
d2tdVrel2_numerical = (t.dVrel(Vrel + dVrel, params) - t.dVrel(Vrel - dVrel, params)) / (
78+
dtdVrel_numerical = (t(Vrel + dVrel, params) - t(Vrel - dVrel, params)) / (
7979
2.0 * dVrel
8080
)
81+
dtdVrel_analytical = t.dVrel(Vrel, params)
82+
d2tdVrel2_numerical = (
83+
t.dVrel(Vrel + dVrel, params) - t.dVrel(Vrel - dVrel, params)
84+
) / (2.0 * dVrel)
8185
d2tdVrel2_analytical = t.d2dVrel2(Vrel, params)
8286
self.assertAlmostEqual(dtdVrel_numerical, dtdVrel_analytical, places=6)
8387
self.assertAlmostEqual(d2tdVrel2_numerical, d2tdVrel2_analytical, places=6)
@@ -94,11 +98,13 @@ def test_PLGS_derivatives(self):
9498

9599
dVrel = 1.0e-6
96100
Vrel = 0.7
97-
dtdVrel_numerical = (t(Vrel + dVrel, params) - t(Vrel - dVrel, params)) / (2.0 * dVrel)
98-
dtdVrel_analytical = t.dVrel(Vrel, params)
99-
d2tdVrel2_numerical = (t.dVrel(Vrel + dVrel, params) - t.dVrel(Vrel - dVrel, params)) / (
101+
dtdVrel_numerical = (t(Vrel + dVrel, params) - t(Vrel - dVrel, params)) / (
100102
2.0 * dVrel
101103
)
104+
dtdVrel_analytical = t.dVrel(Vrel, params)
105+
d2tdVrel2_numerical = (
106+
t.dVrel(Vrel + dVrel, params) - t.dVrel(Vrel - dVrel, params)
107+
) / (2.0 * dVrel)
102108
d2tdVrel2_analytical = t.d2dVrel2(Vrel, params)
103109
self.assertAlmostEqual(dtdVrel_numerical, dtdVrel_analytical, places=6)
104110
self.assertAlmostEqual(d2tdVrel2_numerical, d2tdVrel2_analytical, places=6)
@@ -112,7 +118,9 @@ def test_check_SLB_consistency(self):
112118
params["q_0"] = 1.1
113119

114120
m = Mineral(params)
115-
consistent = check_eos_consistency(m, 2.0e9, 2000.0, including_shear_properties=False, tol=1.0e-4)
121+
consistent = check_eos_consistency(
122+
m, 2.0e9, 2000.0, including_shear_properties=False, tol=1.0e-4
123+
)
116124
self.assertTrue(consistent)
117125

118126
def test_check_PLG_consistency(self):
@@ -127,7 +135,9 @@ def test_check_PLG_consistency(self):
127135
params["q_2"] = 2.0
128136

129137
m = Mineral(params)
130-
consistent = check_eos_consistency(m, 2.0e9, 2000.0, including_shear_properties=False, tol=1.0e-4)
138+
consistent = check_eos_consistency(
139+
m, 2.0e9, 2000.0, including_shear_properties=False, tol=1.0e-4
140+
)
131141
self.assertTrue(consistent)
132142

133143
def test_check_PLGS_consistency(self):
@@ -139,7 +149,9 @@ def test_check_PLGS_consistency(self):
139149
params["q_0"] = 1.0
140150

141151
m = Mineral(params)
142-
consistent = check_eos_consistency(m, 2.0e9, 2000.0, including_shear_properties=False, tol=1.0e-4)
152+
consistent = check_eos_consistency(
153+
m, 2.0e9, 2000.0, including_shear_properties=False, tol=1.0e-4
154+
)
143155
self.assertTrue(consistent)
144156

145157
def test_SLB_grueneisen(self):
@@ -149,10 +161,10 @@ def test_SLB_grueneisen(self):
149161
params["Debye_0"] = 1000.0
150162
params["grueneisen_0"] = 1.2
151163
params["q_0"] = 1.1
152-
params["P_0"] = 1.e5
164+
params["P_0"] = 1.0e5
153165

154166
m = Mineral(params)
155-
m.set_state(1.e5, 298.15)
167+
m.set_state(1.0e5, 298.15)
156168
self.assertAlmostEqual(m.gr, params["grueneisen_0"], places=6)
157169

158170
def test_PLG_grueneisen(self):
@@ -165,10 +177,10 @@ def test_PLG_grueneisen(self):
165177
params["c_2"] = 0.1
166178
params["q_1"] = 1.0
167179
params["q_2"] = 2.0
168-
params["P_0"] = 1.e5
180+
params["P_0"] = 1.0e5
169181

170182
m = Mineral(params)
171-
m.set_state(1.e5, 298.15)
183+
m.set_state(1.0e5, 298.15)
172184
self.assertAlmostEqual(m.gr, params["grueneisen_0"], places=6)
173185

174186
def test_PLGS_grueneisen(self):
@@ -178,10 +190,10 @@ def test_PLGS_grueneisen(self):
178190
params["Debye_0"] = 1000.0
179191
params["grueneisen_0"] = 1.2
180192
params["q_0"] = 1.1
181-
params["P_0"] = 1.e5
193+
params["P_0"] = 1.0e5
182194

183195
m = Mineral(params)
184-
m.set_state(1.e5, 298.15)
196+
m.set_state(1.0e5, 298.15)
185197
self.assertAlmostEqual(m.gr, params["grueneisen_0"], places=6)
186198

187199
def test_SLB_electronic_contribution(self):
@@ -191,12 +203,14 @@ def test_SLB_electronic_contribution(self):
191203
params["Debye_0"] = 1000.0
192204
params["grueneisen_0"] = 1.2
193205
params["q_0"] = 1.1
194-
params["P_0"] = 1.e5
206+
params["P_0"] = 1.0e5
195207
params["bel_0"] = 0.005
196208
params["gel"] = 1.5
197209

198210
m = Mineral(params)
199-
consistent = check_eos_consistency(m, 2.0e9, 2000.0, including_shear_properties=False, tol=1.0e-4)
211+
consistent = check_eos_consistency(
212+
m, 2.0e9, 2000.0, including_shear_properties=False, tol=1.0e-4
213+
)
200214
self.assertTrue(consistent)
201215

202216
def test_SPOCK_isothermal_contribution(self):
@@ -206,13 +220,15 @@ def test_SPOCK_isothermal_contribution(self):
206220
params["Debye_0"] = 1000.0
207221
params["grueneisen_0"] = 1.2
208222
params["q_0"] = 1.1
209-
params["P_0"] = 1.e5
223+
params["P_0"] = 1.0e5
210224
params["Kprime_inf"] = 2.0
211225
params["Kprime_0"] = 4.21796
212226
params["Kdprime_0"] = -4 / 1.0e11
213227

214228
m = Mineral(params)
215-
consistent = check_eos_consistency(m, 2.0e9, 2000.0, including_shear_properties=False, tol=1.0e-4)
229+
consistent = check_eos_consistency(
230+
m, 2.0e9, 2000.0, including_shear_properties=False, tol=1.0e-4
231+
)
216232
self.assertTrue(consistent)
217233

218234

0 commit comments

Comments
 (0)