Skip to content

fix: depletion and max power calculations #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MCTian-mi merged 3 commits into from
Aug 30, 2025
Merged

fix: depletion and max power calculations #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed4777d
fix: depletion and max power calculations
bruberu Aug 29, 2025
9708e9c
fix: update decay product amount calculation to new system
bruberu Aug 29, 2025
dd22348
fix: structural mass should be initialized in the constructor too, I …
bruberu Aug 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/main/java/supercritical/api/nuclear/fission/FissionReactor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,15 @@ public FissionReactor(int size, int depth, double controlRodInsertion) {
effectiveCoolantChannels = new ArrayList<>();
// 2pi * r^2 + 2pi * r * l
surfaceArea = (reactorRadius * reactorRadius) * Math.PI * 2 + reactorDepth * reactorRadius * Math.PI * 2;
structuralMass = reactorDepth * reactorRadius * reactorRadius * Math.PI *
300; // Assuming 300 kg/m^3 when it's basically empty, does not have to be precise

// Apparently we do need to initialize it here as well.
structuralMass = reactorDepth * reactorRadius * reactorRadius * Math.PI * 300;
}

public void prepareThermalProperties() {
structuralMass = reactorDepth * reactorRadius * reactorRadius * Math.PI *
300; // Assuming 300 kg/m^3 when it's basically empty, does not have to be precise

int idRod = 0, idControl = 0, idChannel = 0;

for (int i = 0; i < reactorLayout.length; i++) {
Expand Down Expand Up @@ -676,6 +680,7 @@ public void updatePressure() {
}

public void updateNeutronPoisoning() {
this.decayProductsAmount *= decayProductRate;
this.neutronPoisonAmount += this.decayProductsAmount * (1 - decayProductRate) * poisonFraction;
this.neutronPoisonAmount *= decayProductRate * Math.exp(-crossSectionRatio * power / surfaceArea);
}
Expand All @@ -699,14 +704,14 @@ public void updatePower() {
this.neutronFlux *= Math.exp(inverseReactorPeriod);

this.fuelDepletion += this.neutronFlux * reactorDepth;
this.decayProductsAmount += Math.max(neutronFlux, 0.) / 1000;
// Should be about 0.001x of the value of the variable "power".
this.decayProductsAmount += Math.max(neutronFlux, 0.) / 250000;

this.power = this.neutronFlux * this.neutronToPowerConversion;
} else {
this.neutronFlux *= 0.5;
this.power *= 0.5;
}
this.decayProductsAmount *= decayProductRate;
}

public boolean checkForMeltdown() {
Expand Down
2 changes: 1 addition & 1 deletion ...critical/common/metatileentities/multi/multiblockpart/MetaTileEntityFuelRodImportBus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ public void setInternalFuelRod(FuelRod rod) {

@Override
public boolean isDepleted(double totalDepletion) {
return this.depletionPoint <= totalDepletion;
return this.depletionPoint <= totalDepletion * this.internalFuelRod.getWeight();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/supercritical/lang/en_us.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ supercritical.gui.fission.pressure=Pressure: %.3f Pa
supercritical.gui.fission.power=Power: %.3f MW / %.3f MW
supercritical.gui.fission.k_eff=Neutron multiplication factor: %f
supercritical.gui.fission.depletion=Current depletion: %f%%
supercritical.gui.fission.depleted_rod=Depleted rod: %s
supercritical.gui.fission.depleted_rod=Making %s

supercritical.gui.fission.lock.locked=Reactor locked and active!
supercritical.gui.fission.lock.unlocked=Reactor not active
Expand Down
Loading