From 1ef081a236593b5fe65d12a8b435c9bf50a6c6cb Mon Sep 17 00:00:00 2001
From: bill-becker <William.Becker@nrel.gov>
Date: Fri, 26 Sep 2025 08:40:18 -0600
Subject: [PATCH 1/2] Add CST and HighTempThermalStorage to all/superset inputs
 test

---
 reoptjl/test/posts/all_inputs_test.json | 30 ++++++++++++++++++++++++-
 reoptjl/test/test_job_endpoint.py       |  2 +-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/reoptjl/test/posts/all_inputs_test.json b/reoptjl/test/posts/all_inputs_test.json
index 7bfb1c979..21114f68c 100644
--- a/reoptjl/test/posts/all_inputs_test.json
+++ b/reoptjl/test/posts/all_inputs_test.json
@@ -49,7 +49,7 @@
     "Site": {
         "latitude": 38.96345294964369,
         "longitude": -77.38406208630109,
-        "land_acres": null,
+        "land_acres": 1.0e5,
         "roof_squarefeet": null,
         "CO2_emissions_reduction_min_fraction": null,
         "CO2_emissions_reduction_max_fraction": null,
@@ -401,5 +401,33 @@
         "avoided_capex_by_ashp_present_value": 0,
         "back_up_temp_threshold_degF": -10.0,
         "force_dispatch": false
+    },
+    "CST": {
+        "min_kw": 20.0,
+        "max_kw": 20.0,
+        "installed_cost_per_kw": 2200.0,
+        "om_cost_per_kw": 33.0,
+        "om_cost_per_kwh": 0.0,
+        "acres_per_kw": 0.000939,
+        "macrs_option_years": 0,
+        "macrs_bonus_fraction": 0.0,
+        "can_supply_steam_turbine": true,
+        "can_serve_process_heat": true,
+        "can_serve_dhw": true, 
+        "can_serve_space_heating": true,
+        "can_waste_heat": true,
+        "charge_storage_only": false        
+    },
+    "HighTempThermalStorage": {
+        "min_kwh": 50.0,
+        "max_kwh": 50.0,
+        "installed_cost_per_kwh": 86.0,
+        "macrs_option_years": 5,
+        "macrs_bonus_fraction": 1.0,
+        "can_serve_space_heating": false,
+        "can_serve_dhw": false,
+        "can_serve_process_heat": true,
+        "num_charge_hours": 4.0,
+        "num_discharge_hours": 10.0         
     }
 }
\ No newline at end of file
diff --git a/reoptjl/test/test_job_endpoint.py b/reoptjl/test/test_job_endpoint.py
index 97502460d..0ca511d72 100644
--- a/reoptjl/test/test_job_endpoint.py
+++ b/reoptjl/test/test_job_endpoint.py
@@ -235,7 +235,7 @@ def test_superset_input_fields(self):
         resp = self.api_client.get(f'/v3/job/{run_uuid}/results')
         r = json.loads(resp.content)
         results = r["outputs"]
-        self.assertAlmostEqual(results["Financial"]["npv"], -326156.69, delta=0.01*results["Financial"]["lcc"])
+        self.assertAlmostEqual(results["Financial"]["npv"], -378466.47, delta=0.01*results["Financial"]["lcc"])
         assert(resp.status_code==200)   
         self.assertIn("ElectricHeater", list(results.keys()))
         self.assertIn("ASHPSpaceHeater", list(results.keys()))

From 8aace084f90e3821bada5612e36c73f12baf30c2 Mon Sep 17 00:00:00 2001
From: Alex Zolan <alexander.zolan@nrel.gov>
Date: Fri, 17 Oct 2025 12:30:36 -0600
Subject: [PATCH 2/2] Update CHANGELOG with CST and HighTempThermalStorage

Added new inputs for CST and HighTempThermalStorage to tests.
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b076f84d0..31819f4b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,10 @@ Classify the change according to the following categories:
     ##### Removed
     ### Patches
 
+## Develop
+### Added 
+- Added `CST` and `HighTempThermalStorage` to all/superset inputs test.
+
 ## v3.14.0
 ### Minor Updates
 #### Added