Skip to content

Commit fb3e6b9

Browse files
authored
Update SystemThermo.java (#1621)
1 parent 66b7ad2 commit fb3e6b9

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

src/main/java/neqsim/thermo/system/SystemThermo.java

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2247,17 +2247,28 @@ public SystemInterface getEmptySystemClone() {
22472247

22482248
SystemInterface newSystem = this.clone();
22492249

2250+
double totalMolesInSystem = 0.0;
2251+
double scaleFactor = 1.0e30;
2252+
22502253
for (int j = 0; j < getMaxNumberOfPhases(); j++) {
22512254
phaseNumber = j;
2255+
double phaseMoles = 0.0;
22522256
for (int i = 0; i < getPhase(j).getNumberOfComponents(); i++) {
2253-
newSystem.getPhase(j).getComponent(i).setNumberOfmoles(
2254-
getPhase(phaseNumber).getComponent(i).getNumberOfMolesInPhase() / 1.0e30);
2255-
newSystem.getPhase(j).getComponent(i).setNumberOfMolesInPhase(
2256-
getPhase(phaseNumber).getComponent(i).getNumberOfMolesInPhase() / 1.0e30);
2257+
double scaledMoles =
2258+
getPhase(phaseNumber).getComponent(i).getNumberOfMolesInPhase() / scaleFactor;
2259+
newSystem.getPhase(j).getComponent(i).setNumberOfmoles(scaledMoles);
2260+
newSystem.getPhase(j).getComponent(i).setNumberOfMolesInPhase(scaledMoles);
2261+
phaseMoles += scaledMoles;
22572262
}
2263+
totalMolesInSystem += phaseMoles;
2264+
}
2265+
2266+
if (totalMolesInSystem <= 0.0) {
2267+
totalMolesInSystem = 1.0e-50;
22582268
}
22592269

2260-
newSystem.setTotalNumberOfMoles(getPhase(phaseNumber).getNumberOfMolesInPhase() / 1.0e30);
2270+
newSystem.setTotalNumberOfMoles(totalMolesInSystem);
2271+
((SystemThermo) newSystem).isInitialized = false;
22612272

22622273
newSystem.init(0);
22632274
// newSystem.init(1);

0 commit comments

Comments
 (0)