Merge pull request #16 from idaholab/testing_ccast_in_grid_newICM

New ICM, new load inputs start execution, testing bed for Caldera Cast
idaholab · Oct 12, 2023 · 6ea2896 · 6ea2896
2 parents a5c4b46 + cf5ad5a
commit 6ea2896
Show file tree

Hide file tree

Showing 188 changed files with 233,734 additions and 209 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,7 @@ outputs/*.csv
 CMakeSettings.json
 .vs/
 .vscode/
+
+# MacOS
+.DS_Store
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,17 +4,6 @@ project(Grid)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-# Check to see PROJECT cmake variable is set
-if (NOT DEFINED PROJECT)
-	message(WARNING "PROJECT cmake variable not set defaulting to emosiac project")
-endif()
-
-SET(PROJECT "eMosaic" CACHE STRING "Project to compile for")
-
-if (NOT (${PROJECT} STREQUAL "eMosaic" OR ${PROJECT} STREQUAL "EVs_at_Risk" OR ${PROJECT} STREQUAL "DirectXFC"))
-	message(FATAL_ERROR "PROJECT cmake variable must be equal to eMosaic or EVs_at_Risk or DirectXFC")
-endif()
-
 # Find pybind11
 find_package(pybind11 CONFIG)
 
@@ -51,3 +40,5 @@ SET(INSTALL_DIR ${PROJECT_SOURCE_DIR}/libs)
 # Add subdirs to compile the necessary binaries
 add_subdirectory(source/ES500)
 add_subdirectory(extern/Caldera_ICM)
+add_subdirectory(unittests)
+add_subdirectory(examples)
diff --git a/README.md b/README.md
@@ -115,7 +115,7 @@ cd Caldera_Grid
 git switch develop
 mkdir build
 cd build
-cmake -DPROJECT=eMosaic -DICM=ON ../
+cmake -DPROJECT=eMosaic -DICM=ON -DCMAKE_CXX_STANDARD=11 ../
 make -j 4
 make install
 ```

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -0,0 +1,5 @@
+enable_testing()
+
+add_subdirectory(ex_first)
+add_subdirectory(ex_ccast_test)
+add_subdirectory(ex_agent_itinwpts_test)
diff --git a/examples/ex_agent_itinwpts_test/.gitignore b/examples/ex_agent_itinwpts_test/.gitignore
@@ -0,0 +1,2 @@
+outputs/
+simulation_args.json
diff --git a/examples/ex_agent_itinwpts_test/CMakeLists.txt b/examples/ex_agent_itinwpts_test/CMakeLists.txt
@@ -0,0 +1,2 @@
+find_package(Python COMPONENTS Interpreter REQUIRED)
+add_test(NAME "ex_ccast_test" COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/start_exe_with_args.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
diff --git a/examples/ex_agent_itinwpts_test/inputs/.gitignore b/examples/ex_agent_itinwpts_test/inputs/.gitignore
@@ -0,0 +1,5 @@
+CE_ICM.csv
+SE_ICM.csv
+CE_ICM_errors.csv
+SE_ICM_errors.csv
+error_messages.txt
diff --git a/examples/ex_agent_itinwpts_test/inputs/EVSE_inputs.csv b/examples/ex_agent_itinwpts_test/inputs/EVSE_inputs.csv
@@ -0,0 +1,10 @@
+EVSE_type,EVSE_level,EVSE_phase_connection,AC/DC_power_limit_kW,AC/DC_voltage_limits_V,AC/DC_current_limit_A,standby_real_power_kW,standby_reactive_power_kVAR
+L1_1440,L1,1,1.289338,-1,-1,0,0
+L2_3600,L2,1,3.30192,-1,-1,0,0
+L2_7200,L2,1,6.624,-1,-1,0,0
+L2_9600,L2,1,8.832,-1,-1,0,0
+L2_11520,L2,1,10.5984,-1,-1,0,0
+L2_17280,L2,1,15.8976,-1,-1,0,0
+dcfc_50,DCFC,3,50,500,125,0.1,-0.59
+xfc_150,DCFC,3,150,882.3529412,170,0.17,-0.445
+xfc_350,DCFC,3,350,700,500,0.17,-0.445
diff --git a/examples/ex_agent_itinwpts_test/inputs/EV_inputs.csv b/examples/ex_agent_itinwpts_test/inputs/EV_inputs.csv
@@ -0,0 +1,15 @@
+EV_type,battery_chemistry,usable_battery_size_kWh,range_miles,efficiency_Wh/Mile,AC_charge_rate_kW,DCFC_capable,max_c_rate,pack_voltage_at_peak_power_V
+bev250_400kW,LTO,87.5,250,350,10.58,TRUE,3.85,900
+bev300_575kW,LTO,142.5,300,475,10.58,TRUE,3.41,900
+bev300_400kW,LTO,97.5,300,325,10.58,TRUE,3.46,900
+bev250_350kW,NMC,118.75,250,475,10.58,TRUE,2.29,900
+bev300_300kW,NMC,97.5,300,325,10.58,TRUE,2.38,900
+bev150_150kW,NMC,45,150,300,8.832,TRUE,2.56,900
+bev250_ld2_300kW,NMC,87.5,250,350,10.58,TRUE,2.64,900
+bev200_ld4_150kW,NMC,95,200,475,8.832,TRUE,1.22,900
+bev275_ld1_150kW,NMC,82.5,275,300,8.832,TRUE,1.41,900
+bev250_ld1_75kW,NMC,75,250,300,6.072,TRUE,0.76,460
+bev150_ld1_50kW,NMC,45,150,300,6.072,TRUE,0.85,460
+phev_SUV,NMC,23.75,50,475,8.832,FALSE,-1,-1
+phev50,NMC,15.5,50,310,3.016365,FALSE,-1,-1
+phev20,NMC,5,20,250,3.016365,FALSE,-1,-1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		find_package(Python COMPONENTS Interpreter REQUIRED)
		add_test(NAME "ex_ccast_test" COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/start_exe_with_args.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )