diff --git a/.gitignore b/.gitignore index 57ad189aa76..3e035801954 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,10 @@ stop stop. Thumbs.db # Ignore files created by the unit tests. -simulator.log +simulator*.log +comparison*.log +unitTests*.log +funnel_comp # Files in top-level directory ##################################### @@ -36,7 +39,7 @@ simulator.log /build -# Temporary files generated by emacs # +# Temporary files generated by emacs ###################################### *~ \#*\# @@ -65,4 +68,4 @@ Buildings/Resources/src/fluid/heatpumps/calibration/doc/build/doctrees # Spawn temporary directories ######################################### -tmp-eplus-* \ No newline at end of file +tmp-eplus-* diff --git a/.travis.yml b/.travis.yml index 60e08bcc910..007c5c589b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ env: before_install: - if [[ "$TEST_ARG" == *test-dymola* ]]; then - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" && docker pull "$DOCKER_USERNAME"/travis_ubuntu-1804_dymola-2019fd01-x86_64; + docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" && docker pull "$DOCKER_USERNAME"/travis_ubuntu-1804_dymola-2020-x86_64; chmod +x Buildings/Resources/Scripts/travis/bin/dymola; cp Buildings/Resources/Scripts/travis/bin/dymola $HOME/bin/; fi; diff --git a/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo b/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo index 16fe63fa181..19c5c1c3aaa 100644 --- a/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo +++ b/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo @@ -65,13 +65,13 @@ model ChillerSetPointControl extent={{-10,-10},{10,10}}, origin={-170,30}))); Buildings.Controls.Continuous.LimPID limPID( + controllerType=Modelica.Blocks.Types.SimpleController.PI, reverseAction=true, y_start=1, yMin=0, k=10, Ti=0.01, - Td=10, - initType=Modelica.Blocks.Types.InitPID.SteadyState) + Td=10) "PI controller" annotation (Placement(transformation( extent={{-10,-10},{10,10}}, origin={-130,30}))); @@ -153,7 +153,7 @@ equation color={255,0,255}, smooth=Smooth.None)); connect(gain.y, pum.m_flow_in) annotation (Line( - points={{107,-8},{116.4,-8},{116.4,-9.2},{122,-9.2}}, + points={{107,-8},{116.4,-8},{116.4,-9},{122,-9}}, color={0,0,127}, smooth=Smooth.None)); connect(sou2.T_in, sine.y) annotation (Line( @@ -216,6 +216,10 @@ equation Documentation(revisions="