Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 fordprefect
|
f87b3df23c | ||
|
fordprefect
|
8a6ce15fdb |
+3
-3
@@ -4,9 +4,9 @@ Al (iv) 1.17168760603347 1.03621345449937 1.07847577080796 1.07904245954011 0.9
|
||||
Al (vi) 0.34574794613374 0.405710686785444 0.168168513653823 0.172746304298536 0.157980594727049 0.858484179410594 1.94036214251573
|
||||
""",
|
||||
"""Fro5-2 amph_Fro_i amph_Fro_j amph_Fro_k amph_Fro_l amph_Fro_m amph_Fro_o
|
||||
No. 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293
|
||||
Al (iv) 0.722019855619663 0.618805763255942 1.02501004682069 1.10486521183116 1.18493217142932 1.19295407392041 1.15759451353221 1.16429698850985 1.21123469040152 1.20507209553264 1.30861065282402 1.09144150899768 0.982439956144869 0.918193863276047 0.405664661926494 0.362530813021841 0.372980250495114 0.328547821159988 0.243986930365164 0.296408654943485 0.307909880246553 0.359144170412725 0.872444059303483 0.858107376299246 0.844286361278411 1.2200291006557 0.978363396613103 1.06809097270696 1.10896600646457 1.55676512895417 1.00453603762971 0.873231869108992 0.664710569810095 0.393495015337273 0.359070626763721 0.315505017892295 0.158166254469616 0.206867394174812 1.39351036719127 1.31571242621294 0.59785059241193 0.420801602841876 0.264833006671243 0.328230289116427 0.370141500529203 2.70447549631297 0.477022110003905 0.294780639391238 0.671248066534227 0.894151188287977 1.41253847593417 0.353860906997785 0.421185639874149 0.326373971471085 0.316768682167532 0.298709896920723 0.312106822828219 0.333263330736797 1.15527021350207 0.979882525568701 0.708172715407262 0.597919267700598 0.410307264204808 0.296606171848898 0.367569499388969 0.421663528818793 0.333330343809449 0.282690916058288 0.327614137469426 0.388701589377633 0.237887121812194 0.235656809658487 0.192344872665882 0.308308746647008 0.255445884050983 0.239425364568866 0.315366207415213
|
||||
Al (vi) 0.933489100997222 1.06666153315248 0.877876448676666 0.919369206527092 0.912710727349233 0.93050011160589 1.00821494084138 0.969406552353089 0.981774854119898 0.970280109244273 0.978003417382252 0.958376300795917 0.796594495931627 0.832584234383143 1.31229512954086 1.36217316381665 1.3762468969197 1.41247477820508 1.51235653390907 1.42844729725813 1.40019958371494 1.35728809962144 0.889266058203009 0.867031554138447 0.86188965356094 0.72720585444048 0.86700036591186 0.757753452875172 0.849755233916429 0.981246182964492 0.73255198503012 0.803888066140904 1.00117464606099 1.3267923469654 1.37655085682166 1.47596769680823 1.66558076284081 1.5778281638066 1.02461156119325 0.868002940635026 1.22602856950507 1.29265036135634 1.43338130324905 1.4171314070923 1.39361718073771 4.9163157805524 1.2156203834852 1.39503157494463 1.06582838399492 0.835616008986315 0.783232923753725 1.36077278004045 1.3810262185537 1.47027538517149 1.47748835813899 1.48593971990796 1.49843545764423 1.46859890842675 0.879251188709484 0.924169365409821 1.12285334809971 1.19755834530786 1.34451290628813 1.44417170575338 1.34965540297918 1.28127198505971 1.33211799086708 1.41002240525348 1.36018855138295 1.30219682716984 1.47950693452883 1.46419425399954 1.49704799262834 1.39576034271885 1.45635643701559 1.4698053796526 1.4041558429872
|
||||
No. 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 254 255 256 257 258 259 260 261 262 263 264 265 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293
|
||||
Al (iv) 0.722019855619663 0.618805763255942 1.02501004682069 1.10486521183116 1.18493217142932 1.19295407392041 1.15759451353221 1.16429698850985 1.21123469040152 1.20507209553264 1.30861065282402 1.09144150899768 0.982439956144869 0.918193863276047 0.405664661926494 0.362530813021841 0.372980250495114 0.328547821159988 0.243986930365164 0.296408654943485 0.307909880246553 0.359144170412725 0.872444059303483 0.858107376299246 0.844286361278411 1.2200291006557 0.978363396613103 1.06809097270696 1.10896600646457 1.55676512895417 1.00453603762971 0.873231869108992 0.664710569810095 0.393495015337273 0.359070626763721 0.315505017892295 0.158166254469616 0.206867394174812 1.39351036719127 1.31571242621294 0.59785059241193 0.420801602841876 0.264833006671243 0.328230289116427 0.370141500529203 0.477022110003905 0.294780639391238 0.671248066534227 0.894151188287977 1.41253847593417 0.353860906997785 0.421185639874149 0.326373971471085 0.316768682167532 0.298709896920723 0.312106822828219 0.333263330736797 1.15527021350207 0.979882525568701 0.708172715407262 0.597919267700598 0.410307264204808 0.296606171848898 0.367569499388969 0.421663528818793 0.333330343809449 0.282690916058288 0.327614137469426 0.388701589377633 0.237887121812194 0.235656809658487 0.192344872665882 0.308308746647008 0.255445884050983 0.239425364568866 0.315366207415213
|
||||
Al (vi) 0.933489100997222 1.06666153315248 0.877876448676666 0.919369206527092 0.912710727349233 0.93050011160589 1.00821494084138 0.969406552353089 0.981774854119898 0.970280109244273 0.978003417382252 0.958376300795917 0.796594495931627 0.832584234383143 1.31229512954086 1.36217316381665 1.3762468969197 1.41247477820508 1.51235653390907 1.42844729725813 1.40019958371494 1.35728809962144 0.889266058203009 0.867031554138447 0.86188965356094 0.72720585444048 0.86700036591186 0.757753452875172 0.849755233916429 0.981246182964492 0.73255198503012 0.803888066140904 1.00117464606099 1.3267923469654 1.37655085682166 1.47596769680823 1.66558076284081 1.5778281638066 1.02461156119325 0.868002940635026 1.22602856950507 1.29265036135634 1.43338130324905 1.4171314070923 1.39361718073771 1.2156203834852 1.39503157494463 1.06582838399492 0.835616008986315 0.783232923753725 1.36077278004045 1.3810262185537 1.47027538517149 1.47748835813899 1.48593971990796 1.49843545764423 1.46859890842675 0.879251188709484 0.924169365409821 1.12285334809971 1.19755834530786 1.34451290628813 1.44417170575338 1.34965540297918 1.28127198505971 1.33211799086708 1.41002240525348 1.36018855138295 1.30219682716984 1.47950693452883 1.46419425399954 1.49704799262834 1.39576034271885 1.45635643701559 1.4698053796526 1.4041558429872
|
||||
""",
|
||||
"""Fro12-4 amph_Fro_ad amph_Fro_ah amph_Fro_ai amph_Fro_aj
|
||||
No. 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249
|
||||
|
||||
+28
-35
@@ -3,8 +3,6 @@ import matplotlib.pyplot as pp
|
||||
import numpy as np
|
||||
import data_ternary
|
||||
import data_udiagram
|
||||
import data_zdiagram
|
||||
|
||||
|
||||
def plotTdiagram():
|
||||
scale = 100
|
||||
@@ -80,34 +78,34 @@ def plotUdiagram():
|
||||
figures = {}
|
||||
figures["E11-9a_amph_E11_ab"] = pp.subplots(1)
|
||||
figures["Fro5-2_amph_Fro_i"] = pp.subplots(1)
|
||||
figures["Fro5-2_amph_Fro_j"] = figures["Fro5-2_amph_Fro_i"] #pp.subplots(1)
|
||||
figures["Fro5-2_amph_Fro_k"] = figures["Fro5-2_amph_Fro_i"] #pp.subplots(1)
|
||||
figures["Fro5-2_amph_Fro_l"] = figures["Fro5-2_amph_Fro_i"] #pp.subplots(1)
|
||||
figures["Fro5-2_amph_Fro_m"] = figures["Fro5-2_amph_Fro_i"] #pp.subplots(1)
|
||||
figures["Fro5-2_amph_Fro_o"] = figures["Fro5-2_amph_Fro_i"] #pp.subplots(1)
|
||||
figures["Fro5-2_amph_Fro_j"] = pp.subplots(1)
|
||||
figures["Fro5-2_amph_Fro_k"] = pp.subplots(1)
|
||||
figures["Fro5-2_amph_Fro_l"] = pp.subplots(1)
|
||||
figures["Fro5-2_amph_Fro_m"] = pp.subplots(1)
|
||||
figures["Fro5-2_amph_Fro_o"] = pp.subplots(1)
|
||||
figures["Fro12-4_amph_Fro_ad"] = pp.subplots(1)
|
||||
figures["Fro12-4_amph_Fro_ah"] = figures["Fro12-4_amph_Fro_ad"] #pp.subplots(1)
|
||||
figures["Fro12-4_amph_Fro_ai"] = figures["Fro12-4_amph_Fro_ad"] #pp.subplots(1)
|
||||
figures["Fro12-4_amph_Fro_aj"] = figures["Fro12-4_amph_Fro_ad"] #pp.subplots(1)
|
||||
figures["Fro12-4_amph_Fro_ah"] = pp.subplots(1)
|
||||
figures["Fro12-4_amph_Fro_ai"] = pp.subplots(1)
|
||||
figures["Fro12-4_amph_Fro_aj"] = pp.subplots(1)
|
||||
figures["Fro1312b1_amph_Fro_bb"] = pp.subplots(1)
|
||||
figures["Fro1312b1_amph_Fro_be"] = figures["Fro1312b1_amph_Fro_bb"] #pp.subplots(1)
|
||||
figures["Fro1312b1_amph_Fro_bi"] = figures["Fro1312b1_amph_Fro_bb"] #pp.subplots(1)
|
||||
figures["Fro1312b1_amph_Fro_be"] = pp.subplots(1)
|
||||
figures["Fro1312b1_amph_Fro_bi"] = pp.subplots(1)
|
||||
figures["Rane10-3_amph_Rane_a"] = pp.subplots(1)
|
||||
figures["Rane10-3_amph_Rane_b"] = figures["Rane10-3_amph_Rane_a"] #pp.subplots(1)
|
||||
figures["Rane10-3_amph_Rane_c"] = figures["Rane10-3_amph_Rane_a"] #pp.subplots(1)
|
||||
figures["Rane10-3_amph_Rane_e"] = figures["Rane10-3_amph_Rane_a"] #pp.subplots(1)
|
||||
figures["Rane10-3_amph_Rane_f"] = figures["Rane10-3_amph_Rane_a"] #pp.subplots(1)
|
||||
figures["Rane10-4_amph_Rane_g"] = figures["Rane10-3_amph_Rane_a"] #pp.subplots(1)
|
||||
figures["Rane10-4_amph_Rane_l"] = figures["Rane10-3_amph_Rane_a"] #pp.subplots(1)
|
||||
figures["Rane10-4_amph_Rane_m"] = figures["Rane10-3_amph_Rane_a"] #pp.subplots(1)
|
||||
figures["Rane10-3_amph_Rane_b"] = pp.subplots(1)
|
||||
figures["Rane10-3_amph_Rane_c"] = pp.subplots(1)
|
||||
figures["Rane10-3_amph_Rane_e"] = pp.subplots(1)
|
||||
figures["Rane10-3_amph_Rane_f"] = pp.subplots(1)
|
||||
figures["Rane10-4_amph_Rane_g"] = pp.subplots(1)
|
||||
figures["Rane10-4_amph_Rane_l"] = pp.subplots(1)
|
||||
figures["Rane10-4_amph_Rane_m"] = pp.subplots(1)
|
||||
figures["Rane10-10_amph_Rane_p"] = pp.subplots(1)
|
||||
figures["Rane10-10_amph_Rane_q"] = figures["Rane10-10_amph_Rane_p"] #pp.subplots(1)
|
||||
figures["Rane10-10_amph_Rane_r"] = figures["Rane10-10_amph_Rane_p"] #pp.subplots(1)
|
||||
figures["Rane10-10_amph_Rane_s"] = figures["Rane10-10_amph_Rane_p"] #pp.subplots(1)
|
||||
figures["Rane10-10_amph_Rane_t"] = figures["Rane10-10_amph_Rane_p"] #pp.subplots(1)
|
||||
figures["Rane10-10_amph_Rane_u"] = figures["Rane10-10_amph_Rane_p"] #pp.subplots(1)
|
||||
figures["Rane10-10_amph_Rane_v"] = figures["Rane10-10_amph_Rane_p"] #pp.subplots(1)
|
||||
figures["Rane10-10_amph_Rane_w"] = figures["Rane10-10_amph_Rane_p"] #pp.subplots(1)
|
||||
figures["Rane10-10_amph_Rane_q"] = pp.subplots(1)
|
||||
figures["Rane10-10_amph_Rane_r"] = pp.subplots(1)
|
||||
figures["Rane10-10_amph_Rane_s"] = pp.subplots(1)
|
||||
figures["Rane10-10_amph_Rane_t"] = pp.subplots(1)
|
||||
figures["Rane10-10_amph_Rane_u"] = pp.subplots(1)
|
||||
figures["Rane10-10_amph_Rane_v"] = pp.subplots(1)
|
||||
figures["Rane10-10_amph_Rane_w"] = pp.subplots(1)
|
||||
|
||||
for g in data_udiagram.data.keys():
|
||||
|
||||
@@ -118,17 +116,12 @@ def plotUdiagram():
|
||||
ax.plot(dat['index'][i], dat['al4'][i], label="Al(IV)", color="blue", marker=".")
|
||||
ax.plot(dat['index'][i], dat['al6'][i], label="Al(VI)", color="orange", marker=".")
|
||||
ax.set_xlabel("No.")
|
||||
ax.set_ylabel("value")
|
||||
ax.set_ylabel("pfu")
|
||||
ax.set_title(f"{g}: {zone}")
|
||||
ax.legend(frameon=False)
|
||||
ax.xaxis.get_major_locator().set_params(integer=True)
|
||||
|
||||
figs = list(set([figures[i] for i in figures]))
|
||||
for key in figures:
|
||||
if key not in figs: continue
|
||||
fig, ax = figures[key]
|
||||
pp.gcf()
|
||||
pp.savefig(f"uplot_{key}.png")
|
||||
fig.savefig(f"uplot_{g}_{zone}.png")
|
||||
|
||||
pp.show()
|
||||
|
||||
@@ -150,7 +143,7 @@ def plotZdiagram():
|
||||
ax.legend(frameon=False)
|
||||
#ax.xaxis.get_major_locator().set_params(integer=True)
|
||||
|
||||
pp.savefig(f"zplot_{g}.png")
|
||||
fig.savefig(f"zplot_{g}.png")
|
||||
|
||||
pp.show()
|
||||
|
||||
@@ -159,5 +152,5 @@ if __name__ == "__main__":
|
||||
pass
|
||||
|
||||
#plotTdiagram()
|
||||
#plotUdiagram()
|
||||
plotUdiagram()
|
||||
plotZdiagram()
|
||||
|
||||
Reference in New Issue
Block a user