Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New ICM, new load inputs start execution, testing bed for Caldera Cast #16

Merged
merged 34 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
7f10f13
Update ICM ref
manoj1511 May 25, 2023
8fbb73a
Updated Caldera Grid source code to work with upgraded ICM
manoj1511 May 25, 2023
a896582
Sample input files for the new Caldera Grid to work
manoj1511 May 25, 2023
0faaeb0
update Caldera_ICM
manoj1511 Jun 8, 2023
889ab68
Move helics_config to inputs folder. All inputs read into Caldera Gri…
manoj1511 Jun 8, 2023
9d451c7
Remove PROJECT variable in cmake
manoj1511 Jun 8, 2023
a7bc0ba
Adding the inputs for charging models as a reference
manoj1511 Jun 8, 2023
bb5a8be
Three unittests for three projects of charging models
manoj1511 Jun 8, 2023
4e7bdb1
commented an error check that prevents TOU period to be in a day
manoj1511 Mar 28, 2023
bd4fd80
Fixing a bug in Caldera_Grid Load_inputs_federate.py about the start_…
steven-schmidt-inl Apr 11, 2023
4a2c821
Adding and updating the input argments in 'start_execution.py'
steven-schmidt-inl Apr 14, 2023
db7da23
Adding an examples folder and an example that runs a particular simul…
steven-schmidt-inl Apr 17, 2023
e780a1b
Adding a python script to start the root example sim with arguments.
steven-schmidt-inl Apr 20, 2023
99377b9
Switched the examples/ex_first inputs to use eMosaic values (instead …
steven-schmidt-inl Apr 20, 2023
e12f2a2
Updating README to add the C++11 flag when initializing cmake build d…
steven-schmidt-inl Apr 21, 2023
728857d
Adding 'unittests' shell for future unit tests in Caldera_Grid.
steven-schmidt-inl Apr 21, 2023
c663e17
A small code-formatting fix.
steven-schmidt-inl Jun 2, 2023
ad87685
Adding the framework for an example test to run the ccast input files
steven-schmidt-inl Jun 2, 2023
fe33371
Adding example to plot data generated by the 'agent_itinleg' test.
steven-schmidt-inl Jun 7, 2023
e7c138a
Ignoring the error_messages.txt file in examples/ex_ccast_test
steven-schmidt-inl Jul 11, 2023
14ebf39
Adjusting 'examples/ex_ccast_test/plot_results.py' to save plot to a …
steven-schmidt-inl Jul 11, 2023
9cd5763
Updating the ICM submodule to the most recent "ICM_upgade" branch.
steven-schmidt-inl Jul 11, 2023
b9b91d4
Fixing error after rebase.
steven-schmidt-inl Jul 11, 2023
da993fa
Including the new ICM input files, and trying to fix some bugs.
steven-schmidt-inl Jul 11, 2023
6d14654
Adding item to .gitignore for macOS
steven-schmidt-inl Jul 12, 2023
b13c83f
Adding EVSE and EV input files to ex_first.
steven-schmidt-inl Jul 12, 2023
d79e155
Fixing bug with io paths after rebasing on top of new ICM changes.
steven-schmidt-inl Jul 12, 2023
ff9ed33
Using 'os.path.join' in a few more places. I was investigating a mall…
steven-schmidt-inl Jul 12, 2023
f667255
Updating the unittests to support new load-inputs and start_execution…
steven-schmidt-inl Jul 12, 2023
eb602c3
Adding an examples folder for looking at agent-itineraries.
steven-schmidt-inl Jul 25, 2023
c1a9821
Deleting examples/ex_agent_itinleg_test because we don't need it anymore
steven-schmidt-inl Aug 2, 2023
79f70ce
Updating submodule for Caldera_ICM (reverting the extra columns relat…
steven-schmidt-inl Sep 8, 2023
e33663c
Making sure the EVSE_inputs.csv is correct for 'ex_ccast_test'.
steven-schmidt-inl Sep 8, 2023
cf5ad5a
Making sure error-conditions return the same number of return values …
steven-schmidt-inl Sep 21, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ outputs/*.csv
CMakeSettings.json
.vs/
.vscode/

# MacOS
.DS_Store

13 changes: 2 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
5 changes: 5 additions & 0 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
enable_testing()

add_subdirectory(ex_first)
add_subdirectory(ex_ccast_test)
add_subdirectory(ex_agent_itinwpts_test)
2 changes: 2 additions & 0 deletions examples/ex_agent_itinwpts_test/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
outputs/
simulation_args.json
2 changes: 2 additions & 0 deletions examples/ex_agent_itinwpts_test/CMakeLists.txt
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} )
5 changes: 5 additions & 0 deletions examples/ex_agent_itinwpts_test/inputs/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CE_ICM.csv
SE_ICM.csv
CE_ICM_errors.csv
SE_ICM_errors.csv
error_messages.txt
10 changes: 10 additions & 0 deletions examples/ex_agent_itinwpts_test/inputs/EVSE_inputs.csv
Original file line number Diff line number Diff line change
@@ -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
15 changes: 15 additions & 0 deletions examples/ex_agent_itinwpts_test/inputs/EV_inputs.csv
Original file line number Diff line number Diff line change
@@ -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
Loading