Next gen profiles

.gitignore

@@ -4,8 +4,17 @@ __pycache__/
 
 # C extensions
 *.so
+*.exe
+*.editorconfig
 
 # Distribution / packaging
 build/
 *.vs*
-CMakeSettings.json
+CMakeSettings.json
+
+# MacOS stuff
+.DS_Store
+
+# Executables that get created when we run make install
+run_models
+

CMakeLists.txt

@@ -4,16 +4,6 @@ project(ICM)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-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()
-
 if (NOT DEFINED INSTALL_DIR)
 	message(STATUS "setting local install dir")
 	set(INSTALL_DIR ${PROJECT_SOURCE_DIR}/libs)
@@ -23,5 +13,6 @@ message(STATUS "Install dir is ${INSTALL_DIR}")
 
 find_package(pybind11 CONFIG)
 
-add_subdirectory(source/charging_models)
-add_subdirectory(source/base)
+add_subdirectory(source)
+add_subdirectory(unittests)
+add_subdirectory(misc)

inputs/CalderaCast/EVSE_inputs.csv

@@ -0,0 +1,11 @@
+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
+L2_7200,L2,1,6.624,-1,-1,0,0
+L2_11520,L2,1,10.5984,-1,-1,0,0
+L2_17280,L2,1,15.8976,-1,-1,0,0
+L2_19200,L2,1,17.664,-1,-1,0,0
+dcfc_50,DCFC,3,50,600,125,0.1,-0.59
+xfc_150,DCFC,3,150,920,200,0.17,-0.445
+xfc_150T,DCFC,3,150,500,300,0.17,-0.445
+xfc_200,DCFC,3,200,920,300,0.17,-0.445
+xfc_250,DCFC,3,250,920,500,0.17,-0.445
+xfc_350,DCFC,3,350,920,500,0.17,-0.445

inputs/CalderaCast/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,17.66,TRUE,3.41,900
+bev300_400kW,LTO,97.5,300,325,17.66,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

inputs/DirectXFC/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

inputs/DirectXFC/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

inputs/EVs_at_Risk/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
+L2_7200,L2,1,6.624,240,30,0,0
+L2_17280,L2,1,15.8976,240,71,0,0
+xfc_150,DCFC,3,150,882.3529412,170,0.17,-0.445
+xfc_350,DCFC,3,350,700,500,0.17,-0.445
+xfc_500kW,DCFC,3,500,1000,500,0.2,-0.03
+xfc_1000kW,DCFC,3,1000,1365.001365,732.6,0.2,-0.03
+xfc_2000kW,DCFC,3,2000,1363.636705,1466.6663,0.2,-0.03
+xfc_3000kW,DCFC,3,3000,1363.636364,2200,0.2,-0.03
+dwc_100kW,DCFC,3,100,800,125,0.2,-0.03

inputs/EVs_at_Risk/EV_inputs.csv

@@ -0,0 +1,9 @@
+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
+ld_50kWh,NMC,50,200,250,15.8976,TRUE,2.9,1000
+ld_100kWh,NMC,100,300,333,15.8976,TRUE,2.9,1000
+md_200kWh,NMC,200,250,800,15.8976,TRUE,2.9,1000
+hd_300kWh,NMC,300,150,2000,15.8976,TRUE,2.9,1500
+hd_400kWh,NMC,400,200,2000,15.8976,TRUE,2.9,1500
+hd_600kWh,NMC,600,300,2000,15.8976,TRUE,2.9,1500
+hd_800kWh,NMC,800,400,2000,15.8976,TRUE,2.9,1500
+hd_1000kWh,NMC,1000,500,2000,15.8976,TRUE,2.5,1500

inputs/eMosaic/EVSE_inputs.csv

@@ -0,0 +1,9 @@
+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
+L2_7200W,L2,1,7.2,240,30,0,0
+L2_17280W,L2,1,17.28,240,71,0,0
+xfc_20kW,DCFC,3,19.5,325,60,0.1,-0.59
+xfc_50kW,DCFC,3,50,625,80,0.1,-0.59
+xfc_90kW,DCFC,3,90,600,150,0.1,-0.59
+xfc_150kW,DCFC,3,150,750,200,0.17,-0.445
+xfc_180kW,DCFC,3,180,600,300,0.17,-0.445
+xfc_450kW,DCFC,3,450,750,600,0.17,-0.445

