From a39ccf71da1d9a18d914dfa385528f5348aed923 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Tue, 14 Apr 2020 08:26:25 -0700
Subject: [PATCH] Merged IBPSA, branch
 IBPSASync_issue1341_homotopyInitialization [ci skip]

---
 .../BaseClasses/PowerLawResistance.mo         | 16 +++++++++---
 .../BaseClasses/PartialThreeWayValve.mo       | 17 +++++++++---
 .../Fluid/BaseClasses/PartialResistance.mo    | 17 ++++++++++--
 .../Fluid/Chillers/BaseClasses/Carnot.mo      | 15 ++++++++---
 .../BaseClasses/PlugFlowCore.mo               | 26 ++++++++++++++-----
 Buildings/Fluid/FixedResistances/Junction.mo  | 15 +++++++++--
 .../Fluid/FixedResistances/PlugFlowPipe.mo    | 19 +++++++++++---
 .../ActiveBeams/BaseClasses/Convector.mo      | 19 +++++++++++---
 .../HeatExchangers/ActiveBeams/Cooling.mo     | 16 +++++++++---
 .../BaseClasses/PartialPrescribedOutlet.mo    | 16 +++++++++---
 .../Radiators/RadiatorEN442_2.mo              | 14 ++++++++--
 .../BaseClasses/PartialWaterToWater.mo        | 16 ++++++++++--
 .../Interfaces/EightPortHeatMassExchanger.mo  | 21 ++++++++++-----
 .../Interfaces/FourPortHeatMassExchanger.mo   | 16 +++++++++---
 .../StaticFourPortHeatMassExchanger.mo        | 16 ++++++++++--
 .../StaticTwoPortHeatMassExchanger.mo         | 16 ++++++++++--
 .../Interfaces/TwoPortHeatMassExchanger.mo    | 16 +++++++++---
 .../BaseClasses/FlowMachineInterface.mo       | 16 +++++++++---
 .../Movers/BaseClasses/PowerInterface.mo      | 15 +++++++++--
 .../BaseClasses/IndirectTankHeatExchanger.mo  | 17 +++++++++---
 bin/verifyFiles.py                            |  3 ++-
 21 files changed, 276 insertions(+), 66 deletions(-)
diff --git a/Buildings/Airflow/Multizone/BaseClasses/PowerLawResistance.mo b/Buildings/Airflow/Multizone/BaseClasses/PowerLawResistance.mo
index dbaaec6ec96..845764840f6 100644
--- a/Buildings/Airflow/Multizone/BaseClasses/PowerLawResistance.mo
+++ b/Buildings/Airflow/Multizone/BaseClasses/PowerLawResistance.mo
@@ -5,6 +5,9 @@ partial model PowerLawResistance "Flow resistance that uses the power law"
     final m_flow_nominal=rho_default*k*dp_turbulent);
   extends Buildings.Airflow.Multizone.BaseClasses.ErrorControl;
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   parameter Real m(min=0.5, max=1)
     "Flow exponent, m=0.5 for turbulent, m=1 for laminar";
   parameter Boolean useDefaultProperties=true
@@ -14,9 +17,6 @@ partial model PowerLawResistance "Flow resistance that uses the power law"
     "Pressure difference where laminar and turbulent flow relation coincide. Recommended = 0.1"
     annotation(Dialog(tab="Advanced"));
 
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
-
   Modelica.SIunits.VolumeFlowRate V_flow
     "Volume flow rate through the component";
   Modelica.SIunits.Velocity v(nominal=1) "Average velocity";
@@ -54,6 +54,10 @@ protected
     "Air mass exchanged (for purpose of error control only)";
 initial equation
   mExc=0;
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
+
 equation
   if forceErrorControlOnFlow then
     der(mExc) = port_a.m_flow;
@@ -128,6 +132,12 @@ The model is used as a base for the interzonal air flow models.
 revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 June 24, 2018, by Michael Wetter:<br/>
 Removed parameter <code>A</code> because
 <a href=\"modelica://Buildings.Airflow.Multizone.EffectiveAirLeakageArea\">
diff --git a/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo b/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
index 0a7d467d49a..a823e69aaa4 100644
--- a/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
+++ b/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
@@ -35,6 +35,9 @@ partial model PartialThreeWayValve "Partial three way valve"
     extends Buildings.Fluid.Actuators.BaseClasses.ValveParameters(
       rhoStd=Medium.density_pTX(101325, 273.15+4, Medium.X_default));
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   parameter Modelica.SIunits.PressureDifference dpFixed_nominal[2](each displayUnit="Pa",
                                                          each min=0) = {0, 0}
     "Nominal pressure drop of pipes and other equipment in flow legs at port_1 and port_3"
