Initial commit R2021a

smiller01985 · smiller01985 · commit 76951a46bdc9 · 2021-04-17T08:24:53.000+02:00
diff --git a/HEV_SeriesParallel.slx b/HEV_SeriesParallel.slx
diff --git a/Libraries/Battery/Battery_Cell_Det.slx b/Libraries/Battery/Battery_Cell_Det.slx
diff --git a/Libraries/Battery/HEV_Battery_Det_Lib.slx b/Libraries/Battery/HEV_Battery_Det_Lib.slx
diff --git a/Libraries/Battery/HEV_Battery_Lib.slx b/Libraries/Battery/HEV_Battery_Lib.slx
diff --git a/Libraries/Battery/HEV_Battery_Testrig_v1.slx b/Libraries/Battery/HEV_Battery_Testrig_v1.slx
diff --git a/Libraries/Battery/HEV_Battery_Testrig_v2.slx b/Libraries/Battery/HEV_Battery_Testrig_v2.slx
diff --git a/Libraries/Electrical/HEV_Electrical_Lib.slx b/Libraries/Electrical/HEV_Electrical_Lib.slx
diff --git a/Libraries/Vehicle/Engine_Testrig.slx b/Libraries/Vehicle/Engine_Testrig.slx
diff --git a/Libraries/Vehicle/HEV_Vehicle_Dynamics_Lib.slx b/Libraries/Vehicle/HEV_Vehicle_Dynamics_Lib.slx
diff --git a/Libraries/Vehicle/Vehicle_Dynamics_Testrig.slx b/Libraries/Vehicle/Vehicle_Dynamics_Testrig.slx
diff --git a/Scripts_Data/Compare_HEV_Results.m b/Scripts_Data/Compare_HEV_Results.m
@@ -1,4 +1,4 @@
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 
 % SELECT SIMULATION RESULTS TO BE COMPARED
 VarSetStr = 'DSM';
diff --git a/Scripts_Data/Configure_HEV_Simulation.m b/Scripts_Data/Configure_HEV_Simulation.m
@@ -1,4 +1,4 @@
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 
 %disp('CONFIGURING MODEL...');
 HEV_Solver_Selection = 'ode15s';
diff --git a/Scripts_Data/HEVPS_setupRTtest.m b/Scripts_Data/HEVPS_setupRTtest.m
@@ -1,4 +1,4 @@
-% Copyright 2014-2020 The MathWorks(TM), Inc.
+% Copyright 2014-2021 The MathWorks(TM), Inc.
 Select_HEV_Model_Systems(mdl,'Sys BC VS',HEV_Configs);
 set_param([mdl '/Vehicle Dynamics/Simple'],'LinkStatus','inactive')
 HEV_Vehicle_Mass = 1600;
diff --git a/Scripts_Data/HEVSP_setdesktop.m b/Scripts_Data/HEVSP_setdesktop.m
@@ -1,4 +1,4 @@
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 
 set_param(bdroot,'Solver','ODE15s');
 HEV_Param.Control.Mode_Logic_TS = 0.1;
diff --git a/Scripts_Data/HEVSP_setrealtime.m b/Scripts_Data/HEVSP_setrealtime.m
@@ -1,4 +1,4 @@
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 
 tvar_Nonlinear_Iterations = '3';
 tvar_StepSize = '0.005';
diff --git a/Scripts_Data/HEVSP_tictoc.m b/Scripts_Data/HEVSP_tictoc.m
@@ -1,5 +1,5 @@
 function HEVSP_tictoc(enable)
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 
 if(strcmpi(enable,'on'))
     set_param(bdroot,'StartFcn','tic;');
diff --git a/Scripts_Data/HEV_Model_Demo_Script.html b/Scripts_Data/HEV_Model_Demo_Script.html
@@ -6,7 +6,7 @@
    <!--
 This HTML was auto-generated from MATLAB code.
 To make changes, update the MATLAB code and republish this document.
-      --><title>HEV Model Demo Script</title><meta name="generator" content="MATLAB 9.9"><link rel="schema.DC" href="http://purl.org/dc/elements/1.1/"><meta name="DC.date" content="2020-10-06"><meta name="DC.source" content="HEV_Model_Demo_Script.m"><style type="text/css">
+      --><title>HEV Model Demo Script</title><meta name="generator" content="MATLAB 9.10"><link rel="schema.DC" href="http://purl.org/dc/elements/1.1/"><meta name="DC.date" content="2021-03-09"><meta name="DC.source" content="HEV_Model_Demo_Script.m"><style type="text/css">
 html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-size:100%;vertical-align:baseline;background:transparent}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}:focus{outine:0}ins{text-decoration:none}del{text-decoration:line-through}table{border-collapse:collapse;border-spacing:0}
 
 html { min-height:100%; margin-bottom:1px; }