inputs/eMosaic/EV_inputs.csv

@@ -0,0 +1,7 @@
+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
+ld_50kWh,NMC,50,200,250,15.8976,TRUE,2.9,1000
+ld_100kWh,NMC,100,300,333,15.8976,TRUE,2.9,1000
+md_200kWh,NMC,200,250,800,15.8976,TRUE,2.9,1000
+hd_300kWh,NMC,300,150,2000,15.8976,TRUE,2.9,1500
+hd_400kWh,NMC,400,200,2000,15.8976,TRUE,2.9,1500
+hd_600kWh,NMC,600,300,2000,15.8976,TRUE,2.9,1500

misc/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(next_gen_prof_testing)

misc/next_gen_prof_testing/.gitignore

@@ -0,0 +1,2 @@
+*.csv
+*.exe

misc/next_gen_prof_testing/CMakeLists.txt

@@ -0,0 +1,22 @@
+add_executable(ICM_Full ICM_Full.cpp)
+target_link_libraries(ICM_Full Charging_models Load_inputs factory Base)
+target_compile_features(ICM_Full PUBLIC cxx_std_17)
+target_include_directories(ICM_Full PUBLIC ${PROJECT_SOURCE_DIR}/source/base)
+target_include_directories(ICM_Full PUBLIC ${PROJECT_SOURCE_DIR}/source/charging_models)
+target_include_directories(ICM_Full PUBLIC ${PROJECT_SOURCE_DIR}/source/factory)
+target_include_directories(ICM_Full PUBLIC ${PROJECT_SOURCE_DIR}/source/load_inputs)
+
+install(TARGETS ICM_Full
+		DESTINATION ${PROJECT_SOURCE_DIR}/misc/next_gen_prof_testing)
+
+add_executable(ICM_Aux ICM_Aux.cpp )
+target_link_libraries(ICM_Aux Charging_models Load_inputs factory Base_aux)
+target_compile_features(ICM_Aux PUBLIC cxx_std_17)
+target_include_directories(ICM_Aux PUBLIC ${PROJECT_SOURCE_DIR}/source/base)
+target_include_directories(ICM_Aux PUBLIC ${PROJECT_SOURCE_DIR}/source/charging_models)
+target_include_directories(ICM_Aux PUBLIC ${PROJECT_SOURCE_DIR}/source/factory)
+target_include_directories(ICM_Aux PUBLIC ${PROJECT_SOURCE_DIR}/source/load_inputs)
+
+install(TARGETS ICM_Aux
+		DESTINATION ${PROJECT_SOURCE_DIR}/misc/next_gen_prof_testing)
+

misc/next_gen_prof_testing/ICM_Aux.cpp

