Change 'S_DAC_GT' to 'S-DAC-GT' in case report file and client parsing. Note that 'S_DAC_GT' remains in HTML output for now, since it may be in existing use, whereas the fields were missing entirely from the client until this patch version

Author: softwareengineerprogrammer

src/geophires_x/OutputsS_DAC_GT.py

@@ -27,7 +27,7 @@ def PrintOutputs(self, model) -> tuple:
                 sdac_results: list[OutputTableItem] = []
                 f.write(NL)
                 f.write(NL)
-                f.write("                            ***S_DAC_GT ECONOMICS***\n")
+                f.write("                            ***S-DAC-GT ECONOMICS***\n")
                 f.write(NL)
                 f.write(NL)
 
@@ -83,9 +83,9 @@ def PrintOutputs(self, model) -> tuple:
 
                 f.write(NL)
                 f.write("                **********************" + NL)
-                f.write("                *  S_DAC_GT PROFILE  *" + NL)
+                f.write("                *  S-DAC-GT PROFILE  *" + NL)
                 f.write("                **********************" + NL)
-                f.write("Year       Carbon      Cumm. Carbon     S_DAC_GT           S_DAC_GT Cumm.      Cumm. Cost" + NL)
+                f.write("Year       Carbon      Cumm. Carbon     S-DAC-GT           S-DAC-GT Cumm.      Cumm. Cost" + NL)
                 f.write("Since      Captured     Captured       Annual Cost          Cash Flow        Cost Per Tonne" + NL)
                 f.write("Start     ("+model.sdacgteconomics.CarbonExtractedAnnually.PreferredUnits.value +
                                               ")   ("+model.sdacgteconomics.S_DAC_GTCummCarbonExtracted.PreferredUnits.value +

src/geophires_x_client/geophires_x_result.py

@@ -98,7 +98,8 @@ class GeophiresXResult:
                 'Project MOIC           (including carbon credit)',
                 'Project Payback Period (including carbon credit)',
             ],
-            'S_DAC_GT ECONOMICS': [
+            'S-DAC-GT ECONOMICS': [
+                # TODO S-DAC-GT Report sub-titles as string value fields
                 'LCOD Using grid-based electricity only',
                 'LCOD Using natural gas only',
                 'LCOD Using geothermal energy only',
@@ -373,7 +374,7 @@ def __init__(self, output_file_path, logger_name=None):
 
         sdacgt_profile = self._get_sdacgt_profile()
         if sdacgt_profile is not None:
-            self.result['S_DAC_GT PROFILE'] = sdacgt_profile
+            self.result['S-DAC-GT PROFILE'] = sdacgt_profile
 
         self.result['metadata'] = {'output_file_path': self.output_file_path}
         for metadata_field in GeophiresXResult._METADATA_FIELDS:
@@ -606,13 +607,13 @@ def extract_table_header(lines: list) -> list:
                 'Year Since Start',
                 'Carbon Captured (tonne/yr)',
                 'Cumm. Carbon Captured (tonne)',
-                'S_DAC_GT Annual Cost (USD/yr)',
-                'S_DAC_GT Cumm. Cash Flow (USD)',
+                'S-DAC-GT Annual Cost (USD/yr)',
+                'S-DAC-GT Cumm. Cash Flow (USD)',
                 'Cumm. Cost Per Tonne (USD/tonne)',
             ]
 
         try:
-            lines = self._get_profile_lines('S_DAC_GT PROFILE')
+            lines = self._get_profile_lines('S-DAC-GT PROFILE')
             profile = [extract_table_header(lines)]
             profile.extend(self._extract_addons_style_table_data(lines))
             return profile

tests/examples/S-DAC-GT.out

@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.7.13
+ GEOPHIRES Version: 3.7.14
  Simulation Date: 2025-02-27
- Simulation Time:  09:29
- Calculation Time:      0.099 sec
+ Simulation Time:  09:55
+ Calculation Time:      0.106 sec
 
                            ***SUMMARY OF RESULTS***
 
@@ -246,7 +246,7 @@ ________________________________________________________________________________
 
 
 
-                            ***S_DAC_GT ECONOMICS***
+                            ***S-DAC-GT ECONOMICS***
 
 
       S-DAC-GT Report: Levelized Cost of Direct Air Capture (LCOD)
@@ -268,9 +268,9 @@ ________________________________________________________________________________
 
 
                 **********************
-                *  S_DAC_GT PROFILE  *
+                *  S-DAC-GT PROFILE  *
                 **********************
-Year       Carbon      Cumm. Carbon     S_DAC_GT           S_DAC_GT Cumm.      Cumm. Cost
+Year       Carbon      Cumm. Carbon     S-DAC-GT           S-DAC-GT Cumm.      Cumm. Cost
 Since      Captured     Captured       Annual Cost          Cash Flow        Cost Per Tonne
 Start     (tonne/yr)   (tonne)          (USD/yr)               (USD)           (USD/tonne)
      1    78,330.80   78,330.80    17,411,627.98         17,411,627.98         222.28

tests/test_geophires_x_client.py

@@ -531,20 +531,20 @@ def test_parse_annualized_capital_costs(self):
 
     def test_parse_number_with_commas(self):
         result = GeophiresXResult(self._get_test_file_path('examples/S-DAC-GT.out'))
-        self.assertEqual(result.result['S_DAC_GT ECONOMICS']['Total Cost of Capture']['value'], 499_311_405.59)
+        self.assertEqual(result.result['S-DAC-GT ECONOMICS']['Total Cost of Capture']['value'], 499_311_405.59)
 
     def test_parse_sdacgt_profile(self):
         result = GeophiresXResult(self._get_test_file_path('examples/S-DAC-GT.out'))
-        sdacgt_profile = result.result['S_DAC_GT PROFILE']
+        sdacgt_profile = result.result['S-DAC-GT PROFILE']
         self.assertIsNotNone(sdacgt_profile)
         self.assertEqual(
             sdacgt_profile[0],
             [
                 'Year Since Start',
                 'Carbon Captured (tonne/yr)',
                 'Cumm. Carbon Captured (tonne)',
-                'S_DAC_GT Annual Cost (USD/yr)',
-                'S_DAC_GT Cumm. Cash Flow (USD)',
+                'S-DAC-GT Annual Cost (USD/yr)',
+                'S-DAC-GT Cumm. Cash Flow (USD)',
                 'Cumm. Cost Per Tonne (USD/tonne)',
             ],
         )