Skip to content

Commit

Permalink
Corrected white space
Browse files Browse the repository at this point in the history
  • Loading branch information
mwetter committed Sep 20, 2024
1 parent 843fa95 commit 007cd61
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 21 deletions.
8 changes: 4 additions & 4 deletions IBPSA/Fluid/Examples/FlowSystem/Simplified4.mo
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ model Simplified4 "Removed valve dynamics"
valSouth(use_strokeTime =false),
pmpNorth(
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
use_riseTime =false),
use_riseTime=false),
pmpSouth(
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
use_riseTime =false),
use_riseTime=false),
valSouth1(each use_strokeTime=false),
valSouth2(each use_strokeTime=false),
valNorth1(each use_strokeTime=false),
valNorth2(each use_strokeTime=false),
pumpHea(use_riseTime =false),
pumpCoo(use_riseTime =false),
pumpHea(use_riseTime=false),
pumpCoo(use_riseTime=false),
valCoo(use_strokeTime=false),
valHea(use_strokeTime=false));
annotation (Documentation(info="<html>
Expand Down
3 changes: 1 addition & 2 deletions IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ block Fan "Declaration of an FMU that exports a fan"
nominalValuesDefineDefaultPressureCurve=true,
final m_flow_nominal=m_flow_nominal,
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
final use_riseTime =
false));
final use_riseTime=false));

parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01
"Nominal mass flow rate";
Expand Down
6 changes: 3 additions & 3 deletions IBPSA/Fluid/Movers/Validation/ComparePowerHydraulic.mo
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ model ComparePowerHydraulic
per=per,
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
addPowerToMedium=false,
use_riseTime =false),
use_riseTime=false),
redeclare IBPSA.Fluid.Movers.SpeedControlled_y mov2(
redeclare final package Medium = Medium,
per(
Expand All @@ -23,7 +23,7 @@ model ComparePowerHydraulic
etaMotMet=per.etaMotMet),
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
addPowerToMedium=false,
use_riseTime =false),
use_riseTime=false),
redeclare IBPSA.Fluid.Movers.SpeedControlled_y mov3(
redeclare final package Medium = Medium,
per(
Expand All @@ -34,7 +34,7 @@ model ComparePowerHydraulic
etaMotMet=per.etaMotMet),
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
addPowerToMedium=false,
use_riseTime =false));
use_riseTime=false));

final parameter IBPSA.Fluid.Movers.BaseClasses.Euler.peak peak =
IBPSA.Fluid.Movers.BaseClasses.Euler.getPeak(
Expand Down
6 changes: 3 additions & 3 deletions IBPSA/Fluid/Movers/Validation/ComparePowerInput.mo
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@ model ComparePowerInput
per=per,
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
addPowerToMedium=false,
use_riseTime =false),
use_riseTime=false),
redeclare IBPSA.Fluid.Movers.FlowControlled_dp mov2(
redeclare final package Medium = Medium,
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
per=per,
addPowerToMedium=false,
m_flow_nominal=m_flow_nominal,
dp_nominal=dp_nominal,
use_riseTime =false),
use_riseTime=false),
redeclare IBPSA.Fluid.Movers.FlowControlled_m_flow mov3(
redeclare final package Medium = Medium,
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
per=per,
addPowerToMedium=false,
m_flow_nominal=m_flow_nominal,
dp_nominal=dp_nominal,
use_riseTime =false),
use_riseTime=false),
ramDam(height=-0.5));
Modelica.Blocks.Sources.RealExpression exp_dp(y=mov1.dpMachine)
"Expression to impose the same pressure rise"
Expand Down
2 changes: 1 addition & 1 deletion IBPSA/Fluid/Movers/Validation/ControlledFlowMachine.mo
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ model ControlledFlowMachine "Fans with different control signals as input"
fan3(
addPowerToMedium=false,
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
use_riseTime =false));
use_riseTime=false));

annotation (
experiment(Tolerance=1e-6, StopTime=600),
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/Movers/Validation/FlowControlled_dp.mo
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ model FlowControlled_dp "Fan with zero mass flow rate and head as input"
redeclare package Medium = Medium,
m_flow_nominal=m_flow_nominal,
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
use_riseTime =false),
use_riseTime=false),
redeclare IBPSA.Fluid.Movers.FlowControlled_dp floMacDyn(
nominalValuesDefineDefaultPressureCurve=true,
redeclare package Medium = Medium,
m_flow_nominal=m_flow_nominal,
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
use_riseTime =false));
use_riseTime=false));

equation
connect(gain.y, floMacSta.dp_in) annotation (Line(
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/Movers/Validation/FlowControlled_m_flow.mo
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ model FlowControlled_m_flow
redeclare package Medium = Medium,
m_flow_nominal=m_flow_nominal,
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
use_riseTime =false),
use_riseTime=false),
redeclare IBPSA.Fluid.Movers.FlowControlled_m_flow floMacDyn(
nominalValuesDefineDefaultPressureCurve=true,
redeclare package Medium = Medium,
m_flow_nominal=m_flow_nominal,
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
use_riseTime =false));
use_riseTime=false));

equation
connect(gain.y, floMacSta.m_flow_in) annotation (Line(
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/Movers/Validation/Pump_stratos.mo
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ model Pump_stratos "Stratos pumps with speed as input"
redeclare IBPSA.Fluid.Movers.SpeedControlled_y floMacSta(
redeclare package Medium = Medium,
per=per,
use_riseTime =false),
use_riseTime=false),
redeclare IBPSA.Fluid.Movers.SpeedControlled_y floMacDyn(
redeclare package Medium = Medium,
per=per,
use_riseTime =false));
use_riseTime=false));
parameter Data.Pumps.Wilo.Stratos25slash1to6 per
annotation (Placement(transformation(extent={{100,100},{120,120}})));
equation
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/Movers/Validation/SpeedControlled_y.mo
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ model SpeedControlled_y
per(pressure(V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2,
dp={2*dp_nominal,dp_nominal,0})),
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
use_riseTime =false),
use_riseTime=false),
redeclare IBPSA.Fluid.Movers.SpeedControlled_y floMacDyn(
redeclare package Medium = Medium,
per(pressure(V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2,
dp={2*dp_nominal,dp_nominal,0})),
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
use_riseTime =false));
use_riseTime=false));

equation
connect(gain.y, floMacDyn.y) annotation (Line(
Expand Down

0 comments on commit 007cd61

Please sign in to comment.