@@ -52,15 +55,17 @@ partial model PartialThreeWayValve "Partial three way valve"
     "= true, use linear relation between m_flow and dp for any flow rate"
     annotation(Dialog(tab="Advanced"));
 
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
-
 protected
   Modelica.Blocks.Math.Feedback inv "Inversion of control signal"
     annotation (Placement(transformation(extent={{-74,40},{-62,52}})));
   Modelica.Blocks.Sources.Constant uni(final k=1)
     "Outputs one for bypass valve"
     annotation (Placement(transformation(extent={{-92,40},{-80,52}})));
+initial equation
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
+
 equation
   connect(uni.y, inv.u1)
     annotation (Line(points={{-79.4,46},{-72.8,46}},
@@ -145,6 +150,12 @@ for details regarding the valve implementation.
 </html>", revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 November 5, 2019, by Michael Wetter:<br/>
 Moved assignment of leakage from <a href=\"modelica://Buildings.Fluid.Actuators.BaseClasses.PartialThreeWayValve\">
 Buildings.Fluid.Actuators.BaseClasses.PartialThreeWayValve</a>
diff --git a/Buildings/Fluid/BaseClasses/PartialResistance.mo b/Buildings/Fluid/BaseClasses/PartialResistance.mo
index 549dcef9fe2..cb48be9c301 100644
--- a/Buildings/Fluid/BaseClasses/PartialResistance.mo
+++ b/Buildings/Fluid/BaseClasses/PartialResistance.mo
@@ -9,6 +9,9 @@ partial model PartialResistance "Partial model for a hydraulic resistance"
           then m_flow_nominal_pos else 1),
      final m_flow_small = 1E-4*abs(m_flow_nominal));
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   parameter Boolean from_dp = false
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Evaluate=true, Dialog(tab="Advanced"));
@@ -16,8 +19,7 @@ partial model PartialResistance "Partial model for a hydraulic resistance"
   parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")
     "Pressure drop at nominal mass flow rate"
     annotation(Dialog(group = "Nominal condition"));
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
+
   parameter Boolean linearized = false
     "= true, use linear relation between m_flow and dp for any flow rate"
     annotation(Evaluate=true, Dialog(tab="Advanced"));
@@ -35,6 +37,11 @@ protected
     "Absolute value of nominal flow rate";
   final parameter Modelica.SIunits.PressureDifference dp_nominal_pos(displayUnit="Pa") = abs(dp_nominal)
     "Absolute value of nominal pressure difference";
+initial equation
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
+
 equation
   // Isenthalpic state transformation (no storage and no loss of energy)
   port_a.h_outflow = if allowFlowReversal then inStream(port_b.h_outflow) else Medium.h_default;
@@ -98,6 +105,12 @@ this base class.
 </html>", revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 February 26, 2020, by Michael Wetter:<br/>
 Changed icon to display its operating state.<br/>
 This is for
diff --git a/Buildings/Fluid/Chillers/BaseClasses/Carnot.mo b/Buildings/Fluid/Chillers/BaseClasses/Carnot.mo
index 7e1edfd136d..942d6c53da7 100644
--- a/Buildings/Fluid/Chillers/BaseClasses/Carnot.mo
+++ b/Buildings/Fluid/Chillers/BaseClasses/Carnot.mo
@@ -4,6 +4,9 @@ partial model Carnot
     m1_flow_nominal = QCon_flow_nominal/cp1_default/dTCon_nominal,
     m2_flow_nominal = QEva_flow_nominal/cp2_default/dTEva_nominal);
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal(max=0)
     "Nominal cooling heat flow rate (QEva_flow_nominal < 0)"
     annotation (Dialog(group="Nominal condition"));
@@ -58,9 +61,6 @@ partial model Carnot
     "Temperature difference between refrigerant and working fluid outlet in evaporator"
     annotation (Dialog(group="Efficiency"));
 
-  parameter Boolean homotopyInitialization=true "= true, use homotopy method"
-    annotation (Dialog(tab="Advanced"));
-
   parameter Boolean from_dp1=false
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Dialog(tab="Flow resistance", group="Condenser"));
@@ -229,6 +229,9 @@ initial equation
          a=a, x=1)-1) < 0.01, "Efficiency curve is wrong. Need etaPL(y=1)=1.");
   assert(etaCarnot_nominal_internal < 1,   "Parameters lead to etaCarnot_nominal > 1. Check parameters.");
 
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
 
 equation
   connect(port_a2, eva.port_a)
@@ -382,6 +385,12 @@ and the part load ratio are set up.
 </html>", revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 September 12, 2019, by Michael Wetter:<br/>
 Corrected value of <code>evaluate_etaPL</code> and how it is used.
 This correction only affects protected variables and does not affect the results.<br/>
