diff --git a/IBPSA/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo b/IBPSA/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo index c0ecfad4c5..67536efe4c 100644 --- a/IBPSA/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo +++ b/IBPSA/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo @@ -3,31 +3,31 @@ partial model PartialThreeWayValve "Partial three way valve" extends IBPSA.Fluid.BaseClasses.PartialThreeWayResistance( m_flow_small=m_flow_nominal*1e-4, final mDyn_flow_nominal=m_flow_nominal, - redeclare replaceable IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve - res1 constrainedby IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve( - deltaM=deltaM, - from_dp=from_dp, - final linearized=linearized[1], - final homotopyInitialization=homotopyInitialization, - final CvData=IBPSA.Fluid.Types.CvTypes.OpPoint, - final m_flow_nominal=m_flow_nominal, - final dpValve_nominal=dpValve_nominal, - final dpFixed_nominal=dpFixed_nominal[1], - final use_strokeTime=false, - final strokeTime=strokeTime), + redeclare replaceable IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve res1 + constrainedby IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve( + deltaM=deltaM, + from_dp=from_dp, + final linearized=linearized[1], + final homotopyInitialization=homotopyInitialization, + final CvData=IBPSA.Fluid.Types.CvTypes.OpPoint, + final m_flow_nominal=m_flow_nominal, + final dpValve_nominal=dpValve_nominal, + final dpFixed_nominal=dpFixed_nominal[1], + final use_strokeTime=false, + final strokeTime=strokeTime), redeclare FixedResistances.LosslessPipe res2(m_flow_nominal=m_flow_nominal), - redeclare replaceable IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve - res3 constrainedby IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve( - deltaM=deltaM, - from_dp=from_dp, - final linearized=linearized[2], - final homotopyInitialization=homotopyInitialization, - final CvData=IBPSA.Fluid.Types.CvTypes.OpPoint, - final m_flow_nominal=m_flow_nominal, - final dpValve_nominal=dpValve_nominal/fraK^2, - final dpFixed_nominal=dpFixed_nominal[2], - final use_strokeTime=false, - final strokeTime=strokeTime)); + redeclare replaceable IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve res3 + constrainedby IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve( + deltaM=deltaM, + from_dp=from_dp, + final linearized=linearized[2], + final homotopyInitialization=homotopyInitialization, + final CvData=IBPSA.Fluid.Types.CvTypes.OpPoint, + final m_flow_nominal=m_flow_nominal, + final dpValve_nominal=dpValve_nominal/fraK^2, + final dpFixed_nominal=dpFixed_nominal[2], + final use_strokeTime=false, + final strokeTime=strokeTime)); extends IBPSA.Fluid.Actuators.BaseClasses.ActuatorSignal; extends IBPSA.Fluid.Actuators.BaseClasses.ValveParameters( rhoStd=Medium.density_pTX(101325, 273.15+4, Medium.X_default));