@@ -0,0 +1,161 @@
+#include "Aux_interface.h"
+#include <filesystem>
+
+
+int build_entire_charge_profile_using_ICM()
+{
+
+	std::string path_to_inputs = "./inputs";
+
+	//######################################################
+	//# 	Build Charge Profile Given Start and End SOC
+	//######################################################
+
+	double L1_timestep_sec = 1;								// Timestep for Level 1 charger
+	double L2_timestep_sec = 1;								// Timestep for Level 2 charger
+	double HPC_timestep_sec = 1;							// Timestep for High Power charger
+	EV_ramping_map ramping_by_pevType_only{};				// Custom Ramping
+	EV_EVSE_ramping_map ramping_by_pevType_seType{};		// Custom Ramping
+
+	CP_interface_v2 ICM_v2{ 
+		path_to_inputs, 
+		L1_timestep_sec, 
+		L2_timestep_sec, 
+		HPC_timestep_sec, 
+		ramping_by_pevType_only, 
+		ramping_by_pevType_seType 
+	};
+
+	std::string pev_type = "bev250_350kW";
+	std::string SE_type = "xfc_350";
+	double start_soc = 10;
+	double end_soc = 90;
+
+	all_charge_profile_data all_profile_data = ICM_v2.get_all_charge_profile_data(start_soc, end_soc, pev_type, SE_type);
+
+	double start_time_sec = 0;
+
+	// Write output
+	// build the files header
+	std::string header = "time | hrs,SOC | ,P1 | kW, P2 | kW, P3 | kW, Q3 | kVAR\n";
+
+	std::string data = "";
+
+	for (int i = 0; i < all_profile_data.soc.size(); i++)
+	{
+		data += std::to_string((start_time_sec + i* all_profile_data.timestep_sec)/3600.0) + ",";
+		data += std::to_string(all_profile_data.soc[i]) + ",";
+		data += std::to_string(all_profile_data.P1_kW[i]) + ",";
+		data += std::to_string(all_profile_data.P2_kW[i]) + ",";
+		data += std::to_string(all_profile_data.P3_kW[i]) + ",";
+		data += std::to_string(all_profile_data.Q3_kVAR[i]) + "\n";
+
+	}
+
+	std::ofstream f_out;
+	f_out.open("./outputs/ICM_Aux_output.csv");
+	f_out << header << data;
+	f_out.close();
+
+	return 0;
+}
+
+int estimate_charging_parameters_using_ICM()
+{
+	std::string path_to_inputs = "./inputs";
+	CP_interface ICM_v1{ path_to_inputs, false };
+
+	double setpoint_P3kW = 1000;
+	std::string pev_type = "bev250_350kW";
+	std::string SE_type = "xfc_350";
+
+
+	double startSOC, endSOC, charge_time_hrs;
+	std::vector<double> endSOC_vec, charge_time_hrs_vec;
+	//----------------------------------------
+	// find_result_given_startSOC_and_endSOC
+	//----------------------------------------
+
+	startSOC = 20;
+	endSOC = 85;
+	pev_charge_profile_result X0 = ICM_v1.find_result_given_startSOC_and_endSOC(pev_type, SE_type, setpoint_P3kW, startSOC, endSOC);
+
+	std::cout << "-----------------------------------" << "\n";
+	std::cout << "find_result_given_startSOC_and_endSOC" << "\n";
+	std::cout << "------------------------------------" << "\n";
+	std::cout << "startSOC: " << startSOC << " endSOC: " << endSOC << "\n";
+	std::cout << "soc_increase: " << X0.soc_increase << " total_time_hrs: " << X0.total_charge_time_hrs << " incr_time_hrs : " << X0.incremental_chage_time_hrs << "\n";
+	std::cout << "\n" << "\n";
+
+
+	//-------------------------------------------
+	// find_result_given_startSOC_and_chargeTime
+	//-------------------------------------------
+	startSOC = 20;
+	charge_time_hrs = 15.0 / 60.0;
+	pev_charge_profile_result X1 = ICM_v1.find_result_given_startSOC_and_chargeTime(pev_type, SE_type, setpoint_P3kW, startSOC, charge_time_hrs);
+
+	std::cout << "-----------------------------------" << "\n";
+	std::cout << "find_result_given_startSOC_and_chargeTime" << "\n";
+	std::cout << "------------------------------------" << "\n";
+	std::cout << "startSOC: " << startSOC << " charge_time_hrs: " << charge_time_hrs << "\n";
+	std::cout << "soc_increase: " << X1.soc_increase << " total_time_hrs: " << X1.total_charge_time_hrs << " incr_time_hrs : " << X1.incremental_chage_time_hrs << "\n";
+	std::cout << "\n" << "\n";
+
+
+	//------------------------------------------------
+	// find_chargeProfile_given_startSOC_and_endSOCs
+	//------------------------------------------------
+	startSOC = 20;
+	endSOC_vec = { 30, 40, 50, 60, 70, 80, 90, 100 };
+	std::vector<pev_charge_profile_result> X2 = ICM_v1.find_chargeProfile_given_startSOC_and_endSOCs(pev_type, SE_type, setpoint_P3kW, startSOC, endSOC_vec);
+
+	std::cout << "-----------------------------------" << "\n";
+	std::cout << "find_chargeProfile_given_startSOC_and_endSOCs" << "\n";
+	std::cout << "------------------------------------" << "\n";
+	std::cout << "startSOC: " << startSOC << " endSOCs: ";
+	for ( double endSOC : endSOC_vec )
+	{
+		std::cout << endSOC << " ";
+	}
+	std::cout << "\n";
+	for (pev_charge_profile_result x : X2)
+	{
+		std::cout << "soc_increase: " << x.soc_increase << " total_time_hrs: " << x.total_charge_time_hrs << " incr_time_hrs : " << x.incremental_chage_time_hrs << "\n";
+	}
+	std::cout << "\n" << "\n";
+
+
+	//------------------------------------------------
+	// find_chargeProfile_given_startSOC_and_chargeTimes
+	//------------------------------------------------
+	startSOC = 20;
+	charge_time_hrs_vec = { 5.0 / 60.0, 10.0 / 60.0, 15.0 / 60.0, 20.0 / 60.0, 25.0 / 60.0, 30.0 / 60.0, 35.0 / 60.0, 40.0 / 60.0, 45.0 / 60.0, 50.0 / 60.0, 60.0 / 60.0 };
+	std::vector<pev_charge_profile_result> X3 = ICM_v1.find_chargeProfile_given_startSOC_and_chargeTimes(pev_type, SE_type, setpoint_P3kW, startSOC, charge_time_hrs_vec);
+
+	std::cout << "-----------------------------------" << "\n";
+	std::cout << "find_chargeProfile_given_startSOC_and_chargeTimes" << "\n";
+	std::cout << "------------------------------------" << "\n";
+	std::cout << "startSOC: " << startSOC << " charge_time_hrs: ";
+	for (double charge_time_hrs : charge_time_hrs_vec)
+	{
+		std::cout << charge_time_hrs << " ";
+	}
+	std::cout << "\n";
+	for (pev_charge_profile_result x : X3)
+	{
+		std::cout << "soc_increase: " << x.soc_increase << " total_time_hrs: " << x.total_charge_time_hrs << " incr_time_hrs : " << x.incremental_chage_time_hrs << "\n";
+	}
+	std::cout << "\n" << "\n";
+
+	return 0;
+}
+
+int main()
+{
+	int return_code = 0;
+	return_code += build_entire_charge_profile_using_ICM();
+	return_code += estimate_charging_parameters_using_ICM();
+
+	return 0;
+}

