Calculate the energy flow into the furnace by calculating the gas flow from data obtained by an
orifice
diff --git a/src/app/calculator/steam/boiler-blowdown-rate/blowdown-rate-results/blowdown-rate-results.component.ts b/src/app/calculator/steam/boiler-blowdown-rate/blowdown-rate-results/blowdown-rate-results.component.ts
index 9f93556a54..6dd7221f29 100644
--- a/src/app/calculator/steam/boiler-blowdown-rate/blowdown-rate-results/blowdown-rate-results.component.ts
+++ b/src/app/calculator/steam/boiler-blowdown-rate/blowdown-rate-results/blowdown-rate-results.component.ts
@@ -12,6 +12,8 @@ import { UntypedFormGroup } from '@angular/forms';
export class BlowdownRateResultsComponent implements OnInit {
@Input()
settings: Settings;
+ @Input()
+ inTreasureHunt: boolean;
baselineSub: Subscription;
modificationSub: Subscription;
@@ -29,11 +31,19 @@ export class BlowdownRateResultsComponent implements OnInit {
ngOnInit() {
this.showBoilerSubscription = this.boilerBlowdownRateService.showBoiler.subscribe(val => {
- this.showBoiler = val;
+ if (!this.inTreasureHunt) {
+ this.showBoiler = val;
+ } else {
+ this.showBoiler = true;
+ }
this.calculateResults();
});
this.showOperationsSubscription = this.boilerBlowdownRateService.showOperations.subscribe(val => {
- this.showOperations = val;
+ if (!this.inTreasureHunt) {
+ this.showOperations = val;
+ } else {
+ this.showOperations = true;
+ }
this.calculateResults();
});
this.baselineSub = this.boilerBlowdownRateService.baselineInputs.subscribe(val => {
diff --git a/src/app/calculator/steam/boiler-blowdown-rate/boiler-blowdown-rate.component.html b/src/app/calculator/steam/boiler-blowdown-rate/boiler-blowdown-rate.component.html
index f7201380b6..527368bb9d 100644
--- a/src/app/calculator/steam/boiler-blowdown-rate/boiler-blowdown-rate.component.html
+++ b/src/app/calculator/steam/boiler-blowdown-rate/boiler-blowdown-rate.component.html
@@ -111,7 +111,7 @@
diff --git a/src/app/calculator/utilities/co2-savings/co2-savings.service.ts b/src/app/calculator/utilities/co2-savings/co2-savings.service.ts
index afbc4080e7..e5044d45a7 100644
--- a/src/app/calculator/utilities/co2-savings/co2-savings.service.ts
+++ b/src/app/calculator/utilities/co2-savings/co2-savings.service.ts
@@ -45,6 +45,11 @@ export class Co2SavingsService {
} else {
data.totalEmissionOutput = 0;
}
+
+ if (settings.unitsOfMeasure !== 'Metric') {
+ data.totalEmissionOutput = this.convertUnitsService.value(data.totalEmissionOutput).from('tonne').to('ton');
+ }
+
return data;
}
}
diff --git a/src/app/calculator/utilities/power-factor-correction/power-factor-correction-results/power-factor-correction-results.component.html b/src/app/calculator/utilities/power-factor-correction/power-factor-correction-results/power-factor-correction-results.component.html
index 7051d12016..8f8def4a99 100644
--- a/src/app/calculator/utilities/power-factor-correction/power-factor-correction-results/power-factor-correction-results.component.html
+++ b/src/app/calculator/utilities/power-factor-correction/power-factor-correction-results/power-factor-correction-results.component.html
@@ -40,7 +40,7 @@
- Month {{i + 1}}
+ {{inputs.monthyInputs[i].month}}
diff --git a/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle.component.html b/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle.component.html
index ff26fa9035..720f3f58f4 100644
--- a/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle.component.html
+++ b/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle.component.html
@@ -1,7 +1,7 @@
diff --git a/src/app/dashboard/assessment.service.ts b/src/app/dashboard/assessment.service.ts
index 194fa16df4..1cc0774370 100644
--- a/src/app/dashboard/assessment.service.ts
+++ b/src/app/dashboard/assessment.service.ts
@@ -195,7 +195,7 @@ export class AssessmentService {
},
fsatOperations: {
operatingHours: 8760,
- cost: 0.06,
+ cost: settings.electricityCost || .06,
},
fanMotor: {
lineFrequency: 60,
@@ -237,7 +237,7 @@ export class AssessmentService {
return newFsat;
}
- getNewSsmt(): SSMT {
+ getNewSsmt(settings: Settings): SSMT {
return {
name: '',
setupDone: false,
@@ -250,9 +250,9 @@ export class AssessmentService {
hoursPerYear: 8760
},
operatingCosts: {
- fuelCost: 5.78,
+ fuelCost: settings.fuelCost || 5.78,
makeUpWaterCost: 0.03,
- electricityCost: .05,
+ electricityCost: settings.electricityCost || .05,
implementationCosts: 0.0
},
generalSteamOperations: {
diff --git a/src/app/fsat/fan-field-data/fan-field-data.component.ts b/src/app/fsat/fan-field-data/fan-field-data.component.ts
index 3ac159485c..5c5d935bbc 100644
--- a/src/app/fsat/fan-field-data/fan-field-data.component.ts
+++ b/src/app/fsat/fan-field-data/fan-field-data.component.ts
@@ -151,6 +151,7 @@ export class FanFieldDataComponent implements OnInit {
let fsatOutput: FsatOutput;
let fsatCopy: FSAT = JSON.parse(JSON.stringify(this.fsat));
fsatCopy.fieldData = this.fanFieldDataService.getObjFromForm(this.fieldDataForm);
+ // set temporary 1 so we can get results to calculate factor? What if we set to default .988
if(isNaN(fsatCopy.fieldData.compressibilityFactor) || fsatCopy.fieldData.compressibilityFactor == 0 || fsatCopy.fieldData.compressibilityFactor == undefined){
fsatCopy.fieldData.compressibilityFactor = 1;
}
@@ -165,9 +166,7 @@ export class FanFieldDataComponent implements OnInit {
};
let compressibilityFactor: number = this.fanFieldDataService.calculateCompressibilityFactor(inputs, true, fsatOutput, this.settings);
- this.fieldDataForm.patchValue({
- compressibilityFactor: Number(compressibilityFactor.toFixed(3))
- });
+ this.fieldDataForm.controls.compressibilityFactor.patchValue(compressibilityFactor);
}
setInletVelocityPressure() {
diff --git a/src/app/fsat/fan-field-data/fan-field-data.service.ts b/src/app/fsat/fan-field-data/fan-field-data.service.ts
index 5dd4273c11..136aeff5be 100644
--- a/src/app/fsat/fan-field-data/fan-field-data.service.ts
+++ b/src/app/fsat/fan-field-data/fan-field-data.service.ts
@@ -96,6 +96,12 @@ export class FanFieldDataService {
currentMoverShaftPower = tempShaftPower;
}
}
+
+ if (isNaN(compressibilityFactor)) {
+ compressibilityFactor = null;
+ } else {
+ compressibilityFactor = Number(compressibilityFactor.toFixed(3))
+ }
return compressibilityFactor;
}
diff --git a/src/app/fsat/fsat.component.html b/src/app/fsat/fsat.component.html
index 895b6c3601..6988bf1192 100644
--- a/src/app/fsat/fsat.component.html
+++ b/src/app/fsat/fsat.component.html
@@ -88,8 +88,8 @@
diff --git a/src/app/fsat/fsat.component.ts b/src/app/fsat/fsat.component.ts
index c0ecc1fb03..b8ad3ec5b4 100644
--- a/src/app/fsat/fsat.component.ts
+++ b/src/app/fsat/fsat.component.ts
@@ -21,6 +21,7 @@ import { EGridService } from '../shared/helper-services/e-grid.service';
import * as _ from 'lodash';
import { OperationsService } from './operations/operations.service';
import { AnalyticsService } from '../shared/analytics/analytics.service';
+import { copyObject } from '../shared/helperFunctions';
@Component({
selector: 'app-fsat',
@@ -71,12 +72,10 @@ export class FsatComponent implements OnInit {
fsatOptions: Array
;
- fsatOptionsLength: number;
sankeyLabelStyle: string = 'both';
showSankeyLabelOptions: boolean;
- fsat1: { fsat: FSAT, name: string };
- fsat2: { fsat: FSAT, name: string };
+ selectedSankeyFsatOption: { fsat: FSAT, name: string };
//exploreOppsToast: boolean = false;
toastData: { title: string, body: string, setTimeoutVal: number } = { title: '', body: '', setTimeoutVal: undefined };
showToast: boolean = false;
@@ -203,17 +202,17 @@ export class FsatComponent implements OnInit {
}
initSankeyList() {
- this.fsatOptions = new Array();
- this.fsatOptions.push({ name: 'Baseline', fsat: this._fsat });
- this.fsat1 = this.fsatOptions[0];
- this.showSankeyLabelOptions = ((this.fsat1.name == 'Baseline' || this.fsat1.name == null) && this.fsat1.fsat.setupDone) || (this.fsat1.fsat.valid && this.fsat1.fsat.valid.isValid);
+ this.fsatOptions = [{ name: 'Baseline', fsat: this._fsat }];
+ this.selectedSankeyFsatOption = this.fsatOptions[0];
if (this._fsat.modifications) {
this._fsat.modifications.forEach(mod => {
this.fsatOptions.push({ name: mod.fsat.name, fsat: mod.fsat });
});
- this.fsat2 = this.fsatOptions[1];
}
- this.fsatOptionsLength = this.fsatOptions.length;
+ // * we need isFinishedBaseline because setupDone can be true but not valid? ??
+ const isFinishedBaseline = this.selectedSankeyFsatOption.name == 'Baseline' && this.selectedSankeyFsatOption.fsat.setupDone;
+ const isValidFsat = this.selectedSankeyFsatOption.fsat.valid && this.selectedSankeyFsatOption.fsat.valid.isValid;
+ this.showSankeyLabelOptions = isFinishedBaseline || isValidFsat;
}
setSankeyLabelStyle(style: string) {
@@ -314,6 +313,7 @@ export class FsatComponent implements OnInit {
this.compareService.setCompareVals(this._fsat, this.modificationIndex);
this._fsat.setupDone = this.checkSetupDone(this._fsat);
this.assessment.fsat = (JSON.parse(JSON.stringify(this._fsat)));
+ this.initSankeyList();
await firstValueFrom(this.assessmentDbService.updateWithObservable(this.assessment));
let assessments: Assessment[] = await firstValueFrom(this.assessmentDbService.getAllAssessments());
this.assessmentDbService.setAll(assessments);
diff --git a/src/app/log-tool/visualize/visualize-sidebar/bin-data/bin-data.component.html b/src/app/log-tool/visualize/visualize-sidebar/bin-data/bin-data.component.html
index f5c36845ec..5aa6d81e4d 100644
--- a/src/app/log-tool/visualize/visualize-sidebar/bin-data/bin-data.component.html
+++ b/src/app/log-tool/visualize/visualize-sidebar/bin-data/bin-data.component.html
@@ -20,7 +20,7 @@
Bin Start
diff --git a/src/app/phast/phast-calculator-tabs/phast-calculator-tabs.component.html b/src/app/phast/phast-calculator-tabs/phast-calculator-tabs.component.html
index 8f7ecb4f9a..5e865eac4c 100644
--- a/src/app/phast/phast-calculator-tabs/phast-calculator-tabs.component.html
+++ b/src/app/phast/phast-calculator-tabs/phast-calculator-tabs.component.html
@@ -5,10 +5,10 @@
O2 Enrichment
- Energy Equivalency
+ Fuel to Electricity Equivalency
- Flow and Energy Used
+ Orifice Meter Flow Calculator
Pre-assessment Screening
@@ -30,10 +30,10 @@
O2 Enrichment
Pre-assessment Screening
diff --git a/src/app/settings/tutorial-settings/tutorial-settings.component.html b/src/app/settings/tutorial-settings/tutorial-settings.component.html
index 1fb618a786..faabb526b0 100644
--- a/src/app/settings/tutorial-settings/tutorial-settings.component.html
+++ b/src/app/settings/tutorial-settings/tutorial-settings.component.html
@@ -7,7 +7,7 @@
Hide
Show
@@ -20,7 +20,7 @@
Hide
Show
@@ -33,7 +33,7 @@
Hide
Show
@@ -46,7 +46,7 @@
Hide
Show
@@ -59,7 +59,7 @@
Hide
Show
@@ -72,7 +72,7 @@
Hide
Show
@@ -85,7 +85,7 @@
Hide
Show
@@ -98,7 +98,7 @@
Hide
Show
@@ -111,7 +111,7 @@
Hide
Show
@@ -124,7 +124,7 @@
Hide
Show
@@ -137,7 +137,7 @@
Hide
-
Show
diff --git a/src/app/shared/create-assessment-modal/create-assessment-modal.component.ts b/src/app/shared/create-assessment-modal/create-assessment-modal.component.ts
index 1ccf072b6c..fd0e311d7a 100644
--- a/src/app/shared/create-assessment-modal/create-assessment-modal.component.ts
+++ b/src/app/shared/create-assessment-modal/create-assessment-modal.component.ts
@@ -163,7 +163,7 @@ export class CreateAssessmentModalComponent {
let tmpAssessment: Assessment = this.assessmentService.getNewAssessment('SSMT');
tmpAssessment.name = this.newAssessmentForm.controls.assessmentName.value;
tmpAssessment.directoryId = this.newAssessmentForm.controls.directoryId.value;
- tmpAssessment.ssmt = this.assessmentService.getNewSsmt();
+ tmpAssessment.ssmt = this.assessmentService.getNewSsmt(this.settings);
let createdAssessment: Assessment = await firstValueFrom(this.assessmentDbService.addWithObservable(tmpAssessment));
this.finishAndNavigate(createdAssessment, '/ssmt/' + createdAssessment.id);
}
diff --git a/src/app/shared/weather-station-lookup/weather-station-lookup.module.ts b/src/app/shared/weather-station-lookup/weather-station-lookup.module.ts
index b3a863f8d5..7e9770920b 100644
--- a/src/app/shared/weather-station-lookup/weather-station-lookup.module.ts
+++ b/src/app/shared/weather-station-lookup/weather-station-lookup.module.ts
@@ -3,24 +3,24 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { WeatherStationLookupComponent } from './weather-station-lookup.component';
import { WeatherStationLookupService } from './weather-station-lookup.service';
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
@NgModule({
- declarations: [
- WeatherStationLookupComponent
- ],
- imports: [
- CommonModule,
- FormsModule,
- HttpClientModule
- ],
- exports: [
- WeatherStationLookupComponent
- ],
- providers: [
- WeatherStationLookupService
- ]
+ declarations: [
+ WeatherStationLookupComponent
+ ],
+ exports: [
+ WeatherStationLookupComponent
+ ],
+ imports: [
+ CommonModule,
+ FormsModule
+ ],
+ providers: [
+ WeatherStationLookupService,
+ provideHttpClient(withInterceptorsFromDi())
+ ]
})
export class WeatherStationLookupModule { }
diff --git a/src/app/tools-suite-api/fans-suite-api.service.ts b/src/app/tools-suite-api/fans-suite-api.service.ts
index ae649068b7..7759c7a8c1 100644
--- a/src/app/tools-suite-api/fans-suite-api.service.ts
+++ b/src/app/tools-suite-api/fans-suite-api.service.ts
@@ -401,10 +401,13 @@ export class FansSuiteApiService {
}
compressibilityFactor(inputs: CompressibilityFactor): number {
- // null on new mod
inputs.inletPressure = this.suiteApiHelperService.convertNullInputValueForObjectConstructor(inputs.inletPressure);
inputs.outletPressure = this.suiteApiHelperService.convertNullInputValueForObjectConstructor(inputs.outletPressure);
inputs.flowRate = this.suiteApiHelperService.convertNullInputValueForObjectConstructor(inputs.flowRate);
+ inputs.moverShaftPower = this.suiteApiHelperService.convertNullInputValueForObjectConstructor(inputs.moverShaftPower);
+ inputs.specificHeatRatio = this.suiteApiHelperService.convertNullInputValueForObjectConstructor(inputs.specificHeatRatio);
+ inputs.barometricPressure = this.suiteApiHelperService.convertNullInputValueForObjectConstructor(inputs.barometricPressure);
+
let compressibilityFactor = new Module.CompressibilityFactor(inputs.moverShaftPower, inputs.inletPressure, inputs.outletPressure, inputs.barometricPressure, inputs.flowRate, inputs.specificHeatRatio);
let compressibilityFactorResult = compressibilityFactor.calculate();
compressibilityFactor.delete();
diff --git a/src/app/treasure-hunt/calculators/standalone-opportunity-sheet/opportunity-sheet.service.ts b/src/app/treasure-hunt/calculators/standalone-opportunity-sheet/opportunity-sheet.service.ts
index 2f0295c434..af82ab48e3 100644
--- a/src/app/treasure-hunt/calculators/standalone-opportunity-sheet/opportunity-sheet.service.ts
+++ b/src/app/treasure-hunt/calculators/standalone-opportunity-sheet/opportunity-sheet.service.ts
@@ -66,8 +66,13 @@ export class OpportunitySheetService {
let baselineWasterWaterResult: { energyUse: number, energyCost: number, numItems: number } = this.getEnergyUseData(opportunitySheet.baselineEnergyUseItems, settings.waterWasteCost, 'WWT', settings);
let modificationWasteWaterResult: { energyUse: number, energyCost: number, numItems: number } = this.getEnergyUseData(opportunitySheet.modificationEnergyUseItems, settings.waterWasteCost, 'WWT', settings);
let wasteWaterResults: OpportunitySheetResult = this.getOpportunitySheetResult(baselineWasterWaterResult, modificationWasteWaterResult);
+
+ let additionalAnnualSavingsCost: number = 0;
+ if (opportunitySheet.opportunityCost.additionalAnnualSavings){
+ additionalAnnualSavingsCost = opportunitySheet.opportunityCost.additionalAnnualSavings.cost;
+ }
- let totalCostSavings: number = electricityResults.energyCostSavings + gasResults.energyCostSavings + compressedAirResults.energyCostSavings + otherFuelResults.energyCostSavings + steamResults.energyCostSavings + waterResults.energyCostSavings + wasteWaterResults.energyCostSavings;
+ let totalCostSavings: number = electricityResults.energyCostSavings + gasResults.energyCostSavings + compressedAirResults.energyCostSavings + otherFuelResults.energyCostSavings + steamResults.energyCostSavings + waterResults.energyCostSavings + wasteWaterResults.energyCostSavings + additionalAnnualSavingsCost;
let totalImplementationCost: number = this.getOppSheetImplementationCost(opportunitySheet.opportunityCost);
return {
electricityResults: electricityResults,
diff --git a/src/app/treasure-hunt/treasure-hunt-banner/treasure-hunt-banner.component.ts b/src/app/treasure-hunt/treasure-hunt-banner/treasure-hunt-banner.component.ts
index 9c7f32b186..28e720676f 100644
--- a/src/app/treasure-hunt/treasure-hunt-banner/treasure-hunt-banner.component.ts
+++ b/src/app/treasure-hunt/treasure-hunt-banner/treasure-hunt-banner.component.ts
@@ -60,7 +60,7 @@ export class TreasureHuntBannerComponent implements OnInit {
changeTab(str: string) {
if (this.disableTabs == false) {
- if (str == 'system-basics') {
+ if (str == 'system-setup') {
this.treasureHuntService.mainTab.next(str);
} else if (this.assessment.treasureHunt.setupDone == true) {
this.treasureHuntService.mainTab.next(str);
diff --git a/src/app/treasure-hunt/treasure-hunt.service.ts b/src/app/treasure-hunt/treasure-hunt.service.ts
index 110d1d2069..92dc269285 100644
--- a/src/app/treasure-hunt/treasure-hunt.service.ts
+++ b/src/app/treasure-hunt/treasure-hunt.service.ts
@@ -15,7 +15,7 @@ export class TreasureHuntService {
currentField: BehaviorSubject;
showExportModal: BehaviorSubject;
constructor() {
- this.mainTab = new BehaviorSubject('system-basics');
+ this.mainTab = new BehaviorSubject('system-setup');
this.subTab = new BehaviorSubject('settings');
this.getResults = new BehaviorSubject(true);
this.updateMenuOptions = new BehaviorSubject(true);
diff --git a/src/app/waste-water/results-panel/results-table/results-table.component.html b/src/app/waste-water/results-panel/results-table/results-table.component.html
index e4fa086839..2fd1c9f099 100644
--- a/src/app/waste-water/results-panel/results-table/results-table.component.html
+++ b/src/app/waste-water/results-panel/results-table/results-table.component.html
@@ -379,10 +379,6 @@
(tonne CO2 )
-
- —
-
{{modificationResults.co2EmissionsSavings | number: '1.0-0'}}
diff --git a/src/assets/images/calculator-icons/utilities-icons/power-factor-correction-icon.png b/src/assets/images/calculator-icons/utilities-icons/power-factor-correction-icon.png
index 1fc863665f..7dc1052858 100644
Binary files a/src/assets/images/calculator-icons/utilities-icons/power-factor-correction-icon.png and b/src/assets/images/calculator-icons/utilities-icons/power-factor-correction-icon.png differ
diff --git a/src/assets/images/calculator-icons/utilities-icons/power-factor-triangle-icon.png b/src/assets/images/calculator-icons/utilities-icons/power-factor-triangle-icon.png
new file mode 100644
index 0000000000..1fc863665f
Binary files /dev/null and b/src/assets/images/calculator-icons/utilities-icons/power-factor-triangle-icon.png differ
diff --git a/tsconfig.json b/tsconfig.json
index 1a0c856a6b..a1170de14a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,8 @@
{
"compileOnSave": false,
+ "exclude": [
+ "./node_modules/billboard.js/src/ChartInternal/data/IData.ts"
+ ],
"compilerOptions": {
"outDir": "./dist/out-tsc",
"sourceMap": true,
@@ -16,6 +19,6 @@
"lib": [
"es2019",
"dom"
- ]
+ ],
}
}
+ 