Skip to content

Commit d2b91d2

Browse files
Lowercase 'using' S-DAC fields
1 parent 87897d3 commit d2b91d2

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

src/geophires_x/OutputsS_DAC_GT.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,21 @@ def PrintOutputs(self, model) -> tuple:
3636
f.write(f" S-DAC-GT Report: Levelized Cost of Direct Air Capture (LCOD)\n")
3737
sdac_results.append(OutputTableItem('S-DAC-GT Report: Levelized Cost of Direct Air Capture (LCOD)'))
3838
lcod_prefix = 'LCOD'
39-
f.write(f" {lcod_prefix} Using grid-based electricity only: {model.sdacgteconomics.LCOD_elec.value:10.2f} {msdac.LCOD_elec.PreferredUnits.value}\n")
39+
f.write(f" {lcod_prefix} using grid-based electricity only: {model.sdacgteconomics.LCOD_elec.value:10.2f} {msdac.LCOD_elec.PreferredUnits.value}\n")
4040
sdac_results.append(OutputTableItem(f'Using grid-based electricity only', '{0:10.2f}'.format(msdac.LCOD_elec.value), msdac.LCOD_elec.PreferredUnits.value))
41-
f.write(f" {lcod_prefix} Using natural gas only: {model.sdacgteconomics.LCOD_ng.value:10.2f} {msdac.LCOD_ng.PreferredUnits.value}\n")
41+
f.write(f" {lcod_prefix} using natural gas only: {model.sdacgteconomics.LCOD_ng.value:10.2f} {msdac.LCOD_ng.PreferredUnits.value}\n")
4242
sdac_results.append(OutputTableItem('Using natural gas only', '{0:10.2f}'.format(model.sdacgteconomics.LCOD_ng.value), msdac.LCOD_ng.PreferredUnits.value))
43-
f.write(f" {lcod_prefix} Using geothermal energy only: {model.sdacgteconomics.LCOD_geo.value:10.2f} {msdac.LCOD_geo.PreferredUnits.value}\n\n")
43+
f.write(f" {lcod_prefix} using geothermal energy only: {model.sdacgteconomics.LCOD_geo.value:10.2f} {msdac.LCOD_geo.PreferredUnits.value}\n\n")
4444
sdac_results.append(OutputTableItem(f'Using geothermal energy only', '{0:10.2f}'.format(msdac.LCOD_geo.value), msdac.LCOD_geo.PreferredUnits.value))
4545

4646
f.write(f" S-DAC-GT Report: CO2 Intensity of process (percent of CO2 mitigated that is emitted by S-DAC process)\n")
4747
sdac_results.append(OutputTableItem('S-DAC-GT Report: CO2 Intensity of process (percent of CO2 mitigated that is emitted by S-DAC process)'))
4848
co2i_prefix = 'CO2 Intensity'
49-
f.write(f" {co2i_prefix} Using grid-based electricity only: {msdac.CO2total_elec.value*100.0:10.2f} %\n") # TODO CurrentUnits
49+
f.write(f" {co2i_prefix} using grid-based electricity only: {msdac.CO2total_elec.value*100.0:10.2f} %\n") # TODO CurrentUnits
5050
sdac_results.append(OutputTableItem('Using grid-based electricity only', '{0:10.2f}'.format(msdac.CO2total_elec.value*100.0), '%'))
51-
f.write(f" {co2i_prefix} Using natural gas only: {msdac.CO2total_ng.value*100:10.2f} %\n") # TODO CurrentUnits
51+
f.write(f" {co2i_prefix} using natural gas only: {msdac.CO2total_ng.value*100:10.2f} %\n") # TODO CurrentUnits
5252
sdac_results.append(OutputTableItem('Using natural gas only', '{0:10.2f}'.format(msdac.CO2total_ng.value*100.0), '%'))
53-
f.write(f" {co2i_prefix} Using geothermal energy only: {msdac.CO2total_geo.value*100:10.2f} %\n\n") # TODO CurrentUnits
53+
f.write(f" {co2i_prefix} using geothermal energy only: {msdac.CO2total_geo.value*100:10.2f} %\n\n") # TODO CurrentUnits
5454
sdac_results.append(OutputTableItem('Using geothermal energy only', '{0:10.2f}'.format(msdac.CO2total_geo.value*100.0), '%'))
5555
f.write(f" Geothermal LCOH: {msdac.LCOH.value:10.4f} {msdac.LCOH.PreferredUnits.value}\n")
5656
sdac_results.append(OutputTableItem('Geothermal LCOH', '{0:10.4f}'.format(msdac.LCOH.value), msdac.LCOH.PreferredUnits.value))

src/geophires_x_client/geophires_x_result.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ class GeophiresXResult:
100100
],
101101
'S-DAC-GT ECONOMICS': [
102102
# TODO S-DAC-GT Report sub-titles as string value fields
103-
'LCOD Using grid-based electricity only',
104-
'LCOD Using natural gas only',
105-
'LCOD Using geothermal energy only',
106-
'CO2 Intensity Using grid-based electricity only',
107-
'CO2 Intensity Using natural gas only',
108-
'CO2 Intensity Using geothermal energy only',
103+
'LCOD using grid-based electricity only',
104+
'LCOD using natural gas only',
105+
'LCOD using geothermal energy only',
106+
'CO2 Intensity using grid-based electricity only',
107+
'CO2 Intensity using natural gas only',
108+
'CO2 Intensity using geothermal energy only',
109109
'Geothermal LCOH',
110110
'Geothermal Ratio (electricity vs heat)',
111111
'Percent Energy Devoted To Process',

tests/examples/S-DAC-GT.out

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.14
7+
GEOPHIRES Version: 3.7.15
88
Simulation Date: 2025-02-27
9-
Simulation Time: 09:55
10-
Calculation Time: 0.106 sec
9+
Simulation Time: 10:36
10+
Calculation Time: 0.100 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -250,14 +250,14 @@ ________________________________________________________________________________
250250

251251

252252
S-DAC-GT Report: Levelized Cost of Direct Air Capture (LCOD)
253-
LCOD Using grid-based electricity only: 387.69 USD/tonne
254-
LCOD Using natural gas only: 312.00 USD/tonne
255-
LCOD Using geothermal energy only: 288.87 USD/tonne
253+
LCOD using grid-based electricity only: 387.69 USD/tonne
254+
LCOD using natural gas only: 312.00 USD/tonne
255+
LCOD using geothermal energy only: 288.87 USD/tonne
256256

257257
S-DAC-GT Report: CO2 Intensity of process (percent of CO2 mitigated that is emitted by S-DAC process)
258-
CO2 Intensity Using grid-based electricity only: 94.52 %
259-
CO2 Intensity Using natural gas only: 64.85 %
260-
CO2 Intensity Using geothermal energy only: 36.91 %
258+
CO2 Intensity using grid-based electricity only: 94.52 %
259+
CO2 Intensity using natural gas only: 64.85 %
260+
CO2 Intensity using geothermal energy only: 36.91 %
261261

262262
Geothermal LCOH: 0.0017 USD/kWh
263263
Geothermal Ratio (electricity vs heat): 20.7259 %

0 commit comments

Comments
 (0)