diff --git a/.travis.yml b/.travis.yml index a47103c0b5..c2335fed6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ env: - DOCKER_REPONAME=lbnlblum - BUILDINGSPY_VERSION=BuildingsPy@v5.0.0 - OMC_VERSION=ubuntu-2204-omc:1.22.0_dev-41-g8a5b18f-1 - - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2023x-x86_64_rev-1 + - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2024xRefresh1-x86_64 jobs: # Test matrix for regression tests. @@ -37,8 +37,8 @@ env: - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.Fluid.{HeatExchangers,HeatPumps,Humidifiers,Interfaces,MassExchangers,MixingVolumes,Movers,Sensors,Sources,Storage}\"" - TEST_ARG="make test-dymola PACKAGE=\"IBPSA.ThermalZones\"" - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.ThermalZones\"" - - TEST_ARG="make test-dymola PACKAGE=\"IBPSA.{Airflow,BoundaryConditions,Controls}\"" - - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.{Airflow,BoundaryConditions,Controls}\"" + - TEST_ARG="make test-dymola PACKAGE=\"IBPSA.{Airflow,BoundaryConditions,Controls,Electrical}\"" + - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.{Airflow,BoundaryConditions,Controls,Electrical}\"" - TEST_ARG="make test-dymola PACKAGE=\"IBPSA.{Media,Utilities}\"" - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.{Media,Utilities}\"" diff --git a/IBPSA/Airflow/Multizone/BaseClasses/Examples/package.order b/IBPSA/Airflow/Multizone/BaseClasses/Examples/package.order index e841c46bf2..d11030019d 100644 --- a/IBPSA/Airflow/Multizone/BaseClasses/Examples/package.order +++ b/IBPSA/Airflow/Multizone/BaseClasses/Examples/package.order @@ -1,4 +1,3 @@ -Interpolate PowerLaw PowerLawFixedM WindPressureLowRise diff --git a/IBPSA/Airflow/Multizone/BaseClasses/interpolate.mo b/IBPSA/Airflow/Multizone/BaseClasses/interpolate.mo deleted file mode 100644 index 7955df7a4b..0000000000 --- a/IBPSA/Airflow/Multizone/BaseClasses/interpolate.mo +++ /dev/null @@ -1,81 +0,0 @@ -within IBPSA.Airflow.Multizone.BaseClasses; -function interpolate - "Function for the interpolation of table data for airflow models" - extends Modelica.Icons.Function; - - input Real u "Independent variable"; - input Real[:] xd "X-axis support points"; - input Real[size(xd, 1)] yd "Y-axis support points"; - input Real[size(xd, 1)] d(each fixed=false) "Derivatives at the support points"; - - output Real z "Dependent variable with monotone interpolation"; - -protected - Integer i "Integer to select data interval"; - -algorithm - i := 1; - for j in 1:size(xd, 1) - 1 loop - if u > xd[j] then - i := j; - end if; - end for; - - // Extrapolate or interpolate the data - if i == 1 then - z:=yd[1]+(u-xd[1])*(yd[2]-yd[1])/(xd[2]-xd[1]); //Interpolate linearly between first and second point - elseif i == (size(xd, 1) - 1) then - z:=yd[end-1]+(u-xd[end-1])*(yd[end]-yd[end-1])/(xd[end]-xd[end-1]); //Interpolate linearly between last and second-to-last point. - - else - z :=IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation( - x=u, - x1=xd[i], - x2=xd[i + 1], - y1=yd[i], - y2=yd[i + 1], - y1d=d[i], - y2d=d[i + 1]); - end if; - - annotation ( - Documentation(info=" -

-This function returns the value on a cubic hermite spline through the given support points -and provided spline derivatives at these points with monotonically increasing values. -The last 2 points in the table are linearly interpolated. -

-

-A similar model is also used in the CONTAM software (Dols and Walton, 2015). -

-

-This function is used in - -IBPSA.Airflow.Multizone.Table_m_flow and -IBPSA.Airflow.Multizone.Table_V_flow -

-

-References -