@@ -86,7 +86,7 @@
 <tr>9. <a href="matlab:cd(fileparts(which('HEV_Model_RSIM.m')));edit HEV_Model_RSIM">Deploy Simulation As a Standalone Executable</a><br>
 </style>
 </style>
-</p><p>Copyright 2011-2020 The MathWorks&#8482;, Inc.</p><p class="footer"><br><a href="https://www.mathworks.com/products/matlab/">Published with MATLAB&reg; R2020b</a><br></p></div><!--
+</p><p>Copyright 2011-2021 The MathWorks&#8482;, Inc.</p><p class="footer"><br><a href="https://www.mathworks.com/products/matlab/">Published with MATLAB&reg; R2021a</a><br></p></div><!--
 ##### SOURCE BEGIN #####
 %% HEV Model Demo Script
 %
@@ -111,7 +111,7 @@
 % </style>
 % </html>
 % 
-% Copyright 2011-2020 The MathWorks(TM), Inc.
+% Copyright 2011-2021 The MathWorks(TM), Inc.
 
 
 
diff --git a/Scripts_Data/HEV_Model_Demo_Script.m b/Scripts_Data/HEV_Model_Demo_Script.m
@@ -21,6 +21,6 @@
 % </style>
 % </html>
 % 
-% Copyright 2011-2020 The MathWorks(TM), Inc.
+% Copyright 2011-2021 The MathWorks(TM), Inc.
 
 
diff --git a/Scripts_Data/HEV_Model_PARAM.m b/Scripts_Data/HEV_Model_PARAM.m
@@ -1,4 +1,4 @@
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 
 %disp('DEFINING PARAMETERS...');
 % HEV SERIES PARALLEL PARAMETERS
diff --git a/Scripts_Data/Select_HEV_Model_Systems.m b/Scripts_Data/Select_HEV_Model_Systems.m
@@ -1,5 +1,5 @@
 function Select_HEV_Model_Systems(modelname,HEV_Config_Name,HEV_Configs)
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 
 % Find block with mask parameters to set variants
 f = Simulink.FindOptions('SearchDepth',1,'regexp',true);
diff --git a/Scripts_Data/Setup_HEV_Model_Configurations.m b/Scripts_Data/Setup_HEV_Model_Configurations.m
@@ -1,4 +1,4 @@
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 
 expModel = bdroot;
 
diff --git a/Scripts_Data/Test_HEV_Model_SHORT.m b/Scripts_Data/Test_HEV_Model_SHORT.m
@@ -1,4 +1,4 @@
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 
 expModel = 'HEV_SeriesParallel';
 open_system(expModel);
diff --git a/Scripts_Data/plot_HEV_Data.m b/Scripts_Data/plot_HEV_Data.m
@@ -1,5 +1,5 @@
 function plot_HEV_Data(FigID,SubPlID,DataStr,SigID,ValID,titlestr,PlotChoice)
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 
 figure(FigID)
 temp_colororder = get(gca,'defaultAxesColorOrder');
diff --git a/Scripts_Data/startup_HEV_Model.m b/Scripts_Data/startup_HEV_Model.m
@@ -1,4 +1,4 @@
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 
 HEV_Model_HomeDir = pwd;
 
diff --git a/Workflows/Fuel_Consumption/Create_Fuel_Consumption_LUT.m b/Workflows/Fuel_Consumption/Create_Fuel_Consumption_LUT.m
@@ -1,5 +1,5 @@
 %% ESTIMATE FUEL CONSUMPTION WITH MEASURED DATA
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 % CONSTANTS
 gasoline_density_gpm3 = 750*1000; % Grams per cubic meter
 gallons_per_m3 = 264.172;         % gallons per cubic meter
diff --git a/Workflows/Fuel_Consumption/Fuel_Consumption_PlotData.m b/Workflows/Fuel_Consumption/Fuel_Consumption_PlotData.m
@@ -1,4 +1,4 @@
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 
 hndl = plot3(FCData.Speed_RPM, FCData.Trq_Nm, FCData.FuelUse_gps,'o','MarkerFaceColor','blue','MarkerEdgeColor','white');
 grid on