diff --git a/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo b/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo
index c917f05f63a..b2471989b45 100644
--- a/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo
+++ b/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo
@@ -3,6 +3,9 @@ model PlugFlowCore
   "Pipe model using spatialDistribution for temperature delay with modified delay tracker"
   extends Buildings.Fluid.Interfaces.PartialTwoPort;
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   parameter Modelica.SIunits.Length dh
     "Hydraulic diameter (assuming a round cross section area)";
 
@@ -53,8 +56,6 @@ model PlugFlowCore
   parameter Real ReC=4000
     "Reynolds number where transition to turbulent starts";
 
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
   parameter Boolean linearized = false
     "= true, use linear relation between m_flow and dp for any flow rate"
     annotation(Evaluate=true, Dialog(tab="Advanced"));
@@ -134,6 +135,11 @@ protected
     "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)"
     annotation (Dialog(group="Advanced"));
 
+initial equation
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
+
 equation
   connect(senMasFlo.m_flow, timDel.m_flow) annotation (Line(
       points={{-40,-11},{-40,-40},{-12,-40}},
@@ -201,6 +207,12 @@ equation
     Documentation(revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 October 20, 2017, by Michael Wetter:<br/>
 Replaced model that lumps flow resistance and transport delays
 with two separate models, as these are physically distinct processes.
@@ -230,7 +242,7 @@ for the transport delay of the fluid.
 <p>
 The
 <code>spatialDistribution</code> operator is used for the temperature wave propagation
-through the length of the pipe. This operator is contained in 
+through the length of the pipe. This operator is contained in
 <a href=\"modelica://Buildings.Fluid.FixedResistances.BaseClasses.PlugFlow\">BaseClasses.PlugFlow</a>.
 </p>
 <p>
@@ -238,8 +250,8 @@ This model does not include thermal inertia of the pipe wall.
 The wall inertia is implemented in
 <a href=\"modelica://Buildings.Fluid.FixedResistances.PlugFlowPipe\">PlugFlowPipe</a>, which uses this model.
 <br/>
-The removal of the thermal inertia with a mixing volume can be desirable in the 
-case where mixing volumes are added manually at the pipe junctions. 
+The removal of the thermal inertia with a mixing volume can be desirable in the
+case where mixing volumes are added manually at the pipe junctions.
 </p>
 <p>
 The model
@@ -254,10 +266,10 @@ Full details on the model implementation and experimental validation can be foun
 in:
 </p>
 <p>
-van der Heijde, B., Fuchs, M., Ribas Tugores, C., Schweiger, G., Sartor, K., Basciotti, D., M&uuml;ller, 
+van der Heijde, B., Fuchs, M., Ribas Tugores, C., Schweiger, G., Sartor, K., Basciotti, D., M&uuml;ller,
 D., Nytsch-Geusen, C., Wetter, M. and Helsen, L. (2017).<br/>
 Dynamic equation-based thermo-hydraulic pipe model for district heating and cooling systems.<br/>
-<i>Energy Conversion and Management</i>, vol. 151, p. 158-169. 
+<i>Energy Conversion and Management</i>, vol. 151, p. 158-169.
 <a href=\"https://doi.org/10.1016/j.enconman.2017.08.072\">doi: 10.1016/j.enconman.2017.08.072</a>.</p>
 </html>"));
 end PlugFlowCore;
diff --git a/Buildings/Fluid/FixedResistances/Junction.mo b/Buildings/Fluid/FixedResistances/Junction.mo
index 83f7acc3c52..ea0469999d4 100644
--- a/Buildings/Fluid/FixedResistances/Junction.mo
+++ b/Buildings/Fluid/FixedResistances/Junction.mo
@@ -26,6 +26,9 @@ model Junction
       homotopyInitialization=homotopyInitialization,
       deltaM=deltaM));
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   parameter Modelica.SIunits.MassFlowRate[3] m_flow_nominal
     "Mass flow rate. Set negative at outflowing ports."
     annotation(Dialog(group = "Nominal condition"));
@@ -43,8 +46,10 @@ model Junction
     "= true, use linear relation between m_flow and dp for any flow rate"
     annotation(Dialog(tab="Advanced"));
 
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
+initial equation
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
 
   annotation (Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,
             -100},{100,100}}), graphics={
@@ -153,6 +158,12 @@ system of equations.
 </html>", revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 February 26, 2020, by Michael Wetter:<br/>
 Changed icon to display its operating state.<br/>
 This is for
diff --git a/Buildings/Fluid/FixedResistances/PlugFlowPipe.mo b/Buildings/Fluid/FixedResistances/PlugFlowPipe.mo
index 859882bf0aa..691c3608bbb 100644
--- a/Buildings/Fluid/FixedResistances/PlugFlowPipe.mo
+++ b/Buildings/Fluid/FixedResistances/PlugFlowPipe.mo
@@ -3,6 +3,9 @@ model PlugFlowPipe
   "Pipe model using spatialDistribution for temperature delay"
   extends Buildings.Fluid.Interfaces.PartialTwoPortVector;
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   parameter Boolean from_dp=false
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Dialog(tab="Advanced"));
@@ -72,9 +75,6 @@ model PlugFlowPipe
   parameter Real fac=1
     "Factor to take into account flow resistance of bends etc., fac=dp_nominal/dpStraightPipe_nominal";
 
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
-
   parameter Boolean linearized = false
     "= true, use linear relation between m_flow and dp for any flow rate"
     annotation(Evaluate=true, Dialog(tab="Advanced"));