- -", revisions=" - -")); -end interpolate; diff --git a/IBPSA/Airflow/Multizone/BaseClasses/package.order b/IBPSA/Airflow/Multizone/BaseClasses/package.order index 698bba52a4..ab4a1d1fef 100644 --- a/IBPSA/Airflow/Multizone/BaseClasses/package.order +++ b/IBPSA/Airflow/Multizone/BaseClasses/package.order @@ -6,7 +6,6 @@ PowerLawResistanceParameters TwoWayFlowElement TwoWayFlowElementBuoyancy ZonalFlow -interpolate powerLaw powerLawFixedM windPressureLowRise diff --git a/IBPSA/Airflow/Multizone/Examples/CO2TransportStep.mo b/IBPSA/Airflow/Multizone/Examples/CO2TransportStep.mo index 4ef6059747..7ddb308095 100644 --- a/IBPSA/Airflow/Multizone/Examples/CO2TransportStep.mo +++ b/IBPSA/Airflow/Multizone/Examples/CO2TransportStep.mo @@ -5,13 +5,19 @@ model CO2TransportStep "Model with transport of CO2 through buoyancy driven flow volTop(nPorts=3), volEas(nPorts=6)); - IBPSA.Fluid.Sensors.TraceSubstances CO2SenTop(redeclare package Medium = Medium) + IBPSA.Fluid.Sensors.TraceSubstances CO2SenTop( + redeclare package Medium = Medium, + warnAboutOnePortConnection = false) "CO2 sensor" annotation (Placement(transformation(extent={{20,120},{40,140}}))); - IBPSA.Fluid.Sensors.TraceSubstances CO2SenWes(redeclare package Medium = Medium) + IBPSA.Fluid.Sensors.TraceSubstances CO2SenWes( + redeclare package Medium = Medium, + warnAboutOnePortConnection = false) "CO2 sensor" annotation (Placement(transformation(extent={{-102,10},{-82,30}}))); - IBPSA.Fluid.Sensors.TraceSubstances CO2SenEas(redeclare package Medium = Medium) + IBPSA.Fluid.Sensors.TraceSubstances CO2SenEas( + redeclare package Medium = Medium, + warnAboutOnePortConnection = false) "CO2 sensor" annotation (Placement(transformation(extent={{58,10},{78,30}}))); Modelica.Blocks.Sources.Pulse pulse( @@ -65,6 +71,12 @@ the other rooms, and eventually its concentration decays. ", revisions=" ")); -end CO2TransportStep; +end CO2TransportStep; \ No newline at end of file diff --git a/IBPSA/Airflow/Multizone/MediumColumn.mo b/IBPSA/Airflow/Multizone/MediumColumn.mo index a7729b20a7..547d418cfa 100644 --- a/IBPSA/Airflow/Multizone/MediumColumn.mo +++ b/IBPSA/Airflow/Multizone/MediumColumn.mo @@ -103,11 +103,13 @@ equation Text( extent={{24,-78},{106,-100}}, textColor={0,0,127}, - textString="Bottom"), + textString="Bottom", + fontSize=36), Text( extent={{32,104},{98,70}}, textColor={0,0,127}, - textString="Top"), + textString="Top", + fontSize=36), Text( extent={{36,26},{88,-10}}, textColor={0,0,127}, @@ -129,7 +131,7 @@ equation Text( extent={{-50.5,20.5},{50.5,-20.5}}, textColor={0,0,127}, - origin={-72.5,-12.5}, + origin={-72.5,-0.5}, rotation=90, textString="%name"), Rectangle( @@ -141,7 +143,7 @@ equation lineColor={0,0,0}), Rectangle( visible=densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.fromBottom, - extent={{-16,0},{16,-82}}, + extent={{-16,0},{16,-80}}, fillColor={85,170,255}, fillPattern=FillPattern.Solid, pattern=LinePattern.None, diff --git a/IBPSA/Airflow/Multizone/MediumColumnDynamic.mo b/IBPSA/Airflow/Multizone/MediumColumnDynamic.mo index 53ce7913e5..2219df5e51 100644 --- a/IBPSA/Airflow/Multizone/MediumColumnDynamic.mo +++ b/IBPSA/Airflow/Multizone/MediumColumnDynamic.mo @@ -75,10 +75,10 @@ model MediumColumnDynamic equation connect(colBot.port_a, vol.ports[1]) annotation (Line( - points={{0,-40},{0,-40},{0,-2},{-10,-2}}, + points={{0,-40},{0,-40},{0,-1},{-10,-1}}, color={0,127,255})); connect(vol.ports[2], colTop.port_b) annotation (Line( - points={{-10,2},{0,2},{0,40},{0,40}}, + points={{-10,1},{0,1},{0,40},{0,40}}, color={0,127,255})); connect(colTop.port_a, port_a) annotation (Line( points={{0,60},{0,80},{0,80},{0,100}}, @@ -98,56 +98,36 @@ equation Text( extent={{24,-78},{106,-100}}, textColor={0,0,127}, - textString="Bottom"), + textString="Bottom", + fontSize=36), Text( extent={{32,104},{98,70}}, textColor={0,0,127}, - textString="Top"), + textString="Top", + fontSize=36), Text( extent={{42,26},{94,-10}}, textColor={0,0,127}, fillColor={255,0,0}, fillPattern=FillPattern.Solid, textString="h=%h"), - Rectangle( - visible=densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.fromTop, - extent={{-16,78},{16,-2}}, - fillColor={85,170,255}, - fillPattern=FillPattern.Solid, - pattern=LinePattern.None, - lineColor={0,0,0}), Text( extent={{-50.5,20.5},{50.5,-20.5}}, textColor={0,0,127}, - origin={-72.5,-12.5}, + origin={-72.5,-0.5}, rotation=90, textString="%name"), Rectangle( - visible=densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.actual, - extent={{-16,80},{16,54}}, - fillColor={85,170,255}, - fillPattern=FillPattern.Solid, - pattern=LinePattern.None, - lineColor={0,0,0}), - Rectangle( - visible=densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.fromBottom, - extent={{-16,0},{16,-82}}, - fillColor={85,170,255}, - fillPattern=FillPattern.Solid, - pattern=LinePattern.None, - lineColor={0,0,0}), - Rectangle( - visible=densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.actual, - extent={{-16,-55},{16,-80}}, + extent={{-16,80},{16,-80}}, fillColor={85,170,255}, fillPattern=FillPattern.Solid, pattern=LinePattern.None, lineColor={0,0,0}), Ellipse( extent={{-40,40},{40,-40}}, - lineColor={0,0,0}, fillPattern=FillPattern.Sphere, - fillColor={0,128,255}), + fillColor={0,128,255}, + pattern=LinePattern.None), Line( visible=use_HeatTransfer, points={{-90,0},{-40,0}}, @@ -182,6 +162,12 @@ at the top of the column. revisions="