Merge pull request modelica#4147 from HansOlsson/FixAnnotations

Fix annotations
qlambert-pro · Sep 12, 2023 · 438d8f8 · 438d8f8
2 parents ac72d17 + cfe437c
commit 438d8f8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Integrator.mo b/Modelica/Electrical/Analog/Examples/OpAmps/OpAmpCircuits/Integrator.mo
@@ -40,7 +40,7 @@ equation
             points={{-80.0,78.0},{-80.0,-90.0}},
             color={192,192,192}),
           Line(
-            points=DynamicSelect({{-80.0,-80.0},{80.0,80.0}}, if use_reset then {{-80.0,-80.0},{60.0,60.0},{60.0,-80.0},{80.0,-60.0}} else {{-80.0,-80.0},{80.0,80.0}}),
+            points={{-80.0,-80.0},{80.0,80.0}},
             color={0,0,127}),
           Line(
             points={{-90.0,-80.0},{82.0,-80.0}},

diff --git a/Modelica/Fluid/Dissipation.mo b/Modelica/Fluid/Dissipation.mo
@@ -970,7 +970,7 @@ This record is used as <strong>input record</strong> for the heat transfer funct
           Modelica.Fluid.Dissipation.Utilities.Records.General.FluidProperties;
         SI.DynamicViscosity eta_wall
           "Dynamic viscosity of fluid at wall temperature" annotation (Dialog(group=
-                "Fluid properties", enable= target == 2));
+                "Fluid properties"));
 
         //input variable (mass flow rate)
         SI.MassFlowRate m_flow annotation (Dialog(group="Input"));
@@ -10381,7 +10381,9 @@ documentation available in this package.
               annotation (Dialog);
             input Real epsilon_A(min=0,max=1)
               "Void fraction (cross sectional averaged)"
-              annotation (Dialog(enable=not (twoPhaseDensityApproach == Modelica.Fluid.Dissipation.Utilities.Types.TwoPhaseDensityApproach.Homogeneous)));
+              annotation (Dialog(enable=true));
+            // It should be enable=not (voidFractionApproach == Modelica.Fluid.Dissipation.Utilities.Types.VoidFractionApproach.Homogeneous)
+            // But then there is no value for epsilon_A
             input Real x_flow(min=0,max=1) "Mass flow rate quality" annotation (Dialog);
 
             output SI.Density rho_2ph "Mean density of two phase flow";
@@ -12464,11 +12466,11 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
           extends Modelica.Icons.Record;
 
           SI.Density rho_m "Mean density of ideal gas"
-            annotation (Dialog(group="Fluid properties", enable=useMeanDensity));
+            annotation (Dialog(group="Fluid properties"));
           SI.Temperature T_m "Mean temperature of ideal gas"
-            annotation (Dialog(group="Fluid properties", enable=not (useMeanDensity)));
+            annotation (Dialog(group="Fluid properties"));
           SI.Pressure p_m "Mean pressure of ideal gas"
-            annotation (Dialog(group="Fluid properties", enable=not (useMeanDensity)));
+            annotation (Dialog(group="Fluid properties"));
 
         end IdealGas_var;
 
@@ -12605,11 +12607,11 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
             "Coefficient for pressure loss law [(Pa)^2/{(kg/s)^exp*K}]"
             annotation (Dialog(group="Generic variables"));
           SI.Density rho_m=p_m/(R_s*T_m) "Mean density of ideal gas"
-            annotation (Dialog(group="Fluid properties", enable=useMeanDensity));
+            annotation (Dialog(group="Fluid properties"));
           SI.Temperature T_m "Mean temperature of ideal gas"
-            annotation (Dialog(group="Fluid properties", enable=not (useMeanDensity)));
+            annotation (Dialog(group="Fluid properties"));
           SI.Pressure p_m "Mean pressure of ideal gas"
-            annotation (Dialog(group="Fluid properties", enable=not (useMeanDensity)));
+            annotation (Dialog(group="Fluid properties"));
 
         end IdealGas;
 
@@ -12663,17 +12665,17 @@ In the picture below the input x is increased from 0 to 1. The range of interpol
           SI.Density rho_l "Density of liquid"
             annotation (Dialog(group="Fluid properties"));
           SI.Density rho_g "Density of gas" annotation (Dialog(group=
-                  "Fluid properties", enable= (KC == 1 or KC == 2)));
+                  "Fluid properties"));
           SI.DynamicViscosity eta_l "Dynamic viscosity of liquid"
             annotation (Dialog(group="Fluid properties"));
           SI.DynamicViscosity eta_g "Dynamic viscosity of gas" annotation (
-              Dialog(group="Fluid properties", enable= (KC == 1 or KC == 2)));
+              Dialog(group="Fluid properties"));
           SI.MassFraction x=0.5 "Vapour fraction"
             annotation (Dialog(group="Fluid properties"));
           SI.SurfaceTension sigma "Surface Tension" annotation (Dialog(group=
-                  "Fluid properties", enable= DP_fric == 1));
+                  "Fluid properties"));
           Real n=0.25 "Exponent in Blasius equation (0.2-0.25)" annotation (Dialog(
-                group="others", enable= DP_fric == 2));
+                group="others"));
         end TwoPhaseFlow;
       end General;
 

diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Rectangle.mo b/Modelica/Mechanics/MultiBody/Visualizers/Rectangle.mo
@@ -19,7 +19,7 @@ model Rectangle "Visualizing a planar rectangular surface"
     "= true: 3D model will be displayed without faces"
     annotation (Dialog(enable=animation, group="Material properties"),choices(checkBox=true));
   input Modelica.Mechanics.MultiBody.Types.RealColor color={0,128,255}
-    "Color of surface" annotation(Dialog(enable=animation and not multiColoredSurface,colorSelector=true,group="Material properties"));
+    "Color of surface" annotation(Dialog(enable=animation,colorSelector=true,group="Material properties"));
   input Types.SpecularCoefficient specularCoefficient = 0.7
     "Reflection of ambient light (= 0: light is completely absorbed)" annotation(Dialog(enable=animation,group="Material properties"));
   input Real transparency=0