Merge branch 'master' into issue2293_chiller_plant_seq

lbl-srg · May 28, 2021 · 2499858 · 2499858
2 parents 1396b9d + 58a02ee
commit 2499858
Show file tree

Hide file tree

Showing 42 changed files with 2,444 additions and 106 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -44,7 +44,7 @@ env:
   jobs:
     - TEST_ARG="make test-cdl-conformance"
     - TEST_ARG="make test-energyplus-validations"
-    - TEST_ARG="make test-bestest"
+    - TEST_ARG="make test-bestest test-spawn-portability"
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.{Air,Examples}\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.{Air,Examples}\""
     - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.{Air,Examples}\""
@@ -101,7 +101,7 @@ env:
 before_install:
   - sudo apt-get -y install python3.6-minimal  # Provides /usr/bin/python3.6m
   - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-  - if [[ "$TEST_ARG" == *test-dymola* || "$TEST_ARG" == *test-bestest* ]]; then
+  - if [[ "$TEST_ARG" == *test-dymola* || "$TEST_ARG" == *test-bestest* || "$TEST_ARG" == *spawn-portability* ]]; then
        docker pull "$DOCKER_USERNAME"/travis_ubuntu-1804_dymola:2022-x86_64;
        cp Buildings/Resources/Scripts/travis/dymola/dymola $HOME/bin/;
     fi;

diff --git a/Buildings/Fluid/HeatPumps/BaseClasses/PartialWaterToWater.mo b/Buildings/Fluid/HeatPumps/BaseClasses/PartialWaterToWater.mo
@@ -315,7 +315,7 @@ H. Jin.
 <i>
 Parameter estimation based models of water source heat pumps.
 </i>
-PhD Thesis. Oklahoma State University. Stillwater, Oklahoma, USA. 2012.
+PhD Thesis. Oklahoma State University. Stillwater, Oklahoma, USA. 2002.
 </p>
 </html>", revisions="<html>
 <ul>

diff --git a/Buildings/Fluid/HeatPumps/Compressors/ReciprocatingCompressor.mo b/Buildings/Fluid/HeatPumps/Compressors/ReciprocatingCompressor.mo
@@ -108,7 +108,7 @@ H. Jin.
 <i>
 Parameter estimation based models of water source heat pumps.
 </i>
-PhD Thesis. Oklahoma State University. Stillwater, Oklahoma, USA. 2012.
+PhD Thesis. Oklahoma State University. Stillwater, Oklahoma, USA. 2002.
 </p>
 </html>", revisions="<html>
 <ul>

diff --git a/Buildings/Fluid/HeatPumps/Compressors/ScrollCompressor.mo b/Buildings/Fluid/HeatPumps/Compressors/ScrollCompressor.mo
@@ -131,7 +131,7 @@ H. Jin.
 <i>
 Parameter estimation based models of water source heat pumps.
 </i>
-PhD Thesis. Oklahoma State University. Stillwater, Oklahoma, USA. 2012.
+PhD Thesis. Oklahoma State University. Stillwater, Oklahoma, USA. 2002.
 </p>
 </html>", revisions="<html>
 <ul>

diff --git a/Buildings/Fluid/HeatPumps/ReciprocatingWaterToWater.mo b/Buildings/Fluid/HeatPumps/ReciprocatingWaterToWater.mo
@@ -81,7 +81,7 @@ H. Jin.
 <i>
 Parameter estimation based models of water source heat pumps.
 </i>
-PhD Thesis. Oklahoma State University. Stillwater, Oklahoma, USA. 2012.
+PhD Thesis. Oklahoma State University. Stillwater, Oklahoma, USA. 2002.
 </p>
 </html>", revisions="<html>
 <ul>

diff --git a/Buildings/Fluid/HeatPumps/ScrollWaterToWater.mo b/Buildings/Fluid/HeatPumps/ScrollWaterToWater.mo
@@ -89,7 +89,7 @@ H. Jin.
 <i>
 Parameter estimation based models of water source heat pumps.
 </i>
-PhD Thesis. Oklahoma State University. Stillwater, Oklahoma, USA. 2012.
+PhD Thesis. Oklahoma State University. Stillwater, Oklahoma, USA. 2002.
 </p>
 </html>", revisions="<html>
 <ul>

