From c269b6dfb370f992296af682fa3cf0c135f695b0 Mon Sep 17 00:00:00 2001
From: Alberto Cuadra Lara <albertocuadralara@gmail.com>
Date: Thu, 5 Aug 2021 21:36:19 +0200
Subject: [PATCH] miscellaneous

---
 .../__pycache__/Define_FOI.cpython-38.pyc     | Bin 3288 -> 3317 bytes
 .../__pycache__/Initialize.cpython-38.pyc     | Bin 9102 -> 9157 bytes
 Solver/Chemical_Equilibrium/SolveProblem.py   |  14 ++++++++++----
 .../GibbsMinimization.cpython-38.pyc          | Bin 6553 -> 6553 bytes
 .../__pycache__/SolveProblem.cpython-38.pyc   | Bin 911 -> 1382 bytes
 Solver/Functions/ComputeProperties.py         |   4 ++--
 Solver/Functions/SetSpecies.py                |   3 ---
 .../ComputeProperties.cpython-38.pyc          | Bin 2352 -> 2340 bytes
 8 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Settings/__pycache__/Define_FOI.cpython-38.pyc b/Settings/__pycache__/Define_FOI.cpython-38.pyc
index 6341ca520a1479253456ebd004f927f9c8f1ef81..2ada7a0c9603b3a3dba978de9cd79937110531f6 100644
GIT binary patch
delta 242
zcmca1`BjoPl$V!_0SLYt@+3~#$h(}CONfzyp@wk+V-efrhwKKE-?5&P&ErU6u3^Yx
zjOVFg2xib^@q5Vv)bf%ENE9(nKE-xRMgn98BO9X#qYR@0qY|S86zVZ?FiqaaF3*@W
z`5wC&V;Imlg~>LYJY2yHE1CR?fL1X~w&5rfcLp+wdBBE%j9_6@0%|OBoqT{@Wb$o}
z^-M)hllwVWG5Srm;+o975=dX-N*9g-Y2pBDl3-K;+F0Z_*@xSV(Q9%uw+&<B<OAH7
SfGQ{R*s%+8adYu-umb>o88oi|

delta 217
zcmew=c|(#nl$V!_0SK7Bb0lhR<Xz6n#lgtHP{TNZv4~~zKGuJHH4MQFn#_JLS%8XO
zGEKh8c1ubOq=Au*QG`*3QGrp3Q348e7$=`+muHNa{GQ#6F=X;PRt0vD?v;#wlVdo_
zL>+*-iouqFb+Q2U7P(Ho$SyMZFUNXTO(wr0#>wkAS221_j^vumTI2*&KKVUYx^M_c
u9|w?N0NSGh#6`Z7Gr7$eohC2fwqcB(e3$zYqwnMmJa+7STpV0H9P9v7;xEJi

diff --git a/Settings/__pycache__/Initialize.cpython-38.pyc b/Settings/__pycache__/Initialize.cpython-38.pyc
index 8995b88a66ea4b46fa0af3f462cb38405078b34e..ab61168fe875d578f06dc053a3f82c9a998a293a 100644
GIT binary patch
delta 2254
zcma)8O>7fK6!xyY@lU*QoF>F^oMdehq=h&!ZGIb+6iNsrcpD&4$%^V)@shf@&UV%*
zQbe0;dq`F39V=)!R3ZYTMiD(AQK>C(;{c){SxA+7fJ0UF4~c8v+c>I4cUE0%zMYx(
z=6mn$do$zDr|wM2r)4?d!Y4Bv%st+e*F~iwEiUV(S&=4Bo;)(Q{W`4*6?e`sHe9R~
z?unO#HYmF9_O#+cRji18sft%G>L2K(@`jM{nufkm&`m~S7J;`tSL&^9Y<nD#t_CyW
zQ9UCbWU7xT@VzwJ*h4Z)YkSpJpze?$D3JChggsz*&o}OSNdsPZ|LRs~ayLOY!OJ={
zHvqE#t-S-({g;2+2+b)7Q`k%q!6%?Q_ah_loqxG^5GPoWpaCHxYE#%wacpD*eS3#U
z*Um;S3XWsjvC)e*nqi{O4-W&+<!5WZ-B^Ed_nUDwzy{%``V%d-VQh^BJwlwEsz_&Y
z#bur2$-8or@5vZ0&((M`W<~qEe6Di>XYCnLun5;evEg*8FPklt3gv88W87d5p#Iq!
z69=j$LeLbt5apYJE1~2nkF_FdsdF`?2eGfIUN($xHbO8;U}c$NWaI@SE!%`7Q80(i
z^da~JU$8-HkXX_M4<fHvc`+I<34;&{@3GGXOowmn%lM0hl77CBFTa=Zon0!G&B6*V
zDX%sSaARYK(20-8n`#NtSW_k2;7Dd0QXdKoBJm(#ND`x&1#Hy^evZ^pY+KKpJ{B-I
z*1X0EuDRv!gjM`+;L?gvwl51%ca3)P^2H``=^9*bJq)*ZvG$BxH%t!AiPmvG4ed;T
zCvEfKk7!QC^I>F&&vF!5zJx!c^AK-KJ6HN;xE$>no}2wYm3|Cq*Rk#7?HE@2EQ~~F
zoE*Ivb#QbV*}jHk$2_Flr=3_f+lTm@d<I!IYW$jkaO|oR+oRYhpN$T#>osi0ttdb1
zNINn9(c$1<8re2$7}M4X@oDFh6Jxk*{0O(&G-SI`!$@OIm2G#>Bz)DC=pr8&so8F(
zet6Us7y2!~Qc4kb%SB~?vs<1j4x#Qx3pcUtl*oRI@{@Q9-cbUpdGUfPE9BjXqJ{3f
z2m7A9>y%5Cw3Vj0<x;6oT2u_SWaz9+m+CC}{5ry7^3B+<zYIku@T8#Kif2%6p}fSh
z3#^%j*8P2kwUEB;h2p}i>PM8C)*k?&uKHW)gw=Qp^d{>0C)R7Y><3y}J+Wx4sr9zs
vTR|D48xYS|1Ui*iKLLFkMk{So;KhyqZQ_gWHc|)?gb8r^zxwe0?(Tm8*bIrp

delta 2180
zcma)7T}%{L6y6ya_6LS#>F%;FEbOk>WI%8W6xrBfS_Kqjst7i2NY)LGxN*Bo?<_ST
zZSk>vz?T!#hXw-=CK4qnA-*)xq(A!RgGPOrG|?yCnpP#@)pG`j8!~s|B<IZBd(QdJ
z`R1N`@57<%L-K?y`&{^(PgdvV*5oBIo{^?!HN(hA17l-@<J+$ZMKCLJy1wFKL3k|Q
z6v9xbcyu6$fr@B~ohj3;6|`@(VrfOlxD8#K%4-HAGYi4jmA9*{&wbltpLD0j6i;Xw
z@e8JSSPcG<(sfC)Szg;w>%OWl1tA8b?xe6EbobRdWse7Jx!<(LXfjSJL29oL&2@q7
z{i>~tKHuYSC!sk)7(y{bR2~7#c@pV^2j1C(-DIvIRf{SkszWGeIXSYv&bA)%wad|l
zhEpiJIodEs5RO)P;hAq!o?iI(-qO~i-})6F>xSpmXF|3#){oRw3JEI8l+NV}vl^$8
z3vvg)l0FR2l~vMbvHefJ()=0D+9RT28t(d=4v(ffv)OzxU&>}x#wD9Z|4U^l(mN^q
zQ1Aaf%1;Bg{T=f>R8v$_SIR*9@mp2g>{EQRUQ&liS*uJO8CAi^%XUH9(J+o;cu;u+
zPfe{<E3tMLJdJ#0t&3iFQ|JbN;A8u>fZ@RXcGFwP7qzSTi>1pM&!w4S$;i*~7Nx7c
zhs%u}#Uj3=YIa(X#;PLOk|UcfrGseD38WGgQj!?WOrh*N@G??G+}1bie-Mxy3odZT
z1w(I>R`Y+3p{7u>ZwpYuX?~*}!_WnkT~5cWF8Djl8qEq#H#m@I8v2`gEx-m44&Yk&
zIK-n7@J3XpX8JbL%P(#ak$x>JZV-!Gblw5WupB+mK7RT`b^skGOR(B734PHKry>`l
zy?nYS5akv;j7-94<FFITTB8HXNkmzJfA$@RlTC&b%8RBnzm{P{S%ufpN%%Q7>V)!t
z%;C3>Aj%rbZcmI@J@HfXj1yv@rT;XyCFoGSSB6MqRgrCX4t1o}Lu?Rkv?N188oyT|
z8g{^omIRE|g<vV%3aNMj_sL?shqF&M;tpgFA>QvOyJQbpWPePg;8mbuY_5KMwph#;
zr{g-C(KS}0`%*=BMP#(~@Ic8;m1bCW%6_My%U=Xeo82W;33JUbp9sx=NOyjM5r0zb
z&S^tqRjIc9XV&#fw-=s`sOUst9i)gIqsX#97<6GZc;9a%e`yVq$xkXk%Dvaqa$Mfu
F`VM@VeCPlG

diff --git a/Solver/Chemical_Equilibrium/SolveProblem.py b/Solver/Chemical_Equilibrium/SolveProblem.py
index cdb83fb..ad49023 100644
--- a/Solver/Chemical_Equilibrium/SolveProblem.py
+++ b/Solver/Chemical_Equilibrium/SolveProblem.py
@@ -9,12 +9,18 @@
 ----------------------------------------------------------------------
 """
 from Solver.Chemical_Equilibrium.Equilibrate import equilibrate
+from Solver.Shocks_and_detonations.Shock_incident import shock_incident
 
 def SolveProblem(self, i):
-    if not i:
-        self.PS.strP.append(equilibrate(self, self.PS.strR[i], self.PD.pP.Value))
-    else:
-        self.PS.strP.append(equilibrate(self, self.PS.strR[i], self.PD.pP.Value, self.PS.strP[i - 1]))    
+    if not any(self.PD.ProblemType.upper() == pt for pt in ['SHOCK_I', 'SHOCK_R', 'DET', 'DET_OVERDRIVEN']):
+        if not i:
+            self.PS.strP.append(equilibrate(self, self.PS.strR[i], self.PD.pP.Value))
+        else:
+            self.PS.strP.append(equilibrate(self, self.PS.strR[i], self.PD.pP.Value, self.PS.strP[i - 1]))
+    elif self.PD.ProblemType.upper() == 'SHOCK_I':
+        str1, str2 = shock_incident(self, self.PS.strR[i], self.PD.pR.Value, self.PD.TR.Value, self.PD.u1.Value)
+        self.PS.strR.append(str1)
+        self.PS.strP.append(str2)
 
     return self
     
\ No newline at end of file
diff --git a/Solver/Chemical_Equilibrium/__pycache__/GibbsMinimization.cpython-38.pyc b/Solver/Chemical_Equilibrium/__pycache__/GibbsMinimization.cpython-38.pyc
index 7f3b883b365dd6aa4f0da99c8d59093647bcab96..2a176fc2ff35870ca0a5703a794055ff83f34ae9 100644
GIT binary patch
delta 51
zcmbPfJkyvvl$V!_0SM|$c{Xw@vN2Xn)@5^Ltk_)4W+%vaYw{-XdyHk1CrWGulJ1g0
E07GLAZ~y=R

delta 51
zcmbPfJkyvvl$V!_0SLkwIX7}EvN0x4)@5^LOx|3~W+%uPHF=ZxJ;u_>6D76+Nq5O0
E04S>sW&i*H

diff --git a/Solver/Chemical_Equilibrium/__pycache__/SolveProblem.cpython-38.pyc b/Solver/Chemical_Equilibrium/__pycache__/SolveProblem.cpython-38.pyc
index d27f702527944e049a1f37c3f55bf09e49810725..19b0181e74b17e178bf9f9c5bbd9b7b740bd4c48 100644
GIT binary patch
delta 830
zcmZWnPiqrF6rVRco1{s)Egp&m(VKKZf~|reAqXbeqNE|IIV>$<%}isG&2F6Ch?UeF
zQnWXbe1Y`XqhF*4kMjWpzk(;{O=9uS!28YHo%i1F_a5(a`g_)Sxw@Jq`t0rG{Ui3p
zxmDQGUz~V^1E&EDs7C>PE3gL4W7=ojJ|mvZQw`##zrN_e#0BNVucLOq)eYNSF2bZu
zvFP$JeXnS<w8h^vB;*r01|&GkaH~wFFoif7L;U2N^q@!QR>IDS@$E5eqL=EWdzq<q
z0YKhd{S!5T-d|yh=P_`0lWdYH!=%tNMONn73&QO_l~+mbKZ<-WW1?1<x1%ZTLwZV2
zEmPB;TVsmV77Y5!2%4M|J&IJd4Z64A2M2%+KhPH6)-WbV8>gT%b&GR)LB`OhO`_YO
z9MhrdT8h@nDp!-yt3V76PKH9+qv23UmnvGgujnwj1jS+z9AA>3ANk|MXHnD%#O#cI
zn5+~#A{6h2vb2VbICDlQd4H!71#iW&W}z5FZ9j-hh3jaSsdQs^|LODAp0{-Bo>i_K
zC`UtUzgel5>wC>g^#^t*9S!c9vi$Hwt8HjCiL9xVKij426N#)^W=+{mKNtyVV@e7E
zN1<QpiXLbiZM#h3-YMvs659rMWDa9-S7aVv^M8s*>iC8R0vo{KE`12=Pyh!UDsjM7
z>ZWE})+6EFGikEWz@3a+e#l!~BvI%m-6)I~zpq!-NHYZ%>_&nCBOy~9M0^y861E>>
KFD#pfJpBcvEXG>^

delta 332
zcmaFH)z8is%FD~e00e$-xf9nhP2`hNk^%Bk7@`<b7*m*X7;~ATm>3ySm{V9<7^0X{
zSc4ff*)~R`Gu9_FfwVyZh|LMa&Olt803>P{i?wPPvKX=$7ciAD*D!$DEH#XhAQo#D
zTNZmW^Fl^OhCCzusvxp8j46x~43Z4ZEFe8K3_wS4GWoq^1X`rYF<FO2R^b*?fXgkW
zf`D7BVTn1VshUi;Sc+3~(rz(ku4E|UWnh?Wz}%(A6P%w@mKso$pOllD3lwB1<^U25
zj4X_5Oh!ya{6My!Cd=egEanDa4oD+dH<aK5a&K|i<mRW8=A_zzY%gX35-eOiOaKSn
BK}!Gt

diff --git a/Solver/Functions/ComputeProperties.py b/Solver/Functions/ComputeProperties.py
index 424379e..56994f6 100644
--- a/Solver/Functions/ComputeProperties.py
+++ b/Solver/Functions/ComputeProperties.py
@@ -48,8 +48,8 @@ def __init__(self, app, SpeciesMatrix, p, T):
         self.mi = sum(SpeciesMatrix[:, 10]) * 1e-3            # [kg]
         self.rho = self.mi / self.v * 1e3                     # [kg/m3]
         self.Yi = SpeciesMatrix[:, 10] / self.mi * 1e-3       # [-]
-        self.cP = sum(SpeciesMatrix[:, 5] * self.Yi)  # [J/K]
-        self.cV = sum(SpeciesMatrix[:, 6] * self.Yi)  # [J/K]
+        self.cP = sum(SpeciesMatrix[:, 5])  # [J/K]
+        self.cV = sum(SpeciesMatrix[:, 6])  # [J/K]
         self.W = 1/np.nansum(self.Yi / SpeciesMatrix[:, 11])  # []
         Ni = SpeciesMatrix[:, 0]                              # [mol]
         self.Xi = Ni / self.N                                 # [-]
diff --git a/Solver/Functions/SetSpecies.py b/Solver/Functions/SetSpecies.py
index d9ce42c..f9ccdcd 100644
--- a/Solver/Functions/SetSpecies.py
+++ b/Solver/Functions/SetSpecies.py
@@ -9,9 +9,6 @@
          Office 1.1.D22, Universidad Carlos III de Madrid
 """
 import numpy as np
-from NASA_database.set_reference_form_of_elements_with_T_intervals import set_reference_form_of_elements_with_T_intervals
-from NASA_database.isRefElm import isRefElm
-from NASA_database.detect_location_of_phase_specifier import detect_location_of_phase_specifier
 
 def SetSpecies(self, Species, N, T):
     M = self.C.M0.Value.copy()
diff --git a/Solver/Functions/__pycache__/ComputeProperties.cpython-38.pyc b/Solver/Functions/__pycache__/ComputeProperties.cpython-38.pyc
index 109b8294af0406b7943f8cc66aaea34246140236..334d1d3071757b45f32dd1e7ac1fdc69d2033ae6 100644
GIT binary patch
delta 64
zcmdlWv_yzEl$V!_0SH7bcoHi%@-Ag!e7AWs(|tzKX2u$Zc;yoA8m1J66oyu&6y7u@
T$<3Qt7BVx7F^WwN=eP*~31twg

delta 58
zcmZ1?v_XhBl$V!_0SHd5;7;t>$h(w@@z>_fO!paCYZ$VWL?%yU5r?ogFK1cE%q+tw
JGufNtCIIA&5RU)=