@@ -151,6 +151,11 @@ protected
     "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)"
     annotation (Dialog(group="Advanced"));
 
+initial equation
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
+
 equation
   for i in 1:nPorts loop
     connect(vol.ports[i + 1], ports_b[i])
@@ -210,8 +215,14 @@ d = %dh")}),
     Documentation(revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 March 6, 2020, by Jelger Jansen:<br/>
-Revised calculation of thermal resistance <code>R</code> 
+Revised calculation of thermal resistance <code>R</code>
 by using correct radiuses.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1310\">#1310</a>.
 </li>
diff --git a/Buildings/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo b/Buildings/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo
index cec2695e420..8983d9eb613 100644
--- a/Buildings/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo
+++ b/Buildings/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo
@@ -6,6 +6,9 @@ model Convector "Heat exchanger for the water stream"
     final computeFlowResistance=true,
     final dp_nominal = per.dpWat_nominal "Don't multiply with nBeams, as the beams are in parallel");
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   parameter Data.Generic per "Performance data"
     annotation (choicesAllMatching = true,
     Placement(transformation(extent={{60,-80},{80,-60}})));
@@ -16,10 +19,6 @@ model Convector "Heat exchanger for the water stream"
     "Time constant at nominal flow (if energyDynamics <> SteadyState)"
      annotation (Dialog(tab = "Dynamics", group="Nominal condition"));
 