diff --git a/Workflows/Param_Sweep/HEV_Model_PCT_Sim.m b/Workflows/Param_Sweep/HEV_Model_PCT_Sim.m
@@ -1,5 +1,5 @@
 %% Script to run HEV_SeriesParallel in parallel
-% Copyright 2013-2020 The MathWorks(TM), Inc.
+% Copyright 2013-2021 The MathWorks(TM), Inc.
 
 % Move to folder where script is saved
 cd(fileparts(which(mfilename)));
diff --git a/Workflows/Power_Quality/DC_Power_Quality_Analysis.m b/Workflows/Power_Quality/DC_Power_Quality_Analysis.m
@@ -1,5 +1,5 @@
 %% CONSTANTS
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 
 FigurePos1 = [450   499   574   186];
 FigurePos2 = [449    69   574   372];
diff --git a/Workflows/RSIM/HEV_Model_RSIM.m b/Workflows/RSIM/HEV_Model_RSIM.m
@@ -1,5 +1,5 @@
 %% OPEN AND CONFIGURE MODEL
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 
 mdl = 'HEV_SeriesParallel';
 open_system(mdl);
diff --git a/Workflows/Real_Time/Test_RT_Model.m b/Workflows/Real_Time/Test_RT_Model.m
@@ -99,6 +99,6 @@
 hold off
 legend({'Reference','Fixed-Step','Real-Time','Modified'},'Location','NorthWest');
 
-% Copyright 2011-2020 The MathWorks(TM), Inc.
+% Copyright 2011-2021 The MathWorks(TM), Inc.
 %% Close model and clean up directory
 cleanup_rt_dir
diff --git a/Workflows/Real_Time/cleanup_rt_dir.m b/Workflows/Real_Time/cleanup_rt_dir.m
@@ -1,5 +1,5 @@
 % CLEANUP RT TEST DIR
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 
 mdl = 'HEV_SeriesParallel';
 delete([mdl '*bio.m'])
