diff --git a/ruoyi-ngtools/src/main/java/com/ruoyi/ngCalTools/service/GBT11062Service.java b/ruoyi-ngtools/src/main/java/com/ruoyi/ngCalTools/service/GBT11062Service.java index f0c3907..3dda4ba 100644 --- a/ruoyi-ngtools/src/main/java/com/ruoyi/ngCalTools/service/GBT11062Service.java +++ b/ruoyi-ngtools/src/main/java/com/ruoyi/ngCalTools/service/GBT11062Service.java @@ -51,89 +51,89 @@ public class GBT11062Service { double dMair = 28.9626; double dZair = 0; DetailService detailService; - public void Run(GasProps ptAGA10) { + public void Run(GasProps gasProps) { for (int i = 0; i < GasConstants.NUMBEROFCOMPONENTS; i++) dXi[i] = 0; iNCC = -1; for (i = 0; i < GasConstants.NUMBEROFCOMPONENTS; i++) { - if (ptAGA10.adMixture[i] > 0.0) { + if (gasProps.adMixture[i] > 0.0) { iNCC = iNCC + 1; aiCID[iNCC] = i; - dXi[iNCC] = ptAGA10.adMixture[i]; + dXi[iNCC] = gasProps.adMixture[i]; } } iNCC = iNCC + 1; for (i = 0; i < GasConstants.NUMBEROFCOMPONENTS; i++) { - if (ptAGA10.adMixture[i] != 0) { - ptAGA10.Pc += adTablePc[i] * ptAGA10.adMixture[i]; - ptAGA10.TC += adTableTc[i] * ptAGA10.adMixture[i]; + if (gasProps.adMixture[i] != 0) { + gasProps.Pc += adTablePc[i] * gasProps.adMixture[i]; + gasProps.TC += adTableTc[i] * gasProps.adMixture[i]; if (adTableBzsx[i] != 0) { - ptAGA10.Bzsx += ptAGA10.adMixture[i] / adTableBzsx[i]; - ptAGA10.Bzxx += ptAGA10.adMixture[i] / adTableBzxx[i]; + gasProps.Bzsx += gasProps.adMixture[i] / adTableBzsx[i]; + gasProps.Bzxx += gasProps.adMixture[i] / adTableBzxx[i]; } if (i >= 10 & i <= 18) { - ptAGA10.C4j += ptAGA10.adMixture[i] * adTableMri[i]; + gasProps.C4j += gasProps.adMixture[i] * adTableMri[i]; } if (i >= 12 & i <= 18) { - ptAGA10.C5j += ptAGA10.adMixture[i] * adTableMri[i]; + gasProps.C5j += gasProps.adMixture[i] * adTableMri[i]; } if (i >= 14 & i <= 18) { - ptAGA10.C6j += ptAGA10.adMixture[i] * adTableMri[i]; + gasProps.C6j += gasProps.adMixture[i] * adTableMri[i]; } if (i == 3) { - ptAGA10.C2 += ptAGA10.adMixture[i] * adTableMri[i]; + gasProps.C2 += gasProps.adMixture[i] * adTableMri[i]; } - switch (ptAGA10.dCbtj) { + switch (gasProps.dCbtj) { case 2: - ptAGA10.dZb11062 += adTableSqrtbj[0][i] * ptAGA10.adMixture[i]; - ptAGA10.dHhvMol += adTableHhvMol[0][i] * ptAGA10.adMixture[i]; - ptAGA10.dLhvMol += adTableLhvMol[0][i] * ptAGA10.adMixture[i]; + gasProps.dZb11062 += adTableSqrtbj[0][i] * gasProps.adMixture[i]; + gasProps.dHhvMol += adTableHhvMol[0][i] * gasProps.adMixture[i]; + gasProps.dLhvMol += adTableLhvMol[0][i] * gasProps.adMixture[i]; dZair = 0.99941; break; case 1: - ptAGA10.dZb11062 += adTableSqrtbj[1][i] * ptAGA10.adMixture[i]; - ptAGA10.dHhvMol += adTableHhvMol[1][i] * ptAGA10.adMixture[i]; - ptAGA10.dLhvMol += adTableLhvMol[1][i] * ptAGA10.adMixture[i]; + gasProps.dZb11062 += adTableSqrtbj[1][i] * gasProps.adMixture[i]; + gasProps.dHhvMol += adTableHhvMol[1][i] * gasProps.adMixture[i]; + gasProps.dLhvMol += adTableLhvMol[1][i] * gasProps.adMixture[i]; dZair = 0.99958; break; case 0: - ptAGA10.dZb11062 += adTableSqrtbj[2][i] * ptAGA10.adMixture[i]; - ptAGA10.dHhvMol += adTableHhvMol[2][i] * ptAGA10.adMixture[i]; - ptAGA10.dLhvMol += adTableLhvMol[2][i] * ptAGA10.adMixture[i]; + gasProps.dZb11062 += adTableSqrtbj[2][i] * gasProps.adMixture[i]; + gasProps.dHhvMol += adTableHhvMol[2][i] * gasProps.adMixture[i]; + gasProps.dLhvMol += adTableLhvMol[2][i] * gasProps.adMixture[i]; dZair = 0.99963; break; } } } - ptAGA10.Bzsx = 1 / ptAGA10.Bzsx; - ptAGA10.Bzxx = 1 / ptAGA10.Bzxx; - ptAGA10.dZb11062 = 1 - ptAGA10.dZb11062 * ptAGA10.dZb11062; - ptAGA10.dHhvm = ptAGA10.dHhvMol / ptAGA10.dMrx; - ptAGA10.dLhvm = ptAGA10.dLhvMol / ptAGA10.dMrx; - ptAGA10.dHhvv = ptAGA10.dHhvMol * ptAGA10.dPb / ptAGA10.dTb / 8314.510 / ptAGA10.dZb11062; - ptAGA10.dLhvv = ptAGA10.dLhvMol * ptAGA10.dPb / ptAGA10.dTb / 8314.510 / ptAGA10.dZb11062; - ptAGA10.dRD_Ideal11062 = ptAGA10.dMrx / dMair; - ptAGA10.dRD_Real11062 = ptAGA10.dRD_Ideal11062 * dZair / ptAGA10.dZb11062; + gasProps.Bzsx = 1 / gasProps.Bzsx; + gasProps.Bzxx = 1 / gasProps.Bzxx; + gasProps.dZb11062 = 1 - gasProps.dZb11062 * gasProps.dZb11062; + gasProps.dHhvm = gasProps.dHhvMol / gasProps.dMrx; + gasProps.dLhvm = gasProps.dLhvMol / gasProps.dMrx; + gasProps.dHhvv = gasProps.dHhvMol * gasProps.dPb / gasProps.dTb / 8314.510 / gasProps.dZb11062; + gasProps.dLhvv = gasProps.dLhvMol * gasProps.dPb / gasProps.dTb / 8314.510 / gasProps.dZb11062; + gasProps.dRD_Ideal11062 = gasProps.dMrx / dMair; + gasProps.dRD_Real11062 = gasProps.dRD_Ideal11062 * dZair / gasProps.dZb11062; - ptAGA10.dRhob11062 = ptAGA10.dMrx * ptAGA10.dPb / 8314.51 / ptAGA10.dTb / ptAGA10.dZb11062; - ptAGA10.dRhof11062 = ptAGA10.dMrx * ptAGA10.dPf / 8314.51 / ptAGA10.dTf / ptAGA10.dZf; - ptAGA10.dWobbeIndex = ptAGA10.dHhvv / Math.sqrt(ptAGA10.dRD_Real11062); - ptAGA10.C3j = ptAGA10.C4j + ptAGA10.adMixture[4] * adTableMri[4]; - ptAGA10.C2j = ptAGA10.C3j + ptAGA10.adMixture[3] * adTableMri[3]; - ptAGA10.C3C4 = ptAGA10.adMixture[4] * adTableMri[4] + ptAGA10.adMixture[10] * adTableMri[10] + ptAGA10.adMixture[11] * adTableMri[11]; - ptAGA10.TotalC = ptAGA10.C2j + ptAGA10.adMixture[0] * adTableMri[0]; + gasProps.dRhob11062 = gasProps.dMrx * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062; + gasProps.dRhof11062 = gasProps.dMrx * gasProps.dPf / 8314.51 / gasProps.dTf / gasProps.dZf; + gasProps.dWobbeIndex = gasProps.dHhvv / Math.sqrt(gasProps.dRD_Real11062); + gasProps.C3j = gasProps.C4j + gasProps.adMixture[4] * adTableMri[4]; + gasProps.C2j = gasProps.C3j + gasProps.adMixture[3] * adTableMri[3]; + gasProps.C3C4 = gasProps.adMixture[4] * adTableMri[4] + gasProps.adMixture[10] * adTableMri[10] + gasProps.adMixture[11] * adTableMri[11]; + gasProps.TotalC = gasProps.C2j + gasProps.adMixture[0] * adTableMri[0]; - ptAGA10.TotalC = ptAGA10.TotalC * ptAGA10.dPb / 8314.51 / ptAGA10.dTb / ptAGA10.dZb11062; - ptAGA10.C2 = ptAGA10.C2 * ptAGA10.dPb / 8314.51 / ptAGA10.dTb / ptAGA10.dZb11062; - ptAGA10.C3C4 = ptAGA10.C3C4 * ptAGA10.dPb / 8314.51 / ptAGA10.dTb / ptAGA10.dZb11062; - ptAGA10.C2j = ptAGA10.C2j * ptAGA10.dPb / 8314.51 / ptAGA10.dTb / ptAGA10.dZb11062; - ptAGA10.C3j = ptAGA10.C3j * ptAGA10.dPb / 8314.51 / ptAGA10.dTb / ptAGA10.dZb11062; - ptAGA10.C4j = ptAGA10.C4j * ptAGA10.dPb / 8314.51 / ptAGA10.dTb / ptAGA10.dZb11062; - ptAGA10.C5j = ptAGA10.C5j * ptAGA10.dPb / 8314.51 / ptAGA10.dTb / ptAGA10.dZb11062; - ptAGA10.C6j = ptAGA10.C6j * ptAGA10.dPb / 8314.51 / ptAGA10.dTb / ptAGA10.dZb11062; + gasProps.TotalC = gasProps.TotalC * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062; + gasProps.C2 = gasProps.C2 * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062; + gasProps.C3C4 = gasProps.C3C4 * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062; + gasProps.C2j = gasProps.C2j * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062; + gasProps.C3j = gasProps.C3j * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062; + gasProps.C4j = gasProps.C4j * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062; + gasProps.C5j = gasProps.C5j * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062; + gasProps.C6j = gasProps.C6j * gasProps.dPb / 8314.51 / gasProps.dTb / gasProps.dZb11062; } -} +} \ No newline at end of file