-  // Advanced
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
-
   // Dynamics
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
@@ -94,6 +93,12 @@ protected
   Sensors.MassFlowRate senFloWatCoo(
     redeclare final package Medium = Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+
+initial equation
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
+
 equation
   connect(hex.Q_flow, Q_flow) annotation (Line(points={{61,6},{70,6},{70,70},{
           110,70}},
@@ -149,6 +154,12 @@ In heating mode, the heat is removed from the water stream.
 </html>", revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 November 2, 2016, by Michael Wetter:<br/>
 Made assignment of <code>senTem.y</code> final.
 </li>
diff --git a/Buildings/Fluid/HeatExchangers/ActiveBeams/Cooling.mo b/Buildings/Fluid/HeatExchangers/ActiveBeams/Cooling.mo
index 767f68047b2..43693a51f82 100644
--- a/Buildings/Fluid/HeatExchangers/ActiveBeams/Cooling.mo
+++ b/Buildings/Fluid/HeatExchangers/ActiveBeams/Cooling.mo
@@ -10,6 +10,9 @@ model Cooling "Active beam unit for cooling"
       annotation (choices(
         choice(redeclare package Medium = Buildings.Media.Air "Moist air")));
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   replaceable parameter Data.Generic perCoo "Performance data for cooling"
     annotation (
       Dialog(group="Nominal condition"),
@@ -40,9 +43,6 @@ model Cooling "Active beam unit for cooling"
   parameter Real deltaMWat = 0.1
     "Fraction of nominal flow rate where flow transitions to laminar"
     annotation(Dialog(tab="Flow resistance"));
-  // Advanced
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
 
   // Dynamics
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
@@ -189,7 +189,9 @@ initial equation
     "Performance curve perCoo.water must pass through (0,0).");
   assert(perCoo.dT.r_dT[1]<=0.000001      and perCoo.dT.f[1]<=0.00001,
     "Performance curve perCoo.dT must pass through (0,0).");
-
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
 
 equation
   connect(heaToRoo.port, heaPor)
@@ -295,6 +297,12 @@ DOE(2015) EnergyPlus documentation v8.4.0 - Engineering Reference.
 </html>", revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 January 18, 2019, by Jianjun Hu:<br/>
 Limited the media choice.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/PartialPrescribedOutlet.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/PartialPrescribedOutlet.mo
index a4209537129..b6383af3370 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/PartialPrescribedOutlet.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/PartialPrescribedOutlet.mo
@@ -5,6 +5,8 @@ partial model PartialPrescribedOutlet
   extends Buildings.Fluid.Interfaces.TwoPortFlowResistanceParameters(
     final computeFlowResistance=(abs(dp_nominal) > Modelica.Constants.eps));
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
 
   parameter Modelica.SIunits.MassFlowRate m_flow_nominal
     "Nominal mass flow rate, used for regularization near zero flow"
@@ -14,9 +16,6 @@ partial model PartialPrescribedOutlet
     "Time constant at nominal flow rate (used if energyDynamics or massDynamics not equal Modelica.Fluid.Types.Dynamics.SteadyState)"
     annotation(Dialog(tab = "Dynamics"));
 
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
-
 protected
   Buildings.Fluid.FixedResistances.PressureDrop preDro(
     redeclare final package Medium = Medium,
@@ -38,6 +37,11 @@ protected
     final m_flow_nominal=m_flow_nominal,
     final tau=tau) "Model to set outlet conditions"
     annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+initial equation
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
+
 equation
   connect(port_a, preDro.port_a) annotation (Line(
       points={{-100,0},{-50,0}},
@@ -76,6 +80,12 @@ and connect its input signals, in they are enabled.
 revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 May 3, 2017, by Michael Wetter:<br/>
 Updated protected model for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/763\">#763</a>.
diff --git a/Buildings/Fluid/HeatExchangers/Radiators/RadiatorEN442_2.mo b/Buildings/Fluid/HeatExchangers/Radiators/RadiatorEN442_2.mo
index b83358c3c24..bbf45e88725 100644
--- a/Buildings/Fluid/HeatExchangers/Radiators/RadiatorEN442_2.mo
+++ b/Buildings/Fluid/HeatExchangers/Radiators/RadiatorEN442_2.mo
@@ -10,6 +10,9 @@ model RadiatorEN442_2 "Dynamic radiator for space heating"
      final mSenFac = 1 + 500*mDry/(VWat*cp_nominal*Medium.density(
         Medium.setState_pTX(Medium.p_default, Medium.T_default, Medium.X_default))));
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   parameter Integer nEle(min=1) = 5
     "Number of elements used in the discretization";
   parameter Real fraRad(min=0, max=1) = 0.35 "Fraction radiant heat transfer";
@@ -38,8 +41,6 @@ model RadiatorEN442_2 "Dynamic radiator for space heating"
   parameter Modelica.SIunits.Mass mDry = 0.0263*abs(Q_flow_nominal)
     "Dry mass of radiator that will be lumped to water heat capacity"
     annotation(Dialog(tab = "Dynamics", enable = not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)));
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
   parameter Real deltaM(min=0.01) = 0.3
     "Fraction of nominal mass flow rate where transition to turbulent occurs"
        annotation(Evaluate=true,
@@ -218,6 +219,9 @@ initial equation
         x0=0.1*k*(T_b_nominal-TAir_nominal)));
    end for;
 
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
 
 equation
   connect(preCon.port, vol.heatPort)       annotation (Line(
@@ -365,6 +369,12 @@ with one plate of water carying fluid, and a height of 0.42 meters.
 </html>", revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 February 21, 2020, by Michael Wetter:<br/>
 Changed icon to display its operating state.<br/>
 This is for
diff --git a/Buildings/Fluid/HeatPumps/BaseClasses/PartialWaterToWater.mo b/Buildings/Fluid/HeatPumps/BaseClasses/PartialWaterToWater.mo
index b16ae572b48..5d91d47a982 100644
--- a/Buildings/Fluid/HeatPumps/BaseClasses/PartialWaterToWater.mo
+++ b/Buildings/Fluid/HeatPumps/BaseClasses/PartialWaterToWater.mo
@@ -10,6 +10,9 @@ partial model PartialWaterToWater
     "Refrigerant in the component"
     annotation (choicesAllMatching = true);
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   parameter Boolean enable_variable_speed = true
     "Set to true to allow modulating of compressor speed";
 
@@ -41,8 +44,6 @@ partial model PartialWaterToWater
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation (Dialog(tab="Dynamics", group="Evaporator and condenser"));
 
-  parameter Boolean homotopyInitialization=true "= true, use homotopy method"
-    annotation (Dialog(tab="Advanced"));
   parameter Boolean enable_temperature_protection = true
     "Enable temperature protection"
     annotation(Evaluate=true, Dialog(group="Temperature protection"));
@@ -150,6 +151,11 @@ protected
     "Disables compressor when outside of allowed operation range"
     annotation (Placement(transformation(extent={{0,-10},{20,10}})));
 
+initial equation
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
+
 equation
   if enable_temperature_protection then
     connect(errLowPre, temPro.errLowPre);
@@ -314,6 +320,12 @@ PhD Thesis. Oklahoma State University. Stillwater, Oklahoma, USA. 2012.
 </html>", revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 May 30, 2017, by Filip Jorissen:<br/>
 Added temperature protection block and
 set <code>energyDynamics=DynamicFreeInitial</code>.
diff --git a/Buildings/Fluid/Interfaces/EightPortHeatMassExchanger.mo b/Buildings/Fluid/Interfaces/EightPortHeatMassExchanger.mo
index ad55b740be6..e183c976bc8 100644
--- a/Buildings/Fluid/Interfaces/EightPortHeatMassExchanger.mo
+++ b/Buildings/Fluid/Interfaces/EightPortHeatMassExchanger.mo
@@ -14,6 +14,9 @@ model EightPortHeatMassExchanger
   extends Buildings.Fluid.Interfaces.EightPortFlowResistanceParameters(
      final computeFlowResistance1=true, final computeFlowResistance2=true,final computeFlowResistance3=true, final computeFlowResistance4=true);
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   parameter Modelica.SIunits.Time tau1 = 30 "Time constant at nominal flow"
      annotation (Dialog(tab = "Dynamics", group="Nominal condition"));
   parameter Modelica.SIunits.Time tau2 = 30 "Time constant at nominal flow"
@@ -23,10 +26,6 @@ model EightPortHeatMassExchanger
   parameter Modelica.SIunits.Time tau4 = 30 "Time constant at nominal flow"
      annotation (Dialog(tab = "Dynamics", group="Nominal condition"));
 
-  // Advanced
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
-
   // Assumptions
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Formulation of energy balance"
@@ -324,6 +323,9 @@ initial algorithm
  You need to set massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState to model steady-state.
  Received tau4 = " + String(tau4) + "\n");
 
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
 
 equation
   connect(vol1.ports[2], port_b1) annotation (Line(
@@ -382,8 +384,15 @@ equation
 <p>The variable names follow the conventions used in <a href=\"modelica://Modelica.Fluid.Examples.HeatExchanger.BaseClasses.BasicHX\">Modelica.Fluid.Examples.HeatExchanger.BaseClasses.BasicHX</a>. </p>
 </html>", revisions="<html>
 <ul>
-<li>July 18, 2018, by Massimo Cimmino:
-<br/>Remove start values of m_flow and dp variables.
+<li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
+July 18, 2018, by Massimo Cimmino:<br/>
+Remove start values of m_flow and dp variables.
 </li>
 </ul>
 <ul>
diff --git a/Buildings/Fluid/Interfaces/FourPortHeatMassExchanger.mo b/Buildings/Fluid/Interfaces/FourPortHeatMassExchanger.mo
index a4559c4b88f..092ef0a1b5a 100644
--- a/Buildings/Fluid/Interfaces/FourPortHeatMassExchanger.mo
+++ b/Buildings/Fluid/Interfaces/FourPortHeatMassExchanger.mo
@@ -9,15 +9,14 @@ model FourPortHeatMassExchanger
   extends Buildings.Fluid.Interfaces.FourPortFlowResistanceParameters(
      final computeFlowResistance1=true, final computeFlowResistance2=true);
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   parameter Modelica.SIunits.Time tau1 = 30 "Time constant at nominal flow"
      annotation (Dialog(tab = "Dynamics", group="Nominal condition"));
   parameter Modelica.SIunits.Time tau2 = 30 "Time constant at nominal flow"
      annotation (Dialog(tab = "Dynamics", group="Nominal condition"));
 
-  // Advanced
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
-
   // Assumptions
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
@@ -183,6 +182,9 @@ initial equation
  You need to set massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState to model steady-state.
  Received tau2 = " + String(tau2) + "\n");
 
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
 
 equation
   connect(vol1.ports[2], port_b1) annotation (Line(
@@ -230,6 +232,12 @@ Modelica.Fluid.Examples.HeatExchanger.BaseClasses.BasicHX</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 October 23, 2017, by Michael Wetter:<br/>
 Made volume <code>vol1</code> replaceable. This is required for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1013\">Buildings, issue 1013</a>.
diff --git a/Buildings/Fluid/Interfaces/StaticFourPortHeatMassExchanger.mo b/Buildings/Fluid/Interfaces/StaticFourPortHeatMassExchanger.mo
index 12f21e76a52..ef2569eaa88 100644
--- a/Buildings/Fluid/Interfaces/StaticFourPortHeatMassExchanger.mo
+++ b/Buildings/Fluid/Interfaces/StaticFourPortHeatMassExchanger.mo
@@ -11,8 +11,8 @@ model StaticFourPortHeatMassExchanger
   constant Boolean prescribedHeatFlowRate2 = false
     "Set to true if the heat flow rate into fluid 2 is not a function of the component temperature";
 
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
 
   // Q1_flow is sensible plus latent heat flow rate
   input Modelica.SIunits.HeatFlowRate Q1_flow
@@ -60,6 +60,12 @@ protected
     final Q_flow = Q2_flow,
     final mWat_flow = mWat2_flow)
     "Model for heat, mass, species, trace substance and pressure balance of stream 2";
+
+initial equation
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
+
 equation
   connect(bal1.port_a, port_a1);
   connect(bal1.port_b, port_b1);
@@ -115,6 +121,12 @@ or instantiates this model sets <code>mWat<i>N</i>_flow = 0</code>.
 </html>", revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 April 11, 2017, by Michael Wetter:<br/>
 Updated documentation to make clear that <code>Q1_flow</code> and <code>Q2_flow</code>
 include latent heat flow rate.<br/>
diff --git a/Buildings/Fluid/Interfaces/StaticTwoPortHeatMassExchanger.mo b/Buildings/Fluid/Interfaces/StaticTwoPortHeatMassExchanger.mo
index 669e0d9c84a..c64cd3d4424 100644
--- a/Buildings/Fluid/Interfaces/StaticTwoPortHeatMassExchanger.mo
+++ b/Buildings/Fluid/Interfaces/StaticTwoPortHeatMassExchanger.mo
@@ -9,8 +9,8 @@ model StaticTwoPortHeatMassExchanger
   constant Boolean prescribedHeatFlowRate
     "Set to true if the heat flow rate is not a function of the component temperature";
 
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
 
   // Model inputs
   // Q_flow is the sensible plus latent heat flow rate
@@ -59,6 +59,12 @@ protected
   Modelica.Blocks.Sources.RealExpression
     masExc(final y=mWat_flow) "Block to set moisture exchange in volume"
     annotation (Placement(transformation(extent={{-20,20},{0,40}})));
+
+initial equation
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
+
 equation
   connect(vol.hOut, hOut);
   connect(vol.XiOut, XiOut);
@@ -149,6 +155,12 @@ are the results of an iterative solver.
 </html>", revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 April 11, 2017, by Michael Wetter:<br/>
 Updated documentation to make clear that <code>Q_flow</code>
 includes latent heat flow rate.<br/>
diff --git a/Buildings/Fluid/Interfaces/TwoPortHeatMassExchanger.mo b/Buildings/Fluid/Interfaces/TwoPortHeatMassExchanger.mo
index 8533b4da675..2b17bc689c9 100644
--- a/Buildings/Fluid/Interfaces/TwoPortHeatMassExchanger.mo
+++ b/Buildings/Fluid/Interfaces/TwoPortHeatMassExchanger.mo
@@ -7,14 +7,13 @@ model TwoPortHeatMassExchanger
   extends Buildings.Fluid.Interfaces.TwoPortFlowResistanceParameters(
     final computeFlowResistance=true);
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   parameter Modelica.SIunits.Time tau = 30
     "Time constant at nominal flow (if energyDynamics <> SteadyState)"
      annotation (Dialog(tab = "Dynamics", group="Nominal condition"));
 
-  // Advanced
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
-
   // Dynamics
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
@@ -89,6 +88,9 @@ initial algorithm
  You need to set massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState to model steady-state.
  Received tau = " + String(tau) + "\n");
 
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
 
 equation
   connect(vol.ports[2], port_b) annotation (Line(
@@ -142,6 +144,12 @@ Modelica.Fluid.Examples.HeatExchanger.BaseClasses.BasicHX
 </html>", revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 December 1, 2016, by Michael Wetter:<br/>
 Updated model as <code>use_dh</code> is no longer a parameter in the pressure drop model.<br/>
 This is for
diff --git a/Buildings/Fluid/Movers/BaseClasses/FlowMachineInterface.mo b/Buildings/Fluid/Movers/BaseClasses/FlowMachineInterface.mo
index 810204690c5..4b3a9b935ea 100644
--- a/Buildings/Fluid/Movers/BaseClasses/FlowMachineInterface.mo
+++ b/Buildings/Fluid/Movers/BaseClasses/FlowMachineInterface.mo
@@ -5,6 +5,9 @@ model FlowMachineInterface
 
   import cha = Buildings.Fluid.Movers.BaseClasses.Characteristics;
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   parameter Buildings.Fluid.Movers.Data.Generic per
     "Record with performance data"
     annotation (choicesAllMatching=true,
@@ -30,9 +33,6 @@ model FlowMachineInterface
   parameter Integer nOri(min=1) "Number of data points for pressure curve"
     annotation(Evaluate=true);
 
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
-
  // Normalized speed
   Modelica.Blocks.Interfaces.RealInput y_in(final unit="1") if preSpe
     "Prescribed mover speed"
@@ -337,6 +337,10 @@ the simulation stops.");
      else Buildings.Utilities.Math.Functions.splineDerivatives(x=per.hydraulicEfficiency.V_flow,
     y=per.hydraulicEfficiency.eta);
 
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
+
 equation
   //assign values of dp and r_N, depending on which variable exists and is prescribed
   connect(dp_internal,dp);
@@ -668,6 +672,12 @@ to be used during the simulation.
 revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 December 2, 2016, by Michael Wetter:<br/>
 Removed <code>min</code> attribute as otherwise numerical noise can cause
 the assertion on the limit to fail.<br/>
diff --git a/Buildings/Fluid/Movers/BaseClasses/PowerInterface.mo b/Buildings/Fluid/Movers/BaseClasses/PowerInterface.mo
index 5fbe21f5e36..5ae46708a59 100644
--- a/Buildings/Fluid/Movers/BaseClasses/PowerInterface.mo
+++ b/Buildings/Fluid/Movers/BaseClasses/PowerInterface.mo
@@ -3,8 +3,8 @@ model PowerInterface
   "Partial model to compute power draw and heat dissipation of fans and pumps"
   extends Modelica.Blocks.Icons.Block;
 
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
 
   parameter Boolean motorCooledByFluid
     "Flag, true if the motor is cooled by the fluid stream";
@@ -47,6 +47,11 @@ protected
   Modelica.SIunits.HeatFlowRate QThe_flow
     "Heat input from fan or pump to medium";
 
+initial equation
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
+
 equation
   // Hydraulic power (transmitted by shaft), etaHyd = WFlo/WHyd
   etaHyd * WHyd   = WFlo;
@@ -117,6 +122,12 @@ Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine</a>.
       revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 December 2, 2016, by Michael Wetter:<br/>
 Removed <code>min</code> attribute as otherwise numerical noise can cause
 the assertion on the limit to fail.<br/>
diff --git a/Buildings/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo b/Buildings/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo
index dcda4553766..811fd4ef52b 100644
--- a/Buildings/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo
+++ b/Buildings/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo
@@ -14,6 +14,9 @@ model IndirectTankHeatExchanger
     redeclare final package Medium = MediumHex,
     final show_T=false);
 
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
   parameter Integer nSeg(min=2) "Number of segments in the heat exchanger";
   parameter Modelica.SIunits.HeatCapacity CHex
     "Capacitance of the heat exchanger";
@@ -49,9 +52,6 @@ model IndirectTankHeatExchanger
     "Formulation of mass balance for heat exchanger"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
 
-  parameter Boolean homotopyInitialization = true "= true, use homotopy method"
-    annotation(Evaluate=true, Dialog(tab="Advanced"));
-
   parameter Boolean hA_flowDependent = true
     "Set to false to make the convective heat coefficient calculation of the fluid inside the coil independent of mass flow rate"
     annotation(Dialog(tab="Advanced", group="Modeling detail"), Evaluate=true);
@@ -152,6 +152,11 @@ protected
         rotation=90,
         origin={20,42})));
 
+initial equation
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization is set to false. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
+
 equation
   for i in 1:(nSeg - 1) loop
     connect(vol[i].ports[2], vol[i + 1].ports[1]);
@@ -295,6 +300,12 @@ equation
           revisions="<html>
 <ul>
 <li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">Buildings, #1341</a>.
+</li>
+<li>
 June 7, 2018 by Filip Jorissen:<br/>
 Copied model from Buildings and update the model accordingly.
 This is for
diff --git a/bin/verifyFiles.py b/bin/verifyFiles.py
index b8f1f439b14..06fdd6ef860 100755
--- a/bin/verifyFiles.py
+++ b/bin/verifyFiles.py
@@ -48,7 +48,8 @@
 INVALID_IN_MOS=[]
 # List of invalid regular expressions in .mo files
 INVALID_REGEXP_IN_MO=["StopTime\s*=\s*\d\s*[*]\s*\d+",
-                      "fontSize\s*="]
+                      "fontSize\s*=",
+                      "parameter.*Boolean.*homotopyInitialization"]
 # List of strings that are required in .mo files, except in Examples
 REQUIRED_IN_MO=["documentation"]
 
