Merge branch 'develop' into hybrids

NREL · Aug 13, 2023 · 965ac7d · 965ac7d
2 parents 3cc97b1 + af866d6
commit 965ac7d
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 141 deletions.
diff --git a/tcs/CMakeLists.txt b/tcs/CMakeLists.txt
@@ -100,7 +100,6 @@ set(TCS_SRC
 		atmospheric_aod.h
 		base_dispatch.h
 		cavity_calcs.h
-		co2props_nn1.h
 		co2_compressor_library.h
 		CO2_properties.h
 		co2_testing.h

diff --git a/tcs/co2props_nn1.cpp b/tcs/co2props_nn1.cpp
diff --git a/tcs/co2props_nn1.h b/tcs/co2props_nn1.h