Corrected annotation for #2550 (#2552)

* Corrected annotation for #2550 * Added constraining clause to avoid warning in Optimica * Removed annotation * Excluded models from test See https://travis-ci.com/github/lbl-srg/modelica-buildings/jobs/519052046#L481
lbl-srg · Jun 25, 2021 · dbc2c36 · dbc2c36
1 parent b09ef28
commit dbc2c36
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/Buildings/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstanceReverseFlow.mo b/Buildings/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstanceReverseFlow.mo
@@ -4,8 +4,10 @@ model MixingVolumeTraceSubstanceReverseFlow
   extends
     Buildings.Fluid.MixingVolumes.Validation.BaseClasses.MixingVolumeReverseFlow(
     Medium(extraPropertiesNames={"CO2"}),
-    volDyn(use_C_flow=true),
-    volSte(use_C_flow=true),
+    redeclare replaceable Buildings.Fluid.MixingVolumes.MixingVolume volDyn
+      constrainedby Buildings.Fluid.MixingVolumes.MixingVolume(use_C_flow=true),
+    redeclare replaceable Buildings.Fluid.MixingVolumes.MixingVolume volSte
+      constrainedby Buildings.Fluid.MixingVolumes.MixingVolume(use_C_flow=true),
     gain(k=1/1000),
     bou(C={0.003}));
 
@@ -28,6 +30,10 @@ The mass flow rate starts positive and reverses its direction at <i>t=5</i> seco
 </html>", revisions="<html>
 <ul>
 <li>
+June 24, 2021, by Michael Wetter:<br/>
+Added constraining clause to avoid warning in Optimica.
+</li>
+<li>
 December 7, 2016, by Michael Wetter:<br/>
 Set <code>bou(C={0.003})</code> to avoid a negative value for
 <code>C_outflow</code> of the steady state volume.<br/>

diff --git a/Buildings/Resources/Scripts/BuildingsPy/conf.json b/Buildings/Resources/Scripts/BuildingsPy/conf.json
@@ -26,6 +26,20 @@
     },
     "model_name": "Buildings.Fluid.Examples.FlowSystem.Simplified2"
   },
+  {
+    "optimica": {
+      "simulate": false,
+      "comment" : "RuntimeError, see https://travis-ci.com/github/lbl-srg/modelica-buildings/jobs/519052046#L481"
+    },
+  "model_name": "Buildings.ThermalZones.Detailed.Examples.FFD.Tutorial.MixedConvection"
+  },
+  {
+    "optimica": {
+      "simulate": false,
+      "comment" : "RuntimeError, see https://travis-ci.com/github/lbl-srg/modelica-buildings/jobs/519052046#L481"
+    },
+  "model_name": "Buildings.ThermalZones.Detailed.Examples.FFD.ForcedConvection"
+  },
   {
     "jmodelica": {
       "simulate": false

diff --git a/Buildings/ThermalZones/Detailed/BaseClasses/RadiationTemperature.mo b/Buildings/ThermalZones/Detailed/BaseClasses/RadiationTemperature.mo
@@ -15,8 +15,7 @@ model RadiationTemperature "Radiative temperature of the room"
     haveShade "Heat port that connects to shade"
                                        annotation (Placement(transformation(extent={{230,28},
             {250,48}})));
-  parameter Boolean haveShade "Set to true if the windows have a shade"
-  annotation(HideResult="true");
+  parameter Boolean haveShade "Set to true if the windows have a shade";
 
   Modelica.Blocks.Interfaces.RealInput uSha[NConExtWin](each min=0, each max=1) if
        haveShade