Skip to content

Commit

Permalink
Replaced 120 with 110 volt to be consistent
Browse files Browse the repository at this point in the history
  • Loading branch information
mwetter committed Apr 7, 2015
1 parent 6174b0c commit a853567
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Buildings/Electrical/AC/OnePhase/Lines/Line.mo
@@ -1,7 +1,7 @@
within Buildings.Electrical.AC.OnePhase.Lines;
model Line "Model of an electrical line"
extends Buildings.Electrical.Transmission.BaseClasses.PartialLine(
V_nominal(start = 120),
V_nominal(start = 110),
redeclare package PhaseSystem_p = PhaseSystems.OnePhase,
redeclare package PhaseSystem_n = PhaseSystems.OnePhase,
redeclare Interfaces.Terminal_n terminal_n,
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Electrical/AC/OnePhase/Lines/Network.mo
@@ -1,7 +1,7 @@
within Buildings.Electrical.AC.OnePhase.Lines;
model Network "Single phase AC network"
extends Buildings.Electrical.Transmission.BaseClasses.PartialNetwork(
V_nominal(start = 120),
V_nominal(start = 110),
redeclare Interfaces.Terminal_p terminal,
redeclare replaceable Transmission.Grids.TestGrid2Nodes grid,
redeclare Line lines(
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Electrical/AC/OnePhase/Lines/TwoPortRLC.mo
@@ -1,7 +1,7 @@
within Buildings.Electrical.AC.OnePhase.Lines;
model TwoPortRLC "Model of an RLC element with two electrical ports"
extends Buildings.Electrical.Transmission.BaseClasses.PartialTwoPortRLC(
V_nominal(start = 120),
V_nominal(start = 110),
redeclare package PhaseSystem_p = PhaseSystems.OnePhase,
redeclare package PhaseSystem_n = PhaseSystems.OnePhase,
redeclare Interfaces.Terminal_n terminal_n(
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Electrical/AC/OnePhase/Loads/Capacitive.mo
Expand Up @@ -3,7 +3,7 @@ model Capacitive "Model of a capacitive and resistive load"
extends Buildings.Electrical.Interfaces.CapacitiveLoad(
redeclare package PhaseSystem = PhaseSystems.OnePhase,
redeclare Interfaces.Terminal_n terminal,
V_nominal(start=120));
V_nominal(start = 110));
initial equation
if mode == Buildings.Electrical.Types.Load.FixedZ_dynamic then
// q = Y[2]*{V_nominal, 0}/omega;
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Electrical/AC/OnePhase/Loads/Inductive.mo
Expand Up @@ -3,7 +3,7 @@ model Inductive "Model of an inductive and resistive load"
extends Buildings.Electrical.Interfaces.InductiveLoad(
redeclare package PhaseSystem = PhaseSystems.OnePhase,
redeclare Interfaces.Terminal_n terminal,
V_nominal(start=120));
V_nominal(start = 110));
initial equation
if mode == Buildings.Electrical.Types.Load.FixedZ_dynamic then
// psi = Z[2]*{P_nominal/V_nominal, 0}/omega;
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Electrical/AC/OnePhase/Loads/Resistive.mo
Expand Up @@ -3,7 +3,7 @@ model Resistive "Model of a resistive load"
extends Buildings.Electrical.Interfaces.Load(
redeclare package PhaseSystem = PhaseSystems.OnePhase,
redeclare Interfaces.Terminal_n terminal,
V_nominal(start=120));
V_nominal(start = 110));
equation

if linearized then
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Electrical/AC/OnePhase/Sensors/Probe.mo
@@ -1,7 +1,7 @@
within Buildings.Electrical.AC.OnePhase.Sensors;
model Probe "Model of a probe that measures RMS voltage and angle"
extends Icons.GeneralizedProbe;
parameter Modelica.SIunits.Voltage V_nominal(min=0, start=120)
parameter Modelica.SIunits.Voltage V_nominal(min=0, start = 110)
"Nominal voltage (V_nominal >= 0)";
parameter Boolean perUnit = true "If true, display voltage in p.u.";
replaceable Interfaces.Terminal_n term "Electrical connector" annotation (Placement(
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Electrical/AC/OnePhase/Sources/FixedVoltage.mo
Expand Up @@ -4,7 +4,7 @@ model FixedVoltage "Fixed single phase AC voltage source"
redeclare package PhaseSystem = PhaseSystems.OnePhase,
redeclare Interfaces.Terminal_p terminal);
parameter Modelica.SIunits.Frequency f(start=60) "Frequency of the source";
parameter Modelica.SIunits.Voltage V(start=120) "RMS voltage of the source";
parameter Modelica.SIunits.Voltage V(start = 110) "RMS voltage of the source";
parameter Modelica.SIunits.Angle phiSou = 0 "Phase shift of the source";
protected
Modelica.SIunits.Angle thetaRel
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Electrical/AC/OnePhase/Sources/Grid.mo
Expand Up @@ -5,7 +5,7 @@ model Grid "Electrical grid"
annotation (Placement(transformation(extent={{-10,
-110},{10,-90}}), iconTransformation(extent={{-10,-110},{10,-90}})));
parameter Modelica.SIunits.Frequency f(start=60) "Frequency of the source";
parameter Modelica.SIunits.Voltage V(start=120) "RMS voltage of the source";
parameter Modelica.SIunits.Voltage V(start = 110) "RMS voltage of the source";
parameter Modelica.SIunits.Angle phiSou = 0 "Phase shift angle of the source";
Buildings.Electrical.AC.Interfaces.PowerOutput P
"Power consumed from grid if negative, or fed to grid if positive"
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Electrical/AC/OnePhase/Sources/PVSimple.mo
Expand Up @@ -4,7 +4,7 @@ model PVSimple "Simple PV model"
extends Buildings.Electrical.Interfaces.PartialPV(
redeclare package PhaseSystem = Buildings.Electrical.PhaseSystems.OnePhase,
redeclare Interfaces.Terminal_p terminal,
V_nominal(start = 120));
V_nominal(start = 110));
parameter Boolean linearized=false
"If =true, introduce a linearization in the load";
replaceable Buildings.Electrical.AC.OnePhase.Loads.Capacitive load(
Expand Down
Expand Up @@ -3,7 +3,7 @@ model PVSimpleOriented "Simple PV model with orientation"
extends Buildings.Electrical.Interfaces.PartialAcDcParameters;
extends Buildings.Electrical.Interfaces.PartialPVOriented(
redeclare package PhaseSystem = Buildings.Electrical.PhaseSystems.OnePhase,
V_nominal(start = 120),
V_nominal(start = 110),
redeclare Interfaces.Terminal_p terminal,
redeclare replaceable Buildings.Electrical.AC.OnePhase.Sources.PVSimple panel(
pf=pf,
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Electrical/AC/OnePhase/Sources/WindTurbine.mo
Expand Up @@ -3,7 +3,7 @@ model WindTurbine "Simple wind turbine model"
extends Buildings.Electrical.Interfaces.PartialWindTurbine(
redeclare package PhaseSystem = Buildings.Electrical.PhaseSystems.OnePhase,
redeclare Interfaces.Terminal_p terminal,
V_nominal(start = 120));
V_nominal(start = 110));

parameter Real pf(min=0, max=1) = 0.9 "Power factor"
annotation (Dialog(group="AC-Conversion"));
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Electrical/AC/OnePhase/Storage/Battery.mo
Expand Up @@ -12,7 +12,7 @@ model Battery "Simple model of a battery"
parameter Real SOC_start(start=0.1) "Initial charge";
parameter Modelica.SIunits.Energy EMax(min=0, displayUnit="kWh")
"Maximum available charge";
parameter Modelica.SIunits.Voltage V_nominal(start = 120)
parameter Modelica.SIunits.Voltage V_nominal(start = 110)
"Nominal voltage (V_nominal >= 0)";
parameter Boolean linearized=false
"If =true introduce a linearization in the load";
Expand Down
@@ -1,6 +1,6 @@
within Buildings.Electrical.Transmission.BaseClasses;
partial model PartialNetwork "Partial model that represent an electric network"
parameter Modelica.SIunits.Voltage V_nominal(min=0, start=120)
parameter Modelica.SIunits.Voltage V_nominal(min=0, start = 110)
"Nominal voltage of the lines in the network";
replaceable parameter Buildings.Electrical.Transmission.Grids.PartialGrid grid
"Record that describe the grid with the number of nodes, links, connections, etc."
Expand Down
Expand Up @@ -10,7 +10,7 @@ partial model PartialTwoPortRLC
"Temperature constant (R_actual = R*(M + T_heatPort)/(M + T_ref))";
parameter Modelica.SIunits.Capacitance C "Capacity";
parameter Modelica.SIunits.Inductance L "Inductance";
parameter Modelica.SIunits.Voltage V_nominal(min=0, start=120)
parameter Modelica.SIunits.Voltage V_nominal(min=0, start = 110)
"Nominal voltage (V_nominal >= 0)" annotation(Dialog(group="Nominal conditions"));
Modelica.SIunits.Resistance R_actual
"Actual resistance = R*(M + T_heatPort)/(M + T_ref) ";
Expand Down

0 comments on commit a853567

Please sign in to comment.