Skip to content

Commit fe2de21

Browse files
stephen-frankstephen-frank
authored
Merge pull request #21 from NREL/develop
Develop -> Main (for prototype electrical models) Merging for 0.3.0 release for DOE deliverable
2 parents b7c5c9a + 6eeb20f commit fe2de21

File tree

176 files changed

+15516
-3992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+15516
-3992
lines changed

‎FMU/benchtop_demo/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ This directory contains the BEEAM (HPF library) and EnergyPlus model files and r
55

66
This co-simulation demonstration model combines an electrical model of a simple distribution system (two laptop power supplies with resistive loads) with a thermal model of a simple thermal chamber (a partitioned refrigerator). This REAMDE documents the directory contents, how to execute the simulation, and some aspects of the electrical model. Full details will be documented in a forthcoming publication.
77

8+
**The *Modelica* model used for this validation study was developed and executed using BEEAM Version 0.2.x (beta). It has not been tested and may not execute properly with later BEEAM versions.**
9+
810
Files
911
-----
1012

‎FMU/benchtop_demo/benchtop_demo.mo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ model benchtop_demo
33
Placement(visible = true, transformation(origin={-182,86.5714}, extent = {{-16, -16}, {16, 11.4286}}, rotation = 0)));
44
HPF.SinglePhase.Sources.VoltageSource Vin(start_v_re = {120, 0, 0, 0, 0}, vArg = {0, 0, 0, 0, 0}, vMag = {120, 0, 0, 0, 0}) annotation (
55
Placement(visible = true, transformation(origin={-188,-20}, extent = {{-10, -10}, {10, 10}}, rotation = -90)));
6-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl PowerSupply1(P1(start = 12), Q1(start = 0), V_Rect = 19.92, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Laptop_Charger_LBNL_1.mat", nomP = 90, nomV = 120) "HP P/N 608428-002" annotation (
6+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl PowerSupply1(P1(start = 12), Q1(start = 0), V_Rect = 19.92, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/HP-608428-002.mat", nomP = 90, nomV = 120) "HP P/N 608428-002" annotation (
77
Placement(visible = true, transformation(origin={-128,40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
8-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl PowerSupply2(P1(start = 12), Q1(start = 0), V_Rect = 19.51, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Laptop_Charger_LBNL_2.mat", nomP = 90, nomV = 120) "HP P/N 677777-002" annotation (
8+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl PowerSupply2(P1(start = 12), Q1(start = 0), V_Rect = 19.51, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/HP-677777-002.mat", nomP = 90, nomV = 120) "HP P/N 677777-002" annotation (
99
Placement(visible = true, transformation(origin={-108,0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
1010
HPF.SinglePhase.Components.Ground GndAC annotation (
1111
Placement(visible = true, transformation(origin={-188,-86}, extent = {{-8, -8}, {8, 8}}, rotation = 0)));
@@ -23,7 +23,7 @@ model benchtop_demo
2323
Placement(visible = true, transformation(origin={108,30}, extent = {{-10, -10}, {10, 10}}, rotation = -90)));
2424
Modelica.Blocks.Math.Add3 UnconditionedZoneTotalLoss annotation (
2525
Placement(visible = true, transformation(origin={-28,80}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
26-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl FanPowerSupply(P1(start = 1), P_DCmin = 0.2, Q1(start = 0), V_Rect = 5, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/LED_Driver_1.mat", nomP = 25, nomV = 120) "P/N ??" annotation (
26+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl FanPowerSupply(P1(start = 1), P_DCmin = 0.2, Q1(start = 0), V_Rect = 5, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Mean-Well-APV-25-24-1of3.mat", nomP = 25.2, nomV = 120) "P/N ??" annotation (
2727
Placement(visible = true, transformation(origin={-88,-40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
2828
HPF.DC.DC_Load Fan1(pwr = 0.5) annotation (
2929
Placement(visible = true, transformation(origin={22,-62}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

‎FMU/flexlab_demo/4_modelica/flexlab_ac.mo‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
within ;
2-
model flexlab_ac_Cable
2+
model FLEXLAB_AC
33
inner HPF.SystemDef systemDef(fFund = 60, fs = 5000, hrms = {1, 3, 5, 7, 9}, numPh = 1) annotation (
44
Placement(visible = true, transformation(origin={-260,142.07}, extent={{
55
-20.0002,-19.5014},{20.0002,13.9299}}, rotation = 0)));
@@ -34,29 +34,29 @@ model flexlab_ac_Cable
3434
Placement(visible = true, transformation(origin={95,-51}, extent = {{-11, -11}, {11, 11}}, rotation = 0)));
3535
HPF.DC.Variable_DC_Load Prog_DC_Ld_6 annotation (
3636
Placement(visible = true, transformation(origin={102,-84}, extent = {{-12, -12}, {12, 12}}, rotation = 0)));
37-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Desk_PS1(P1(start = 1), P_DCmin = 0.2, Q1(start = 0), V_Rect = 12, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Seasonic_SSR-550PX__300W.mat", nomP = 350, nomV = 120) annotation (
37+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Desk_PS1(P1(start = 1), P_DCmin = 0.2, P_stby = 5.79, Q1(start = 0), S1(start = 1), V_Rect = 12, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Seasonic-SSR-550PX-12V.mat", nomP = 350, nomV = 120) annotation (
3838
Placement(visible = true, transformation(origin={60,78}, extent = {{-8, -6}, {8, 6}}, rotation = 0)));
39-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Desk_PS3(P1(start = 1), P_DCmin = 0.2, Q1(start = 0), V_Rect = 12, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Seasonic_SSR-550PX__300W.mat", nomP = 350, nomV = 120) annotation (
39+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Desk_PS3(P1(start = 1), P_DCmin = 0.2, P_stby = 5.79, Q1(start = 0), S1(start = 1), V_Rect = 12, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Seasonic-SSR-550PX-12V.mat", nomP = 350, nomV = 120) annotation (
4040
Placement(visible = true, transformation(origin={55,17}, extent = {{-9, -7}, {9, 7}}, rotation = 0)));
41-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Desk_PS2(P1(start = 1), P_DCmin = 0.2, Q1(start = 0), V_Rect = 12, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Seasonic_SSR-550PX__300W.mat", nomP = 350, nomV = 120) annotation (
41+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Desk_PS2(P1(start = 1), P_DCmin = 0.2, P_stby = 5.79, Q1(start = 0), S1(start = 1), V_Rect = 12, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Seasonic-SSR-550PX-12V.mat", nomP = 350, nomV = 120) annotation (
4242
Placement(visible = true, transformation(origin = {56, 51}, extent = {{-8, -7}, {8, 7}}, rotation = 0)));
43-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Desk_PS5(P1(start = 1), P_DCmin = 0.2, Q1(start = 0), V_Rect = 12, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Seasonic_SSR-550PX__300W.mat", nomP = 350, nomV = 120) annotation (
43+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Desk_PS5(P1(start = 1), P_DCmin = 0.2, P_stby = 5.79, Q1(start = 0), S1(start = 1), V_Rect = 12, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Seasonic-SSR-550PX-12V.mat", nomP = 350, nomV = 120) annotation (
4444
Placement(visible = true, transformation(origin={60,-54}, extent = {{-8, -8}, {8, 8}}, rotation = 0)));
45-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Desk_PS6(P1(start = 1), P_DCmin = 0.2, Q1(start = 0), V_Rect = 12, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Seasonic_SSR-550PX__300W.mat", nomP = 350, nomV = 120) annotation (
45+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Desk_PS6(P1(start = 1), P_DCmin = 0.2, P_stby = 5.79, Q1(start = 0), S1(start = 1), V_Rect = 12, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Seasonic-SSR-550PX-12V.mat", nomP = 350, nomV = 120) annotation (
4646
Placement(visible = true, transformation(origin={58,-89}, extent = {{-8, -7}, {8, 7}}, rotation = 0)));
47-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Desk_PS4(P1(start = 1), P_DCmin = 0.2, Q1(start = 0), V_Rect = 12, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Seasonic_SSR-550PX__300W.mat", nomP = 350, nomV = 120) annotation (
47+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Desk_PS4(P1(start = 1), P_DCmin = 0.2, P_stby = 5.79, Q1(start = 0), S1(start = 1), V_Rect = 12, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Seasonic-SSR-550PX-12V.mat", nomP = 350, nomV = 120) annotation (
4848
Placement(visible = true, transformation(origin = {56, -16}, extent = {{-8, -8}, {8, 8}}, rotation = 0)));
49-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Driver_1(P1(start = 1), P_DCmin = 0.2, Q1(start = 0), V_Rect = 24, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Osram_OTi48_LED_Driver.mat", nomP = 60, nomV = 120) annotation (
49+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Driver_1(P1(start = 1), P_DCmin = 0.2, P_stby = 1.52, Q1(start = 0), S1(start = 1), V_Rect = 24, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Osram-Oti-48-120-277-2A0.mat", nomP = 60, nomV = 120) annotation (
5050
Placement(visible = true, transformation(origin={-88,77}, extent = {{8, -7}, {-8, 7}}, rotation = 0)));
51-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Driver_2(P1(start = 1), P_DCmin = 0.2, Q1(start = 0), V_Rect = 24, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Osram_OTi48_LED_Driver.mat", nomP = 60, nomV = 120) annotation (
51+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Driver_2(P1(start = 1), P_DCmin = 0.2, P_stby = 1.52, Q1(start = 0), S1(start = 1), V_Rect = 24, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Osram-Oti-48-120-277-2A0.mat", nomP = 60, nomV = 120) annotation (
5252
Placement(visible = true, transformation(origin={-92,45}, extent = {{8, -7}, {-8, 7}}, rotation = 0)));
53-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Driver_3(P1(start = 1), P_DCmin = 0.2, Q1(start = 0), V_Rect = 24, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Osram_OTi48_LED_Driver.mat", nomP = 60, nomV = 120) annotation (
53+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Driver_3(P1(start = 1), P_DCmin = 0.2, P_stby = 1.52, Q1(start = 0), S1(start = 1), V_Rect = 24, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Osram-Oti-48-120-277-2A0.mat", nomP = 60, nomV = 120) annotation (
5454
Placement(visible = true, transformation(origin={-92,18}, extent = {{8, -8}, {-8, 8}}, rotation = 0)));
55-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Driver_4(P1(start = 1), P_DCmin = 0.2, Q1(start = 0), V_Rect = 24, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Osram_OTi48_LED_Driver.mat", nomP = 60, nomV = 120) annotation (
55+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Driver_4(P1(start = 1), P_DCmin = 0.2, P_stby = 1.52, Q1(start = 0), S1(start = 1), V_Rect = 24, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Osram-Oti-48-120-277-2A0.mat", nomP = 60, nomV = 120) annotation (
5656
Placement(visible = true, transformation(origin={-89,-21}, extent = {{9, -7}, {-9, 7}}, rotation = 0)));
57-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Driver_5(P1(start = 1), P_DCmin = 0.2, Q1(start = 0), V_Rect = 24, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Osram_OTi48_LED_Driver.mat", nomP = 60, nomV = 120) annotation (
57+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Driver_5(P1(start = 1), P_DCmin = 0.2, P_stby = 1.52, Q1(start = 0), S1(start = 1), V_Rect = 24, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Osram-Oti-48-120-277-2A0.mat", nomP = 60, nomV = 120) annotation (
5858
Placement(visible = true, transformation(origin={-88,-57}, extent = {{8, -7}, {-8, 7}}, rotation = 0)));
59-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Driver_6(P1(start = 1), P_DCmin = 0.2, Q1(start = 0), V_Rect = 24, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Osram_OTi48_LED_Driver.mat", nomP = 60, nomV = 120) annotation (
59+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Driver_6(P1(start = 1), P_DCmin = 0.2, P_stby = 1.52, Q1(start = 0), S1(start = 1), V_Rect = 24, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Osram-Oti-48-120-277-2A0.mat", nomP = 60, nomV = 120) annotation (
6060
Placement(visible = true, transformation(origin={-90,-93}, extent = {{8, -7}, {-8, 7}}, rotation = 0)));
6161
Modelica.Blocks.Math.Add Light_Driver_Loss annotation (Placement(visible=true,
6262
transformation(
@@ -520,4 +520,4 @@ Input Value - Dashed Line
520520
Output Value - Dotted Line")}),
521521
Icon(coordinateSystem(extent={{-200,-100},{200,100}})),
522522
version="");
523-
end flexlab_ac_Cable;
523+
end FLEXLAB_AC;

‎FMU/flexlab_demo/4_modelica/flexlab_dc.mo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
within HPF;
2-
model flexlab_dc_1
1+
within ;
2+
model FLEXLAB_DC
33
inner HPF.SystemDef systemDef(fFund = 60, fs = 5000, hrms = {1, 3, 5, 7, 9}, numPh = 1) annotation (
44
Placement(visible = true, transformation(origin={-182,86.5714}, extent = {{-16, -16}, {16, 11.4286}}, rotation = 0)));
55
HPF.SinglePhase.Sources.VoltageSource Vin(start_v_re = {120, 0, 0, 0, 0}, vArg = {0, 0, 0, 0, 0}, vMag = {120, 0, 0, 0, 0}) annotation (
66
Placement(visible = true, transformation(origin={-58,88}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
77
HPF.SinglePhase.Components.Ground GndAC annotation (
88
Placement(visible = true, transformation(origin={-102,76}, extent = {{-8, -8}, {8, 8}}, rotation = 0)));
9-
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Nextek_Hub(P1(start = 1), P_DCmin = 0.2, Q1(start = 0), V_Rect = 24, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Nextek_208V_1600W.mat", nomP = 1600, nomV = 120) "P/N ??" annotation (
9+
HPF.PowerConverters.SinglePhase.ACDC_EmpMdl Nextek_Hub(P1(start = 1), P_DCmin = 0.2, P_stby = 14.77, Q1(start = 0), S1(start = 1), V_Rect = 24, modelFileName = "HPF/Data/ConverterModels/SinglePhase/ACDC/Nextek-PHD16-ACDC-DIM-P-24-6-208V.mat", nomP = 1600, nomV = 120) "P/N ??" annotation (
1010
Placement(visible = true, transformation(origin={-44,50}, extent = {{-10, -10}, {10, 10}}, rotation = -90)));
1111
HPF.DC.Variable_DC_Load Light_1 annotation (
1212
Placement(visible = true, transformation(origin = {-86, 14}, extent = {{-10, -10}, {10, 10}}, rotation = 180)));
@@ -420,4 +420,4 @@ Output Value - Dotted Line"),
420420
pattern=LinePattern.DashDot,
421421
fontSize=0)}),
422422
Icon(coordinateSystem(extent={{-200,-100},{200,100}})));
423-
end flexlab_dc_1;
423+
end FLEXLAB_DC;

‎FMU/flexlab_demo/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Frank, Stephen M., Jordan Shackelford, Omkar Ghatpande, Matthew Steen, Brian Bal
66

77
The co-simulation models in this directory combine a thermal model of FLEXLAB with two electrical models: one each for an AC and a DC distribution system. The models mirror physical configurations implemented in a series of FLEXLAB experiements intended to validate the accuracy of the co-simulation architecture. Experiment details are documented in the associated publication (citation above); this REAMDE documents the directory organization, directory contents, and how to execute the co-simulation.
88

9+
**The *Modelica* models used for this validation study were developed and executed using BEEAM Version 0.2.x (beta). They have not been tested and may not execute properly with later BEEAM versions.**
10+
911
## Files
1012

1113
### This Directory

‎HPF/DC/DC_Port.mo‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
within HPF.DC;
2+
3+
model DC_Port
4+
extends Modelica.Electrical.Analog.Interfaces.OnePort;
5+
Modelica.SIunits.Power pwr "Component power";
6+
equation
7+
pwr = v*i;
8+
annotation(
9+
Icon(coordinateSystem(initialScale = 0.1), graphics = {Rectangle(origin = {7, 10}, extent = {{-67, 20}, {53, -40}}), Line(origin = {-76, 0}, points = {{-16, 0}, {16, 0}}), Line(origin = {75, 0}, points = {{-15, 0}, {15, 0}}), Text(origin = {-4, -20}, extent = {{-150, 60}, {150, 100}}, textString = "%name")}),
10+
Diagram(coordinateSystem(extent = {{-200, -200}, {200, 200}}, grid = {0, 0})));
11+
end DC_Port;

‎HPF/DC/package.order‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Interface
33
DC_Load
44
Variable_DC_Load
55
Ground
6+
DC_Port

‎HPF/Data/ConverterModels/SinglePhase/ACDC/HP-391174-001.mat‎

5.72 KB
Binary file not shown.

‎HPF/Data/ConverterModels/SinglePhase/ACDC/HP-608428-002.mat‎

5.72 KB
Binary file not shown.

‎HPF/Data/ConverterModels/SinglePhase/ACDC/HP-677777-002.mat‎

5.72 KB
Binary file not shown.

0 commit comments

Comments
 (0)