diff --git a/Workflows/Reports/HEV_Model_Report_SHORT.html b/Workflows/Reports/HEV_Model_Report_SHORT.html
@@ -1,6 +1,6 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>HEV Simulation Test Report</title><meta name="generator" content="DocBook MathWorks XSL Stylesheets V1.75.2-mathworks"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="de" class="book" title="HEV Simulation Test Report"><div class="titlepage"><div><div><h1 class="title"><a name="d38e1"></a>HEV Simulation Test Report</h1></div><div><h2 class="subtitle">Generated by the Simulink Report Generator</h2></div><div><div class="mediaobject" align="left"><img src="./HEV_Model_Report_SHORT_html_files/image-000-copied.jpg"></div></div><div><div class="legalnotice" title="Rechtlicher Hinweis"><a name="d38e13"></a><p><span>Copyright 2020 The MathWorks, Inc.</span></p></div></div><div><p class="pubdate">16-Apr-2019 11:38:20</p></div></div><hr></div><div class="toc"><p><b>Inhaltsverzeichnis</b></p><dl><dt><span class="chapter"><a href="#d38e17">1. <span>Configuration "Sys BD VS" Tests</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="#d38e57"><span>1. Drive Cycle 1</span></a></span></dt><dt><span class="sect1"><a href="#d38e86"><span>2. Drive Cycle 2</span></a></span></dt><dt><span class="sect1"><a href="#d38e115"><span>3. Drive Cycle 3</span></a></span></dt></dl></dd><dt><span class="chapter"><a href="#d38e144">2. Simulation Time Table</a></span></dt></dl></div><div class="list-of-figures"><p><b>Abbildungsverzeichnis</b></p><dl><dt>1.1. <a href="#d38e62">Vehicle
+   <title>HEV Simulation Test Report</title><meta name="generator" content="DocBook MathWorks XSL Stylesheets V1.75.2-mathworks"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="de" class="book" title="HEV Simulation Test Report"><div class="titlepage"><div><div><h1 class="title"><a name="d38e1"></a>HEV Simulation Test Report</h1></div><div><h2 class="subtitle">Generated by the Simulink Report Generator</h2></div><div><div class="mediaobject" align="left"><img src="./HEV_Model_Report_SHORT_html_files/image-000-copied.jpg"></div></div><div><div class="legalnotice" title="Rechtlicher Hinweis"><a name="d38e13"></a><p><span>Copyright 2021 The MathWorks, Inc.</span></p></div></div><div><p class="pubdate">16-Apr-2019 11:38:20</p></div></div><hr></div><div class="toc"><p><b>Inhaltsverzeichnis</b></p><dl><dt><span class="chapter"><a href="#d38e17">1. <span>Configuration "Sys BD VS" Tests</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="#d38e57"><span>1. Drive Cycle 1</span></a></span></dt><dt><span class="sect1"><a href="#d38e86"><span>2. Drive Cycle 2</span></a></span></dt><dt><span class="sect1"><a href="#d38e115"><span>3. Drive Cycle 3</span></a></span></dt></dl></dd><dt><span class="chapter"><a href="#d38e144">2. Simulation Time Table</a></span></dt></dl></div><div class="list-of-figures"><p><b>Abbildungsverzeichnis</b></p><dl><dt>1.1. <a href="#d38e62">Vehicle
 Speed</a></dt><dt>1.2. <a href="#d38e68">Speeds From Urban Cycle 1</a></dt><dt>1.3. <a href="#d38e74">Voltages From Urban Cycle 1</a></dt><dt>1.4. <a href="#d38e80">Currents From Urban Cycle 1</a></dt><dt>1.5. <a href="#d38e91">Vehicle
 Speed</a></dt><dt>1.6. <a href="#d38e97">Speeds From Urban Cycle 2</a></dt><dt>1.7. <a href="#d38e103">Voltages From Urban Cycle 2</a></dt><dt>1.8. <a href="#d38e109">Currents From Urban Cycle 2</a></dt><dt>1.9. <a href="#d38e120">Vehicle
 Speed</a></dt><dt>1.10. <a href="#d38e126">Speeds From Urban Cycle 3</a></dt><dt>1.11. <a href="#d38e132">Voltages From Urban Cycle 3</a></dt><dt>1.12. <a href="#d38e138">Currents From Urban Cycle 3</a></dt></dl></div><div class="list-of-tables"><p><b>Tabellenverzeichnis</b></p><dl><dt>2.1. <a href="#d38e148">Simulation Time</a></dt></dl></div><div class="chapter" title="Kapitel 1. Configuration &#34;Sys BD VS&#34; Tests"><div class="titlepage"><div><div><h2 class="title"><a name="d38e17"></a>Kapitel 1. <span>Configuration "Sys BD VS" Tests</span></h2></div></div></div><div class="toc"><p><b>Inhaltsverzeichnis</b></p><dl><dt><span class="sect1"><a href="#d38e57"><span>1. Drive Cycle 1</span></a></span></dt><dt><span class="sect1"><a href="#d38e86"><span>2. Drive Cycle 2</span></a></span></dt><dt><span class="sect1"><a href="#d38e115"><span>3. Drive Cycle 3</span></a></span></dt></dl></div><pre xmlns:mwsh="http://www.mathworks.com/namespace/mcode/v1/syntaxhighlight.dtd"><span style="color:green">% CONFIGURE HEV Model</span>
diff --git a/Workflows/Reports/actxlicense.m b/Workflows/Reports/actxlicense.m
@@ -1,5 +1,5 @@
 function lic = actxlicense(progid)
-% Copyright 2011-2020 The MathWorks, Inc.
+% Copyright 2011-2021 The MathWorks, Inc.
 if strcmpi(progid, 'air.airctrl.1')
 lic = 'Copyright (c) 1996 ';
 return;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-% Copyright 2011-2020 The MathWorks, Inc.`
	`1`	`+% Copyright 2011-2021 The MathWorks, Inc.`
`2`	`2`
`3`	`3`	`% SELECT SIMULATION RESULTS TO BE COMPARED`
`4`	`4`	`VarSetStr = 'DSM';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-% Copyright 2014-2020 The MathWorks(TM), Inc.`
	`1`	`+% Copyright 2014-2021 The MathWorks(TM), Inc.`
`2`	`2`	`Select_HEV_Model_Systems(mdl,'Sys BC VS',HEV_Configs);`
`3`	`3`	`set_param([mdl '/Vehicle Dynamics/Simple'],'LinkStatus','inactive')`
`4`	`4`	`HEV_Vehicle_Mass = 1600;`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@`
`21`	`21`	`% </style>`
`22`	`22`	`% </html>`
`23`	`23`	`%`
`24`		`-% Copyright 2011-2020 The MathWorks(TM), Inc.`
	`24`	`+% Copyright 2011-2021 The MathWorks(TM), Inc.`
`25`	`25`
`26`	`26`