diff --git a/...ed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoilHighInfiltration.idf b/...ed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoilHighInfiltration.idf
diff --git a/Buildings/Resources/Library/linux64/libModelicaBuildingsEnergyPlus.so b/Buildings/Resources/Library/linux64/libModelicaBuildingsEnergyPlus.so
diff --git a/Buildings/Resources/Library/win64/ModelicaBuildingsEnergyPlus.dll b/Buildings/Resources/Library/win64/ModelicaBuildingsEnergyPlus.dll
diff --git a/...ces/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Examples_CouplingSpawnZ1.txt b/...ces/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Examples_CouplingSpawnZ1.txt
diff --git a/...esults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_AirHeating.txt b/...esults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_AirHeating.txt
diff --git a/...la/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_RadiantHeatingCooling.txt b/...la/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_RadiantHeatingCooling.txt
diff --git a/...ermalZones_EnergyPlus_Examples_SingleFamilyHouse_RadiantHeatingWithGroundHeatTransfer.txt b/...ermalZones_EnergyPlus_Examples_SingleFamilyHouse_RadiantHeatingWithGroundHeatTransfer.txt
diff --git a/...eResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_Infiltration.txt b/...eResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_Infiltration.txt
@@ -0,0 +1,17 @@
+last-generated=2021-05-26
+statistics-initialization=
+{
+  "nonlinear": "1, 1",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
+  "nonlinear": "1, 1",
+  "number of continuous time states": "82",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 8.64e+04]
+defInf.attFlo.heaPorFro.T=[2.931499938964844e+02, 2.923663330078125e+02, 2.917656860351562e+02, 2.912073059082031e+02, 2.9064990234375e+02, 2.900831909179688e+02, 2.895244750976562e+02, 2.889872131347656e+02, 2.884734802246094e+02, 2.879769287109375e+02, 2.874996032714844e+02, 2.870352783203125e+02, 2.865857849121094e+02, 2.861484985351562e+02, 2.857213134765625e+02, 2.853028564453125e+02, 2.848905944824219e+02, 2.844870910644531e+02, 2.840905456542969e+02, 2.83705078125e+02, 2.8332861328125e+02, 2.829623413085938e+02, 2.826049499511719e+02, 2.822545166015625e+02, 2.819117126464844e+02, 2.815743103027344e+02, 2.81244873046875e+02, 2.809205017089844e+02, 2.806029052734375e+02, 2.802908630371094e+02, 2.799849853515625e+02, 2.796862182617188e+02, 2.794007263183594e+02, 2.791470642089844e+02, 2.789248352050781e+02, 2.787454528808594e+02, 2.785948791503906e+02, 2.784722900390625e+02, 2.783676147460938e+02, 2.782808532714844e+02, 2.782129516601562e+02, 2.781571655273438e+02, 2.781141357421875e+02, 2.780798950195312e+02, 2.780643310546875e+02, 2.780631713867188e+02, 2.7807373046875e+02, 2.78092041015625e+02, 2.781158752441406e+02, 2.781431274414062e+02, 2.781636657714844e+02, 2.781698303222656e+02, 2.781656494140625e+02, 2.78151123046875e+02, 2.781339416503906e+02, 2.781188354492188e+02, 2.781059265136719e+02, 2.780950927734375e+02, 2.780857543945312e+02, 2.780762634277344e+02, 2.780630798339844e+02, 2.780443115234375e+02, 2.780162353515625e+02, 2.779780578613281e+02, 2.77929931640625e+02, 2.778708801269531e+02, 2.778043518066406e+02, 2.777301635742188e+02, 2.776500854492188e+02, 2.775573425292969e+02, 2.774525146484375e+02, 2.773406982421875e+02, 2.772267456054688e+02, 2.771128234863281e+02, 2.76999267578125e+02, 2.768864135742188e+02, 2.767746887207031e+02, 2.766669006347656e+02, 2.765652465820312e+02, 2.764681091308594e+02, 2.763750305175781e+02, 2.762872924804688e+02, 2.762054138183594e+02, 2.76130859375e+02, 2.7606103515625e+02, 2.75992919921875e+02, 2.759212341308594e+02, 2.758436584472656e+02, 2.757598571777344e+02, 2.756748352050781e+02, 2.7559716796875e+02, 2.755283508300781e+02, 2.754690551757812e+02, 2.754126281738281e+02, 2.753523559570312e+02, 2.752858581542969e+02, 2.752125854492188e+02, 2.751343383789062e+02, 2.750546264648438e+02, 2.749749450683594e+02, 2.748957824707031e+02]
+higInf.attFlo.heaPorFro.T=[2.931499938964844e+02, 2.919930114746094e+02, 2.910631713867188e+02, 2.901984558105469e+02, 2.89338623046875e+02, 2.88498291015625e+02, 2.877034912109375e+02, 2.869508666992188e+02, 2.862406921386719e+02, 2.855599365234375e+02, 2.849144592285156e+02, 2.842923889160156e+02, 2.836975708007812e+02, 2.83124267578125e+02, 2.825688171386719e+02, 2.820315551757812e+02, 2.815079345703125e+02, 2.81003662109375e+02, 2.805144958496094e+02, 2.800466613769531e+02, 2.795947875976562e+02, 2.791606750488281e+02, 2.787406311035156e+02, 2.783321533203125e+02, 2.7793701171875e+02, 2.7755126953125e+02, 2.77179443359375e+02, 2.768165588378906e+02, 2.764656982421875e+02, 2.7612451171875e+02, 2.757953796386719e+02, 2.754793701171875e+02, 2.75178466796875e+02, 2.749081726074219e+02, 2.7466845703125e+02, 2.744724731445312e+02, 2.743064270019531e+02, 2.741715087890625e+02, 2.740597534179688e+02, 2.739717102050781e+02, 2.739081115722656e+02, 2.738612060546875e+02, 2.73832763671875e+02, 2.738150939941406e+02, 2.738180236816406e+02, 2.7383642578125e+02, 2.738683471679688e+02, 2.739103088378906e+02, 2.739599914550781e+02, 2.7401611328125e+02, 2.740685424804688e+02, 2.741104125976562e+02, 2.741442565917969e+02, 2.741707763671875e+02, 2.741966247558594e+02, 2.742259826660156e+02, 2.742586669921875e+02, 2.742942199707031e+02, 2.743323669433594e+02, 2.743699951171875e+02, 2.744021911621094e+02, 2.744280700683594e+02, 2.744444885253906e+02, 2.744509887695312e+02, 2.74447998046875e+02, 2.744350280761719e+02, 2.744151611328125e+02, 2.743880615234375e+02, 2.743556213378906e+02, 2.743115539550781e+02, 2.742556457519531e+02, 2.741923828125e+02, 2.741250610351562e+02, 2.740559997558594e+02, 2.739856872558594e+02, 2.739149475097656e+02, 2.738438415527344e+02, 2.737759704589844e+02, 2.737134399414062e+02, 2.736548156738281e+02, 2.736022338867188e+02, 2.7355810546875e+02, 2.735215759277344e+02, 2.734938354492188e+02, 2.734699401855469e+02, 2.734443359375e+02, 2.734127807617188e+02, 2.733731079101562e+02, 2.733262634277344e+02, 2.732793273925781e+02, 2.732412719726562e+02, 2.732130432128906e+02, 2.731945495605469e+02, 2.731770935058594e+02, 2.731541137695312e+02, 2.731240539550781e+02, 2.730866394042969e+02, 2.730447998046875e+02, 2.730020141601562e+02, 2.729593505859375e+02, 2.729172058105469e+02]
+defInf.bou.weaBus.TDryBul=[2.609500122070312e+02, 2.608970947265625e+02, 2.608676452636719e+02, 2.608753967285156e+02, 2.609342651367188e+02, 2.610378723144531e+02, 2.61153564453125e+02, 2.612774658203125e+02, 2.614064331054688e+02, 2.615419921875e+02, 2.616917419433594e+02, 2.618442077636719e+02, 2.619866027832031e+02, 2.62093017578125e+02, 2.621011047363281e+02, 2.620587158203125e+02, 2.620299682617188e+02, 2.620775451660156e+02, 2.62211181640625e+02, 2.623743591308594e+02, 2.625067138671875e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625875549316406e+02, 2.627120666503906e+02, 2.628901062011719e+02, 2.630865173339844e+02, 2.632776489257812e+02, 2.634906005859375e+02, 2.637460632324219e+02, 2.640627746582031e+02, 2.6446923828125e+02, 2.650023803710938e+02, 2.655892028808594e+02, 2.661426086425781e+02, 2.665859985351562e+02, 2.669939880371094e+02, 2.674020080566406e+02, 2.678099975585938e+02, 2.682179870605469e+02, 2.686260070800781e+02, 2.690339965820312e+02, 2.694419860839844e+02, 2.698500061035156e+02, 2.701971740722656e+02, 2.704558715820312e+02, 2.706758728027344e+02, 2.709069213867188e+02, 2.712052001953125e+02, 2.715532531738281e+02, 2.718607788085938e+02, 2.720364685058594e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720480651855469e+02, 2.719675598144531e+02, 2.718063354492188e+02, 2.716164855957031e+02, 2.714500122070312e+02, 2.713160400390625e+02, 2.711899108886719e+02, 2.71072998046875e+02, 2.709666137695312e+02, 2.710076599121094e+02, 2.71330810546875e+02, 2.717365112304688e+02, 2.720188903808594e+02, 2.720211181640625e+02, 2.718473815917969e+02, 2.716227111816406e+02, 2.714658508300781e+02, 2.714859924316406e+02, 2.716591491699219e+02, 2.718775329589844e+02, 2.720336303710938e+02, 2.7202783203125e+02, 2.719024353027344e+02, 2.717281494140625e+02, 2.715556945800781e+02, 2.714362182617188e+02, 2.714127502441406e+02, 2.714474182128906e+02, 2.714799194335938e+02, 2.714500122070312e+02]