Merge pull request #1779 from ibpsa/issue1778_miscFix

Issue1778 misc fix

IBPSA/Fluid/FMI/UsersGuide.mo

@@ -249,7 +249,7 @@ The model
 <a href=\"modelica://IBPSA.Fluid.Movers.FlowControlled_m_flow\">
 IBPSA.Fluid.Movers.FlowControlled_m_flow</a>
 cannot be exported as an FMU.
-This is because it assignes the mass flow rate.
+This is because it assigns the mass flow rate.
 However, the input connector
 <a href=\"modelica://IBPSA.Fluid.FMI.Interfaces.Inlet\">
 IBPSA.Fluid.FMI.Interfaces.Inlet</a>

IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo

@@ -422,7 +422,8 @@ Set nominalValuesDefineDefaultPressureCurve=true to suppress this warning.",
 "*** Warning in " + getInstanceName() +
 ": Mover has per.etaHydMet=.Power_VolumeFlowRate or per.etaHydMet=.EulerNumber.
 This requires per.pressure to be provided.
-Because it is not, the model overrides this setting by using per.etaHydMet=.NotProvided.",
+Because it is not, the model overrides this setting by using per.etaHydMet=.NotProvided.
+Also consider using models under Movers.Preconfigured which autopopulate a pressure curve.",
          level=AssertionLevel.warning);
 
   assert(per.havePressureCurve or per.haveWMot_nominal or
@@ -433,7 +434,8 @@ Because it is not, the model overrides this setting by using per.etaHydMet=.NotP
 "*** Warning in " + getInstanceName() +
 ": Mover has per.etaMotMet=.Efficiency_MotorPartLoadRatio or per.etaMotMet=.GenericCurve.
 This requires per.WMot_nominal or per.pressure to be provided. Because neither is provided,
-the model overrides this setting and by using per.etaMotMet=.NotProvided.",
+the model overrides this setting and by using per.etaMotMet=.NotProvided.
+Also consider using models under Movers.Preconfigured which autopopulate a pressure curve.",
          level=AssertionLevel.warning);
 
   assert(per.powerOrEfficiencyIsHydraulic or

IBPSA/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/HeaterCooler_u.mos

@@ -1,24 +1,18 @@
 simulateModel("IBPSA.Fluid.HeatExchangers.Validation.HeaterCooler_u", method="CVode", tolerance=1e-6, stopTime=1200, resultFile="HeaterCooler_u");
-createPlot(id = 1,
- position = {78, 39, 400, 444},
- y = {"con1.u_s", "con1.u_m", "con2.u_m"},
- range = {0.0, 1200.0, 35.0, 15.0},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- grid = true,
- color = true,
- leftTitleType = 1,
- bottomTitleType = 1);
-createPlot(id = 20,
- position = {78, 39, 400, 219},
- y = {"con1.y", "con2.y"},
- range = {0.0, 1200.0, 1.5, -0.5},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- grid = true,
- color = true,
- subPlot = 2,
- leftTitleType = 1,
- bottomTitleType = 1);
+createPlot(id=1,
+ position={125, 65, 400, 447},
+ y={"con1.u_s", "con1.u_m", "con2.u_m"},
+ range={0.0, 1200.0, 290.0, 305.0},
+ grid=true,
+ subPlot=101,
+ colors={{28,108,200}, {238,46,47}, {0,140,72}},
+ timeUnit="s");
+createPlot(id=1,
+ position={125, 65, 400, 447},
+ y={"con1.y", "con2.y"},
+ range={0.0, 1200.0, -0.5, 1.5},
+ grid=true,
+ subPlot=102,
+ colors={{28,108,200}, {238,46,47}},
+ timeUnit="s");
+

IBPSA/Resources/Scripts/Dymola/Fluid/Storage/Validation/StratifiedLoadingUnloading.mos

@@ -1,37 +1,45 @@
 simulateModel("IBPSA.Fluid.Storage.Validation.StratifiedLoadingUnloading", tolerance=1e-6, stopTime=14400, method="CVode", resultFile="StratifiedLoadingUnloading");
-createPlot(id = 1,
- position = {10, 30, 719, 600},
- filename = "StratifiedLoadingUnloading.mat",
- y = {"tanEnh.vol[1].T", "tanEnh.vol[2].T", "tanEnh.vol[3].T", "tanEnh.vol[4].T", "tanEnh.vol[5].T", "tanEnh.vol[6].T", "tanEnh.vol[7].T"},
- range = {0, 15000.0, 55.0, 15.0},
+createPlot(id=1,
+ position={10, 30, 719, 603},
+ y={"tanEnh.vol[1].T", "tanEnh.vol[2].T", "tanEnh.vol[3].T", "tanEnh.vol[4].T", "tanEnh.vol[5].T", "tanEnh.vol[6].T", "tanEnh.vol[7].T"},
+ range={0.0, 15000.0, 10.0, 50.0},
+ subPlot=101,
+ colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}, {244,125,35}},
+ timeUnit="s",
+ displayUnits={"degC", "degC", "degC", "degC", "degC", "degC", "degC"},
  autoscale = true,
  autoerase = true,
  autoreplot = true,
  grid = true,
  color = true,
  leftTitleType = 1,
  bottomTitleType = 1);
-createPlot(id = 1,
- position = {10, 30, 719, 200},
- y = {"dHTan.y", "dHTanEnh.y"},
- range = {0, 14500.0, 60.0, 10.0},
+createPlot(id=1,
+ position={10, 30, 719, 603},
+ y={"dHTan.y", "dHTanEnh.y"},
+ range={0.0, 15000.0, -5000000.0, 10000000.0},
+ subPlot=102,
+ colors={{28,108,200}, {238,46,47}},
+ timeUnit="s",
  autoscale = true,
  autoerase = true,
  autoreplot = true,
  grid = true,
  color = true,
- subPlot = 3,
  leftTitleType = 1,
  bottomTitleType = 1);
-createPlot(id = 1,
-  position = {10, 30, 719, 200},
- y = {"tan.vol[1].T", "tan.vol[2].T", "tan.vol[3].T", "tan.vol[4].T", "tan.vol[5].T", "tan.vol[6].T", "tan.vol[7].T"},
- range = {0, 14500.0, 60.0, 10.0},
+createPlot(id=1,
+ position={10, 30, 719, 603},
+ y={"tan.vol[1].T", "tan.vol[2].T", "tan.vol[3].T", "tan.vol[4].T", "tan.vol[5].T","tan.vol[6].T", "tan.vol[7].T"},
+ range={0.0, 15000.0, 10.0, 50.0},
+ subPlot=103,
+ colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}, {244,125,35}},
+ timeUnit="s",
+ displayUnits={"degC", "degC", "degC", "degC", "degC", "degC", "degC"},
  autoscale = true,
  autoerase = true,
  autoreplot = true,
  grid = true,
  color = true,
- subPlot = 2,
  leftTitleType = 1,
  bottomTitleType = 1);