misc/next_gen_prof_testing/ICM_Aux.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+import os
+import sys
+import pandas as pd
+import numpy as np
+
+path_to_here = os.path.abspath(os.path.dirname(sys.argv[0]))
+path_to_libs = os.path.join(path_to_here, "..", "..", "libs")
+path_to_inputs = os.path.join(path_to_here, "inputs")
+
+index = 1
+sys.path.insert( index+0, path_to_libs )
+
+from Caldera_ICM_Aux import CP_interface_v2
+from Caldera_globals import all_charge_profile_data
+
+
+######################################################
+# 	Build Charge Profile Given Start and End SOC
+######################################################
+
+L1_timestep_sec = 1
+L2_timestep_sec = 1
+HPC_timestep_sec = 1
+ramping_by_pevType_only = {}
+ramping_by_pevType_seType = {}
+
+ICM = CP_interface_v2(path_to_inputs, L1_timestep_sec, L2_timestep_sec, HPC_timestep_sec, ramping_by_pevType_only, ramping_by_pevType_seType)
+
+pev_type = "bev250_350kW"
+SE_type = "xfc_350"
+start_soc = 10
+end_soc = 90
+
+all_profile_data =  ICM.get_all_charge_profile_data(start_soc, end_soc, pev_type, SE_type)
+
+start_time = 0
+end_time = len(all_profile_data.P1_kW) * all_profile_data.timestep_sec
+
+df = pd.DataFrame()
+df["time | sec"] = np.arange(start_time, end_time, all_profile_data.timestep_sec)
+df["SOC | "] = all_profile_data.soc
+df["P1 | kW"] = all_profile_data.P1_kW
+df["P2 | kW"] = all_profile_data.P2_kW
+df["P3 | kW"] = all_profile_data.P3_kW
+df["Q3 | kVAR"] = all_profile_data.Q3_kVAR
+
+df.to_csv("{}_{}_{}_{}.csv".format(pev_type, SE_type, start_soc, end_soc), index = False)
+