Skip to content

Commit

Permalink
Fix Boiler heat calculations (#6189)
Browse files Browse the repository at this point in the history
  • Loading branch information
aidancbrady committed May 27, 2020
1 parent 7c65bc9 commit acd9fc0
Showing 1 changed file with 5 additions and 5 deletions.
Expand Up @@ -34,7 +34,7 @@ public class SynchronizedBoilerData extends SynchronizedData<SynchronizedBoilerD
public static Object2BooleanMap<UUID> hotMap = new Object2BooleanOpenHashMap<>();

public static final double CASING_HEAT_CAPACITY = 5;
public static final double CASING_INVERSE_INSULATION_COEFFICIENT = 10;
public static final double CASING_INVERSE_INSULATION_COEFFICIENT = 100_000;
public static final double CASING_INVERSE_CONDUCTION_COEFFICIENT = 1;
public static final double BASE_BOIL_TEMP = TemperatureUnit.CELSIUS.zeroOffset + 100;

Expand Down Expand Up @@ -70,8 +70,8 @@ public SynchronizedBoilerData(TileEntityBoilerCasing tile) {
gasTanks = Collections.singletonList(steamTank);
heatCapacitor = MultiblockHeatCapacitor.create(tile,
CASING_HEAT_CAPACITY,
() -> CASING_INVERSE_INSULATION_COEFFICIENT * locations.size(),
() -> CASING_INVERSE_INSULATION_COEFFICIENT * locations.size());
() -> CASING_INVERSE_CONDUCTION_COEFFICIENT,
() -> CASING_INVERSE_INSULATION_COEFFICIENT);
heatCapacitors = Collections.singletonList(heatCapacitor);
}

Expand Down Expand Up @@ -121,7 +121,7 @@ public double getHeatAvailable() {

@Override
public HeatTransfer simulate() {
double invConduction = HeatAPI.AIR_INVERSE_COEFFICIENT + (CASING_INVERSE_INSULATION_COEFFICIENT + CASING_INVERSE_CONDUCTION_COEFFICIENT) * locations.size();
double invConduction = HeatAPI.AIR_INVERSE_COEFFICIENT + (CASING_INVERSE_INSULATION_COEFFICIENT + CASING_INVERSE_CONDUCTION_COEFFICIENT);
double heatToTransfer = (heatCapacitor.getTemperature() - HeatAPI.AMBIENT_TEMP) / invConduction;

heatCapacitor.handleHeat(-heatToTransfer * heatCapacitor.getHeatCapacity());
Expand Down Expand Up @@ -171,4 +171,4 @@ public List<IGasTank> getGasTanks(@Nullable Direction side) {
public List<IHeatCapacitor> getHeatCapacitors(Direction side) {
return heatCapacitors;
}
}
}

0 comments on commit acd9fc0

Please sign in to comment.