diff --git a/.travis.yml b/.travis.yml
index fa842f4edbb..ffea89089f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -110,14 +110,16 @@ env:
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Templates\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Templates\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Templates\""
+ - TEST_ARG="make test-templates-optimica"
+ - TEST_ARG="make test-templates-dymola"
before_install:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- - if [[ "$TEST_ARG" == *test-dymola* || "$TEST_ARG" == *test-bestest* || "$TEST_ARG" == *spawn-portability* ]]; then
+ - if [[ "$TEST_ARG" == *test-dymola* || "$TEST_ARG" == *test-templates-dymola* || "$TEST_ARG" == *test-bestest* || "$TEST_ARG" == *spawn-portability* ]]; then
docker pull "$DOCKER_REPONAME"/${DYMOLA_VERSION};
cp Buildings/Resources/Scripts/travis/dymola/dymola $HOME/bin/;
fi;
- - if [[ "$TEST_ARG" == *test-optimica* ]]; then
+ - if [[ "$TEST_ARG" == *test-optimica* || "$TEST_ARG" == *test-templates-optimica* ]]; then
docker pull "$DOCKER_REPONAME"/${OPTIMICA_VERSION};
cp Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh $HOME/bin/jm_ipython.sh;
fi;
@@ -144,7 +146,7 @@ before_install:
cd -;
echo "Installed modelica-json in ${MODELICA_JSON_HOME}";
fi;
- - if [[ "$TEST_ARG" == *test-openmodelica* ]]; then
+ - if [[ "$TEST_ARG" == *test-openmodelica* || "$TEST_ARG" == *test-templates-openmodelica* ]]; then
docker pull lbnlblum/${OMC_VERSION};
cp Buildings/Resources/Scripts/travis/omc/omc $HOME/bin/omc;
fi;
@@ -158,7 +160,7 @@ install:
- pip3 install --upgrade pip wheel
- pip3 install --only-binary=numpy,scipy,matplotlib numpy==1.21.4 scipy==1.7.3 matplotlib==3.5.1
- pip3 install git+https://github.com/lbl-srg/${BUILDINGSPY_VERSION}
- - if [[ "$TEST_ARG" == *test-energyplus* ]]; then
+ - if [[ "$TEST_ARG" == *test-energyplus* ]] || [[ "$TEST_ARG" == *test-templates* ]]; then
export ENERGYPLUS_9_6_0=${ENERGYPLUS_9_6_0};
export ENERGYPLUS_23_1_0=${ENERGYPLUS_23_1_0};
pip3 install pandas==1.3.5;
@@ -175,7 +177,13 @@ install:
# Execute tests
script:
- - (cd Buildings/Resources/Scripts/travis && travis_wait 90 $TEST_ARG)
+ - |
+ TRAVIS_WAIT=90
+ if [[ "$TEST_ARG" == *test-templates* ]]; then
+ TRAVIS_WAIT=180
+ fi
+ (cd Buildings/Resources/Scripts/travis && travis_wait $TRAVIS_WAIT $TEST_ARG)
+
after_failure:
- |
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZBase.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZBase.txt
deleted file mode 100644
index 4bcea649881..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZBase.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2023-05-24
-statistics-initialization=
-{
- "nonlinear": "1, 0, 2, 0, 1, 5, 1, 0, 1, 1, 0",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": " ",
- "nonlinear": "1, 2, 1, 1, 0, 0, 0, 1, 5, 1",
- "number of continuous time states": "30",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 1e+00]
-VAV_1.bus.TAirSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549318953e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.93150146484375e+02, 2.93150146484375e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931502075195312e+02, 2.931502380371094e+02, 2.931502380372913e+02, 2.931502685546875e+02, 2.931502990722656e+02, 2.931503295898438e+02, 2.931503601074219e+02, 2.93150390625e+02, 2.931504211427236e+02, 2.931504821777344e+02, 2.931505126953125e+02, 2.931505432128906e+02, 2.93150604247865e+02, 2.93150634765625e+02, 2.931506958007812e+02, 2.931507568359375e+02, 2.931508178710938e+02, 2.931508483886719e+02, 2.931509094238281e+02, 2.931510009764897e+02, 2.931510620117188e+02, 2.931511230470933e+02, 2.931512145996094e+02, 2.931512756347656e+02, 2.931513671872453e+02, 2.931514587401252e+02, 2.93151519775427e+02, 2.931516113283069e+02, 2.931517028811868e+02, 2.931517944335938e+02, 2.931519165036152e+02, 2.931520080564951e+02, 2.93152099609375e+02]
-VAV_1.bus.TAirMix=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02]
-VAV_1.bus.TOut=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-VAV_1.bus.fanSup.V_flow=[0e+00, 1.903674949471838e-04, 7.463307461038224e-04, 1.647834624751131e-03, 2.869447812114541e-03, 4.34494519039745e-03, 6.077618128984614e-03, 8.064855760242096e-03, 1.021790078947745e-02, 1.251461831880188e-02, 1.491985154069591e-02, 1.742303200321052e-02, 1.999452593716658e-02, 2.261420837873473e-02, 2.527040786028833e-02, 2.793705118878496e-02, 3.061215862208582e-02, 3.332453172289484e-02, 3.608017961429468e-02, 3.888478197722597e-02, 4.174218986162145e-02, 4.461644405677818e-02, 4.748644713956704e-02, 5.030480655675899e-02, 5.308878570577123e-02, 5.585563182830811e-02, 5.860516317634715e-02, 6.133721476490511e-02, 6.40516873946877e-02, 6.67484946612199e-02, 6.942756900553816e-02, 7.20655837351311e-02, 7.468001730552998e-02, 7.727309722530572e-02, 7.984520403250092e-02, 8.239668014003469e-02, 8.492783841161632e-02, 8.74389994129163e-02, 8.99287399490814e-02, 9.238674096353351e-02, 9.482327703948928e-02, 9.723878737797789e-02, 9.963368191828602e-02, 1.020083112478484e-01, 1.04363054595695e-01, 1.066982401294358e-01, 1.090153436443723e-01, 1.113162713992825e-01, 1.135994294826763e-01, 1.158651166474813e-01, 1.18113599717617e-01, 1.203451550330424e-01, 1.225600135658736e-01, 1.247584286362772e-01, 1.26940618257092e-01, 1.291068170549724e-01, 1.31257220591508e-01, 1.333920523826171e-01, 1.355188524412906e-01, 1.376382912953908e-01, 1.397456476626569e-01, 1.418412148844306e-01, 1.439252932884711e-01, 1.45998136194341e-01, 1.480600267249556e-01, 1.501112182017606e-01, 1.521519518131259e-01, 1.541824605023518e-01, 1.562030002951995e-01, 1.582137649071162e-01, 1.602296257213551e-01, 1.62243921900094e-01, 1.642533483289958e-01, 1.662583312925754e-01, 1.682592164284425e-01, 1.702563762664795e-01, 1.722501684349814e-01, 1.742409058600384e-01, 1.762289312692109e-01, 1.782145457595494e-01, 1.801980561224044e-01, 1.821797783419942e-01, 1.841800525203367e-01, 1.861835304591929e-01, 1.881906740915543e-01, 1.902019333530336e-01, 1.922177941545504e-01, 1.942386766562713e-01, 1.962650278948793e-01, 1.982972502030056e-01, 2.003357459123578e-01, 2.023808753426145e-01, 2.044330503021689e-01, 2.06495104736604e-01, 2.085758303611655e-01, 2.106674785595185e-01, 2.127705559709214e-01, 2.148855118900204e-01, 2.170128036597823e-01, 2.191528657482058e-01, 2.21306100487709e-01]
-VAV_1.bus.VOut_flow=[-0e+00, 4.826665704886589e-05, 1.990246185865922e-04, 4.443106493562069e-04, 7.515020350850617e-04, 1.179754118635109e-03, 1.662148579800376e-03, 2.189400589478849e-03, 2.766936192144236e-03, 3.365441939848996e-03, 3.975835073726648e-03, 4.570887924827806e-03, 5.140258612965428e-03, 5.682222796326621e-03, 6.198313988430577e-03, 6.678706692243686e-03, 7.117701843789489e-03, 7.521155686400607e-03, 7.888382979832699e-03, 8.219062424292451e-03, 8.513146928109118e-03, 8.770796625023633e-03, 8.992319950463741e-03, 9.174841386690087e-03, 9.318735515681444e-03, 9.425420314073563e-03, 9.495376655197858e-03, 9.5291649713896e-03, 9.52740758845971e-03, 9.49078234724908e-03, 9.420015018275515e-03, 9.335669711322447e-03, 9.224899022204542e-03, 9.086983473218617e-03, 8.922777201058702e-03, 8.733196062220143e-03, 8.519217691644229e-03, 8.281871793966318e-03, 8.027253561514017e-03, 7.789641268442881e-03, 7.540065015404354e-03, 7.279001546266178e-03, 7.006930753518567e-03, 6.72433219867022e-03, 6.431679170196858e-03, 6.129443744241147e-03, 5.828890254682382e-03, 5.545726477933346e-03, 5.263652350973869e-03, 4.983515279240252e-03, 4.706134553998709e-03, 4.432306366169253e-03, 4.162800455507823e-03, 3.898358389699417e-03, 3.639698345432283e-03, 3.387506650091871e-03, 3.142448432711407e-03, 2.905161186638899e-03, 2.692346139611282e-03, 2.506124790112311e-03, 2.336558808044272e-03, 2.18461032232014e-03, 2.051210323711123e-03, 1.937257892292311e-03, 1.843621256269155e-03, 1.771140818362282e-03, 1.720629974224662e-03, 1.692876599812049e-03, 1.688646148782845e-03, 1.708681936318592e-03, 1.758625229050127e-03, 1.836929557581461e-03, 1.943150198852304e-03, 2.07805372761112e-03, 2.242391528080438e-03, 2.436902606859803e-03, 2.662315964820082e-03, 2.919350812114768e-03, 3.208718215551263e-03, 3.531120462680322e-03, 3.887259659045542e-03, 4.277826656071219e-03, 4.664348726138757e-03, 5.077289201819918e-03, 5.516805017927935e-03, 5.982934291886823e-03, 6.4757296132689e-03, 6.995240439230227e-03, 7.54152265184528e-03, 8.114638649916404e-03, 8.714652226688548e-03, 9.341631274687573e-03, 9.995654047090597e-03, 1.066334500664052e-02, 1.129857559155753e-02, 1.194433014283675e-02, 1.259953484084385e-02, 1.326312958441132e-02, 1.393407920412714e-02, 1.461135717494364e-02, 1.529395487159491e-02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZCoilElectricHeating.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZCoilElectricHeating.txt
deleted file mode 100644
index dc9b8f793a8..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZCoilElectricHeating.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2023-05-24
-statistics-initialization=
-{
- "nonlinear": "1, 0, 0, 1, 1, 0, 2, 1, 0",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": "2",
- "nonlinear": "1, 0, 1, 2, 0, 1, 0, 1, 1, 1",
- "number of continuous time states": "29",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 1e+00]
-VAV_1.bus.TAirSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.93150146484375e+02, 2.93150146484375e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931502075195312e+02, 2.931502075195312e+02, 2.931502380371094e+02, 2.931502685546875e+02, 2.931502990722656e+02, 2.931503295898438e+02, 2.931503601070217e+02, 2.931503906247453e+02, 2.931504211425781e+02, 2.931504516601562e+02, 2.931504821777344e+02, 2.931505126956399e+02, 2.931505737300322e+02, 2.931506042480469e+02, 2.931506652832031e+02, 2.931507263183594e+02, 2.93150756836083e+02, 2.931508178713848e+02, 2.931508789066866e+02, 2.931509399414062e+02, 2.931510314939587e+02, 2.931510925292969e+02, 2.931511840820312e+02, 2.931512451174422e+02, 2.931513366703221e+02, 2.931514282222925e+02, 2.931515197751723e+02, 2.931516113280522e+02, 2.931517028809321e+02, 2.931518249513902e+02, 2.931519470214844e+02, 2.931520385742188e+02, 2.931521606445312e+02, 2.931523132323127e+02, 2.931524353027708e+02, 2.931525573732288e+02, 2.931527099612649e+02, 2.931528625483916e+02, 2.931529846188496e+02, 2.931531677244639e+02, 2.931533203125e+02]
-VAV_1.bus.TAirMix=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02]
-VAV_1.bus.TOut=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-VAV_1.bus.fanSup.V_flow=[0e+00, 1.789618631189735e-04, 6.837572745504608e-04, 1.498918582302834e-03, 2.588054970390909e-03, 3.91164271877838e-03, 5.471896613283022e-03, 7.278160602017459e-03, 9.246804190025742e-03, 1.136815097772683e-02, 1.361609960962385e-02, 1.59855467785072e-02, 1.846039176580268e-02, 2.100733976972097e-02, 2.360921337475262e-02, 2.626170617498825e-02, 2.896181777830178e-02, 3.170939485421587e-02, 3.450736574366662e-02, 3.735931286476151e-02, 4.026776464934189e-02, 4.319763375722118e-02, 4.61246337488694e-02, 4.903482896972246e-02, 5.193749598130921e-02, 5.483123660087585e-02, 5.771488970722926e-02, 6.058746268613959e-02, 6.344814564517412e-02, 6.629624454759016e-02, 6.907938837787019e-02, 7.181566888666734e-02, 7.452656521510158e-02, 7.721281445718377e-02, 7.987513298289099e-02, 8.251412369325399e-02, 8.513033762138322e-02, 8.77181949945072e-02, 9.025763840589929e-02, 9.277028947631637e-02, 9.525699020833167e-02, 9.771851537706677e-02, 1.001555578886133e-01, 1.025687587949182e-01, 1.049587434235295e-01, 1.073186798010234e-01, 1.096519435922744e-01, 1.119617077464928e-01, 1.142485315155403e-01, 1.16512937182823e-01, 1.187554448843002e-01, 1.209765097697754e-01, 1.231793579697751e-01, 1.253722372500556e-01, 1.275474233595346e-01, 1.297051731934581e-01, 1.318456972518623e-01, 1.339692488527746e-01, 1.360760068124461e-01, 1.381662095507323e-01, 1.40253732593364e-01, 1.423338919988316e-01, 1.444030543256669e-01, 1.464614728937524e-01, 1.48509445727058e-01, 1.505472410481904e-01, 1.525751001205695e-01, 1.545932855367341e-01, 1.56602053400284e-01, 1.586016123280939e-01, 1.605921858373262e-01, 1.625832213193751e-01, 1.645834686783845e-01, 1.665810755556625e-01, 1.685765217593096e-01, 1.705702394247055e-01, 1.725626904886999e-01, 1.745543070863885e-01, 1.765454915506157e-01, 1.785366343448457e-01, 1.805281317332625e-01, 1.825203443783262e-01, 1.84514479289057e-01, 1.86530340108195e-01, 1.885527276496314e-01, 1.905822109403384e-01, 1.926193655152698e-01, 1.946647306448336e-01, 1.967188129708551e-01, 1.987821042332523e-01, 2.00855081269681e-01, 2.029382084702223e-01, 2.050319278988038e-01, 2.071366742068121e-01, 2.092580502346729e-01, 2.113950427118347e-01, 2.135461019127295e-01, 2.157116768223716e-01, 2.178922700898478e-01, 2.20088286087794e-01, 2.223001569509506e-01]
-VAV_1.bus.VOut_flow=[-0e+00, 3.016260949055355e-05, 1.418019017245946e-04, 3.289538297463626e-04, 5.671758857422294e-04, 9.121556378582833e-04, 1.305064009076699e-03, 1.739415326553998e-03, 2.221167176391398e-03, 2.729717921732643e-03, 3.257051497834957e-03, 3.783637456088721e-03, 4.296763470228769e-03, 4.798930840255809e-03, 5.289267254021322e-03, 5.750895211594871e-03, 6.183668189368305e-03, 6.592094826991835e-03, 6.974939921876018e-03, 7.331385358362143e-03, 7.660958355290152e-03, 7.963462920412898e-03, 8.232056189418193e-03, 8.436614568387507e-03, 8.603972460723539e-03, 8.734474889934063e-03, 8.828572066709698e-03, 8.886802894328623e-03, 8.909771217821218e-03, 8.898135247871806e-03, 8.8534197527462e-03, 8.775769754540709e-03, 8.665558789508553e-03, 8.523605035114434e-03, 8.350799857646838e-03, 8.148101958523491e-03, 7.91654770541746e-03, 7.669450350470858e-03, 7.450627521040194e-03, 7.220285139881287e-03, 6.978893333346261e-03, 6.72691911541181e-03, 6.46482792004587e-03, 6.193082511036608e-03, 5.9121376152296e-03, 5.665056133940415e-03, 5.437837635710271e-03, 5.216290216975836e-03, 5.000611073976497e-03, 4.790980100763997e-03, 4.587562289088964e-03, 4.390509149243114e-03, 4.207635938966928e-03, 4.061065685673449e-03, 3.929121224710091e-03, 3.811760938508071e-03, 3.708933270387036e-03, 3.620576987777424e-03, 3.546621541397025e-03, 3.486989164885371e-03, 3.450341587462949e-03, 3.43367249224623e-03, 3.434540467297362e-03, 3.452996970026533e-03, 3.489085539902328e-03, 3.542842962582738e-03, 3.614298793328631e-03, 3.703478563092055e-03, 3.810401924354994e-03, 3.935083779178587e-03, 4.077535305158882e-03, 4.241912550799578e-03, 4.432189641797654e-03, 4.643035634654926e-03, 4.874638052933965e-03, 5.127181299030781e-03, 5.400845122787419e-03, 5.695806472004792e-03, 6.012240901474488e-03, 6.350316760164783e-03, 6.710207581641095e-03, 7.09207998586683e-03, 7.495701139368978e-03, 7.911985523543552e-03, 8.348300366172703e-03, 8.804631243762271e-03, 9.280971489909987e-03, 9.777309132539788e-03, 1.029363486030439e-02, 1.082994308524836e-02, 1.138622821750673e-02, 1.196248303613574e-02, 1.255871161563935e-02, 1.317490965186897e-02, 1.378599475662532e-02, 1.439819744940069e-02, 1.502067451150384e-02, 1.565276090700844e-02, 1.629381131393564e-02, 1.694318403657556e-02, 1.760024391114712e-02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZCoilEvaporatorMultiStage.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZCoilEvaporatorMultiStage.txt
deleted file mode 100644
index c517987a72b..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZCoilEvaporatorMultiStage.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2023-05-24
-statistics-initialization=
-{
- "nonlinear": "1, 1, 1, 2, 1, 0, 1, 1, 0",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": "0",
- "nonlinear": "2, 1, 1, 1, 0, 0, 1, 1, 1, 1",
- "number of continuous time states": "30",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 1e+00]
-VAV_1.bus.TAirSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.93150146484375e+02, 2.93150146484375e+02, 2.931501770019531e+02, 2.931501770021714e+02, 2.931502075195312e+02, 2.931502380371094e+02, 2.931502380371094e+02, 2.931502685546875e+02, 2.931502990722656e+02, 2.931503295898438e+02, 2.931503601074219e+02, 2.93150390625e+02, 2.931504211425781e+02, 2.931504516601562e+02, 2.931504821777344e+02, 2.931505432128906e+02, 2.931505737307598e+02, 2.93150634765625e+02, 2.931506652832031e+02, 2.931507263183594e+02, 2.931507873535156e+02, 2.931508483886719e+02, 2.931509094238281e+02, 2.931509704593846e+02, 2.931510314941406e+02, 2.931511230466567e+02, 2.931511840820312e+02, 2.931512756347656e+02, 2.931513671875e+02, 2.9315142822302e+02, 2.931515502925686e+02, 2.931516418454485e+02, 2.931517333983284e+02, 2.931518249512083e+02, 2.931519470214844e+02, 2.931520385745462e+02, 2.931521606440947e+02, 2.931522827145527e+02, 2.931524047850107e+02, 2.931525268554688e+02]
-VAV_1.bus.TAirMix=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02]
-VAV_1.bus.TOut=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-VAV_1.bus.fanSup.V_flow=[0e+00, 2.849898140609589e-04, 1.028192274416488e-03, 2.187505689141707e-03, 3.687963732100075e-03, 5.438166997880449e-03, 7.458750918940396e-03, 9.736997936642393e-03, 1.218524154941205e-02, 1.476844026958925e-02, 1.744125743009904e-02, 2.018713967623265e-02, 2.298620046384072e-02, 2.58186379982889e-02, 2.867471223379738e-02, 3.154839776345556e-02, 3.444525331348258e-02, 3.738190925926196e-02, 4.036826797718432e-02, 4.341271220617877e-02, 4.652030300212718e-02, 4.964952003410456e-02, 5.277616195369474e-02, 5.587098618840897e-02, 5.894732639911737e-02, 6.201113760471344e-02, 6.506163171979419e-02, 6.809813204089769e-02, 7.112011277484138e-02, 7.412710290967553e-02, 7.71179610711422e-02, 8.008018810628813e-02, 8.302446664587146e-02, 8.59508327113072e-02, 8.885935590217142e-02, 9.175010942228308e-02, 9.462318159435887e-02, 9.74787013060868e-02, 1.003143428302708e-01, 1.031271259332332e-01, 1.059215201216295e-01, 1.086977730150822e-01, 1.114561444788736e-01, 1.141968424436901e-01, 1.169201365620851e-01, 1.196262347052996e-01, 1.22316037859343e-01, 1.249897557692423e-01, 1.276472537315736e-01, 1.302887325190391e-01, 1.329144537448883e-01, 1.355246181258003e-01, 1.381194342816929e-01, 1.406991108292493e-01, 1.432638262441023e-01, 1.458138197134654e-01, 1.483492547202936e-01, 1.508703547805668e-01, 1.533810091097013e-01, 1.55880681255414e-01, 1.583677918145206e-01, 1.608425939513681e-01, 1.633053112230754e-01, 1.657561522454019e-01, 1.681953256352437e-01, 1.706230400106339e-01, 1.730394747180673e-01, 1.754448522790998e-01, 1.778393817733429e-01, 1.802232122129228e-01, 1.826022593692809e-01, 1.849752417352512e-01, 1.873399547726968e-01, 1.896966948917416e-01, 1.920456863919023e-01, 1.943871825933456e-01, 1.96721407012921e-01, 1.99048612972216e-01, 2.013689941873921e-01, 2.03682775306659e-01, 2.059901925267308e-01, 2.082914555552229e-01, 2.105932848229171e-01, 2.1289383258551e-01, 2.151909381740229e-01, 2.174849157504967e-01, 2.197760459803874e-01, 2.220646281063139e-01, 2.24350915448656e-01, 2.26635191130329e-01, 2.289177084721391e-01, 2.311987221038851e-01, 2.334785125362342e-01, 2.357573045884918e-01, 2.380390768726669e-01, 2.403226820040772e-01, 2.426072110095406e-01, 2.448929333841902e-01, 2.47180189298848e-01, 2.494692482568525e-01, 2.517603635787964e-01]
-VAV_1.bus.VOut_flow=[-0e+00, 2.610214494615439e-05, 1.511383097309551e-04, 3.72340485271961e-04, 6.793509629445515e-04, 1.130658748180527e-03, 1.65132102922882e-03, 2.223043917610903e-03, 2.850625313944451e-03, 3.505888855228606e-03, 4.179467348006193e-03, 4.842896519511256e-03, 5.479447709482426e-03, 6.088670626907524e-03, 6.673767197132544e-03, 7.223727797414121e-03, 7.733097009207691e-03, 8.208536460399931e-03, 8.649317242407091e-03, 9.055062288858587e-03, 9.425673527546301e-03, 9.761270341973131e-03, 1.006213485809475e-02, 1.032728877634119e-02, 1.055680226540017e-02, 1.075130980461836e-02, 1.091133350780788e-02, 1.103748555304065e-02, 1.113045307786822e-02, 1.119098815798474e-02, 1.12209217365749e-02, 1.123747974490175e-02, 1.122809758517244e-02, 1.119371323116324e-02, 1.113534069247663e-02, 1.105405291490425e-02, 1.095070147149547e-02, 1.082587527878363e-02, 1.069197425424007e-02, 1.056596710877005e-02, 1.042841476473471e-02, 1.027979882477059e-02, 1.012059558852751e-02, 9.951278691231439e-03, 9.772310920761784e-03, 9.584151909080485e-03, 9.406621707567392e-03, 9.239629822505742e-03, 9.073857041333814e-03, 8.910088955138248e-03, 8.749082684516907e-03, 8.591570743525184e-03, 8.438259076137796e-03, 8.289827549752642e-03, 8.146931718820085e-03, 8.010198522052162e-03, 7.880233258513893e-03, 7.757615679321302e-03, 7.662803273206163e-03, 7.592998753126803e-03, 7.53965146759684e-03, 7.503689773585589e-03, 7.486010440811348e-03, 7.487481000670985e-03, 7.508939646122828e-03, 7.551198490916009e-03, 7.615043591125643e-03, 7.701237526912792e-03, 7.810520854634955e-03, 7.943612558588118e-03, 8.106172300154663e-03, 8.297688773985174e-03, 8.51683532100239e-03, 8.764369850449521e-03, 9.041029684799577e-03, 9.347544051706791e-03, 9.684623558315706e-03, 1.005296948683025e-02, 1.045327194922329e-02, 1.088620533429796e-02, 1.135244442705932e-02, 1.18526423987275e-02, 1.23597489609968e-02, 1.288263030814384e-02, 1.343155707209978e-02, 1.400652574507663e-02, 1.460754411374158e-02, 1.523460883052578e-02, 1.588772455453118e-02, 1.656689221710033e-02, 1.72721164723415e-02, 1.800339288208004e-02, 1.87607320250857e-02, 1.954412776078558e-02, 2.030355314897177e-02, 2.105684296349142e-02, 2.181909956736761e-02, 2.258923614886412e-02, 2.336620204497948e-02, 2.414895146746356e-02, 2.493645995855331e-02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZCoilEvaporatorVariable.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZCoilEvaporatorVariable.txt
deleted file mode 100644
index 030d6bea74f..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZCoilEvaporatorVariable.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2023-05-24
-statistics-initialization=
-{
- "nonlinear": "1, 1, 2, 1, 0, 1, 1, 0",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": "0",
- "nonlinear": "2, 1, 1, 1, 0, 0, 1, 1, 1, 1",
- "number of continuous time states": "30",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 1e+00]
-VAV_1.bus.TAirSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938965208e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.93150146484375e+02, 2.93150146484375e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931502075195312e+02, 2.931502380371094e+02, 2.931502685546875e+02, 2.931502685548694e+02, 2.931502990722656e+02, 2.931503295898438e+02, 2.931503601074219e+02, 2.93150390625e+02, 2.931504211425781e+02, 2.931504821777344e+02, 2.931505126953125e+02, 2.931505432133272e+02, 2.931506042480469e+02, 2.931506652830212e+02, 2.931506958007812e+02, 2.931507568359375e+02, 2.931508178710938e+02, 2.9315087890625e+02, 2.931509399410425e+02, 2.931510009763442e+02, 2.93151062011646e+02, 2.931511230469478e+02, 2.931511840822495e+02, 2.931512756347656e+02, 2.931513366699219e+02, 2.931514282226562e+02, 2.931515197752815e+02, 2.93151611328125e+02, 2.931516723634631e+02, 2.93151763916343e+02, 2.9315185546875e+02, 2.931519775387715e+02, 2.931520690916514e+02, 2.931521606445312e+02]
-VAV_1.bus.TAirMix=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-VAV_1.bus.TOut=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-VAV_1.bus.fanSup.V_flow=[0e+00, 2.268350905088846e-04, 8.35084451513755e-04, 1.801975615990248e-03, 3.087021067373284e-03, 4.607012839858689e-03, 6.394672005891789e-03, 8.439441148571597e-03, 1.0651979076223e-02, 1.300671145176776e-02, 1.54669439406594e-02, 1.802103423124548e-02, 2.06434733833879e-02, 2.33129890429203e-02, 2.601731738642132e-02, 2.873651707798692e-02, 3.147145831837528e-02, 3.424495036177223e-02, 3.706330603043696e-02, 3.993244910882902e-02, 4.285650240087047e-02, 4.579872458253274e-02, 4.873749648758725e-02, 5.162973954580407e-02, 5.449447188973644e-02, 5.734380707144737e-02, 6.017734752191993e-02, 6.29947453382166e-02, 6.579574909277298e-02, 6.858014546874866e-02, 7.134775488271528e-02, 7.407569075356289e-02, 7.678298844940167e-02, 7.947002745044253e-02, 8.213709944755647e-02, 8.478447206952425e-02, 8.74123833844505e-02, 9.002110238022605e-02, 9.260775271177586e-02, 9.516434735398223e-02, 9.770013241316849e-02, 1.002155178797181e-01, 1.027108835958095e-01, 1.051865723958816e-01, 1.076429417597928e-01, 1.100802897525467e-01, 1.12486703194374e-01, 1.148529353557176e-01, 1.171897674651857e-01, 1.194991745448961e-01, 1.217890381813049e-01, 1.240556336072265e-01, 1.262995196244806e-01, 1.285506551349914e-01, 1.30801225845122e-01, 1.330457005001113e-01, 1.352914268368155e-01, 1.375445888663809e-01, 1.397982128321583e-01, 1.420532226364084e-01, 1.443203931593039e-01, 1.46592017736614e-01, 1.488673378102489e-01, 1.511486481592101e-01, 1.534345182722362e-01, 1.557236964483052e-01, 1.58012294735981e-01, 1.602968833476167e-01, 1.625797732243007e-01, 1.648587440883061e-01, 1.671192672902435e-01, 1.693698812012807e-01, 1.716106022974717e-01, 1.738261091374655e-01, 1.760201135286008e-01, 1.781959384679794e-01, 1.803473999556584e-01, 1.824686418422518e-01, 1.84565907716005e-01, 1.866391405927639e-01, 1.88684222656468e-01, 1.907044793342375e-01, 1.927004470693569e-01, 1.946792784402062e-01, 1.966399899580638e-01, 1.985815866375232e-01, 2.005134644224327e-01, 2.024449547872407e-01, 2.043680110778668e-01, 2.062872229102578e-01, 2.082395600208563e-01, 2.101968773482116e-01, 2.121588554987874e-01, 2.141250953904529e-01, 2.160952394082498e-01, 2.18146043511674e-01, 2.202397779384041e-01, 2.223772940676181e-01, 2.245753216164564e-01, 2.268224038922508e-01, 2.291156351566315e-01]
-VAV_1.bus.VOut_flow=[-0e+00, 3.729504740603225e-05, 1.752593467553095e-04, 4.065130093872061e-04, 7.040264698532022e-04, 1.132395434424085e-03, 1.613826558611629e-03, 2.140220936788118e-03, 2.717669460913237e-03, 3.318510731421224e-03, 3.93376304118283e-03, 4.536576139102533e-03, 5.114264936654067e-03, 5.665909755231104e-03, 6.193447827254069e-03, 6.685368901754487e-03, 7.136032604788311e-03, 7.552303301876736e-03, 7.933411484774309e-03, 8.278947400835412e-03, 8.588780560922838e-03, 8.86299663975015e-03, 9.101836968096026e-03, 9.300863294031335e-03, 9.461321010827877e-03, 9.584826417267323e-03, 9.67182318389513e-03, 9.722835344875915e-03, 9.738454595016099e-03, 9.719324265092323e-03, 9.666134682763399e-03, 9.599913861462379e-03, 9.505554954310763e-03, 9.383719588401987e-03, 9.235207979612742e-03, 9.060867017838599e-03, 8.86159978904672e-03, 8.638329914892436e-03, 8.401097625159382e-03, 8.176481950372023e-03, 7.939344416254586e-03, 7.690338326386068e-03, 7.430039927605757e-03, 7.158929679027804e-03, 6.877479540569192e-03, 6.586158294036688e-03, 6.353769579151754e-03, 6.238559717390587e-03, 6.186084339946973e-03, 6.200134234716102e-03, 6.310421042144299e-03, 6.497996150663492e-03, 6.761968266551963e-03, 7.150198713990798e-03, 7.649884796270476e-03, 8.25132166821637e-03, 8.961741631128839e-03, 9.787507060710394e-03, 1.072060017521429e-02, 1.175930825384971e-02, 1.289884092114425e-02, 1.414009559102553e-02, 1.548176286060481e-02, 1.690433244542844e-02, 1.841050236725786e-02, 2.000213805961904e-02, 2.166317522632812e-02, 2.337845310517963e-02, 2.515837234771567e-02, 2.699594988520579e-02, 2.884861119133698e-02, 3.073870987145027e-02, 3.266455423200455e-02, 3.457017626420092e-02, 3.646594105175756e-02, 3.836128488183022e-02, 4.021358660469643e-02, 4.198215488678936e-02, 4.370337091476245e-02, 4.536408962952169e-02, 4.685127935374375e-02, 4.823477534231856e-02, 4.951701773228152e-02, 5.05844966444195e-02, 5.146412011574231e-02, 5.218293361582284e-02, 5.268602021293657e-02, 5.29174356964604e-02, 5.293243372991888e-02, 5.272594410009186e-02, 5.223467422784431e-02, 5.150883859691295e-02, 5.054972868924204e-02, 4.935814904648382e-02, 4.793450943973773e-02, 4.627042793413599e-02, 4.436809503148857e-02, 4.223585010249007e-02, 3.993235610832473e-02, 3.742457055664954e-02, 3.477776423096657e-02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZCoilWaterHeating3WVReheat.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZCoilWaterHeating3WVReheat.txt
deleted file mode 100644
index 87f9a1fe8e5..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZCoilWaterHeating3WVReheat.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2023-05-24
-statistics-initialization=
-{
- "nonlinear": "1, 0, 2, 1, 5, 1, 0, 1, 1, 0",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": " ",
- "nonlinear": "1, 2, 1, 1, 0, 0, 1, 5, 1",
- "number of continuous time states": "32",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 1e+00]
-VAV_1.bus.TAirSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938966663e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244144991e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549317498e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.93150146484375e+02, 2.93150146484375e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931502075195312e+02, 2.931502380371094e+02, 2.931502380371458e+02, 2.931502685546875e+02, 2.931502990722656e+02, 2.931503295898438e+02, 2.931503601074219e+02, 2.93150390625e+02, 2.931504211425781e+02, 2.931504516601562e+02, 2.931504821780254e+02, 2.931505432128906e+02, 2.931505737304688e+02, 2.931506347654431e+02, 2.931506652832031e+02, 2.931507263183594e+02, 2.931507873535156e+02, 2.931508483886719e+02, 2.931509094234643e+02, 2.931509704589844e+02, 2.931510314941406e+02, 2.931510925293696e+02, 2.931511840820312e+02, 2.931512451175513e+02, 2.931513366695217e+02, 2.931513977050781e+02, 2.931514892578125e+02, 2.931515808105833e+02, 2.931516723634631e+02, 2.93151763916343e+02, 2.9315185546875e+02, 2.931519470214844e+02, 2.931520690916514e+02, 2.931521606445312e+02]
-VAV_1.bus.TAirMix=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02]
-VAV_1.bus.TOut=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-VAV_1.bus.fanSup.V_flow=[0e+00, 1.901867747308522e-04, 7.463656707092696e-04, 1.646621460766407e-03, 2.869795428100648e-03, 4.345380583254565e-03, 6.075973413066794e-03, 8.063973797758245e-03, 1.021755806243026e-02, 1.251442087812796e-02, 1.491813976991687e-02, 1.742090486244399e-02, 1.999076711906558e-02, 2.260983302504826e-02, 2.526562831285483e-02, 2.793941488651184e-02, 3.061274162936805e-02, 3.332327630039399e-02, 3.607703919591867e-02, 3.887971558195821e-02, 4.173516768999726e-02, 4.460744375411037e-02, 4.747544635707587e-02, 5.031574028324873e-02, 5.310088544923017e-02, 5.586870387196541e-02, 5.861902870753081e-02, 6.135172476999811e-02, 6.40667077651178e-02, 6.676390246217412e-02, 6.944325992796442e-02, 7.209622797246013e-02, 7.471338100733482e-02, 7.730903882283235e-02, 7.98835968734509e-02, 8.243741246551253e-02, 8.497080590682791e-02, 8.748411267741815e-02, 8.997763066613489e-02, 9.244700126568973e-02, 9.488792572473087e-02, 9.730779465702535e-02, 9.970701798876812e-02, 1.020859537451847e-01, 1.044449886315408e-01, 1.067844433520492e-01, 1.091046388521114e-01, 1.114065947880677e-01, 1.136912653403929e-01, 1.159579210786505e-01, 1.182068064808846e-01, 1.204381755312977e-01, 1.226522293996481e-01, 1.248491990546803e-01, 1.270292801713112e-01, 1.291986081939823e-01, 1.313620055537191e-01, 1.335119173349309e-01, 1.356483882423876e-01, 1.377714629804052e-01, 1.398811737194517e-01, 1.419776201136793e-01, 1.440608193503107e-01, 1.461365530855733e-01, 1.482092916731542e-01, 1.502725233018816e-01, 1.523263698695332e-01, 1.543710048708151e-01, 1.56406565047291e-01, 1.584331547072635e-01, 1.604509079605541e-01, 1.624599738204165e-01, 1.644604595982714e-01, 1.664524934507841e-01, 1.684361975379893e-01, 1.704180687665939e-01, 1.724058408597208e-01, 1.743897237426708e-01, 1.763700154397335e-01, 1.783470320029082e-01, 1.803210652197834e-01, 1.822923864196941e-01, 1.842612638241167e-01, 1.862279805560134e-01, 1.881927601339529e-01, 1.901558739842183e-01, 1.921175690253611e-01, 1.940832873688354e-01, 1.960630426319465e-01, 1.980462102681119e-01, 2.000332224118587e-01, 2.020244993153139e-01, 2.040204372442065e-01, 2.060214415766802e-01, 2.080278699421453e-01, 2.100400948712766e-01, 2.120584590911439e-01, 2.140833230424151e-01, 2.161150237855995e-01, 2.181562612751454e-01, 2.202144116163254e-01]
-VAV_1.bus.VOut_flow=[-0e+00, 4.83736863753403e-05, 1.991076081616116e-04, 4.449939199567226e-04, 7.509460938981353e-04, 1.179920592658772e-03, 1.663073848874429e-03, 2.190379409503486e-03, 2.767758550878149e-03, 3.367437298447624e-03, 3.979843485903739e-03, 4.575707984835626e-03, 5.147745981023248e-03, 5.690288049927152e-03, 6.206355958878202e-03, 6.689209682137599e-03, 7.128738482076544e-03, 7.532373001143902e-03, 7.899416358610644e-03, 8.229539803070358e-03, 8.522692984822279e-03, 8.77903603483373e-03, 8.998875529839419e-03, 9.18117065548227e-03, 9.323535551334231e-03, 9.428445249795914e-03, 9.496374099592498e-03, 9.52787974879458e-03, 9.52358357828364e-03, 9.484163435247708e-03, 9.410345099741379e-03, 9.310839721130957e-03, 9.196078311009406e-03, 9.054299643786051e-03, 8.886356901774731e-03, 8.693161296592951e-03, 8.475686748120168e-03, 8.234962940115701e-03, 7.971816564461155e-03, 7.702652003072808e-03, 7.445138103965592e-03, 7.176583068828546e-03, 6.897462623537168e-03, 6.608252157574787e-03, 6.309420729125139e-03, 6.001435312449545e-03, 5.684757872260317e-03, 5.379026256943321e-03, 5.10286184428442e-03, 4.830295012871053e-03, 4.561556968837976e-03, 4.296865064220569e-03, 4.036422792842106e-03, 3.780419912186746e-03, 3.529033693337165e-03, 3.300844695684966e-03, 3.111219310205367e-03, 2.936617352822809e-03, 2.776973629322593e-03, 2.632212701630369e-03, 2.50225031525263e-03, 2.386991556768818e-03, 2.286336197104955e-03, 2.209761620315039e-03, 2.164905145943371e-03, 2.140803933472514e-03, 2.137607415541596e-03, 2.155454319788662e-03, 2.194476047068648e-03, 2.254795533349954e-03, 2.336528497863121e-03, 2.439784601107605e-03, 2.564667807626348e-03, 2.71127855582178e-03, 2.879710931859654e-03, 3.07355192489922e-03, 3.297132899943085e-03, 3.545211896650308e-03, 3.818026868608158e-03, 4.115810422945367e-03, 4.43879894316896e-03, 4.787220999770259e-03, 5.161305702471697e-03, 5.561280292231377e-03, 5.987371079866278e-03, 6.439801132940104e-03, 6.918798897292166e-03, 7.415206871892368e-03, 7.911292146796433e-03, 8.426523589360486e-03, 8.960591066418312e-03, 9.513185753721166e-03, 1.008401621519995e-02, 1.067278864083143e-02, 1.127921618328254e-02, 1.19030213091956e-02, 1.254393113777541e-02, 1.320167440822149e-02, 1.387599818925511e-02, 1.455490602056629e-02, 1.520287618041039e-02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZControlG36Airflow.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZControlG36Airflow.txt
deleted file mode 100644
index 725f4a9469c..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZControlG36Airflow.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-last-generated=2023-05-24
-statistics-initialization=
-{
- "nonlinear": "1, 2, 0, 0, 1, 5, 1, 0, 1, 1, 0",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": " ",
- "nonlinear": "1, 1, 2, 0, 0, 0, 1, 5, 1, 1",
- "number of continuous time states": "36",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 1e+04]
-VAV_1.bus.TAirSup=[2.931499938964844e+02, 2.935587463378906e+02, 2.939021911621094e+02, 2.943377990722656e+02, 2.941629943847656e+02, 2.940722351074219e+02, 2.940494079589844e+02, 2.939938049316406e+02, 2.939225463867188e+02, 2.938546447753906e+02, 2.9381591796875e+02, 2.937929077148438e+02, 2.937659606933594e+02, 2.937571105957031e+02, 2.9375634765625e+02, 2.937438659667969e+02, 2.937451171875e+02, 2.937531127929688e+02, 2.937454223632812e+02, 2.937491760253906e+02, 2.937567443847656e+02, 2.937489013671875e+02, 2.937528076171875e+02, 2.93760009765625e+02, 2.937518920898438e+02, 2.937564392089844e+02, 2.937629699707031e+02, 2.937546997070312e+02, 2.937598266601562e+02, 2.93765625e+02, 2.937571105957031e+02, 2.937629699707031e+02, 2.937679138183594e+02, 2.937595520019531e+02, 2.937659912109375e+02, 2.937698059082031e+02, 2.937616271972656e+02, 2.937688598632812e+02, 2.937715454101562e+02, 2.937637634277344e+02, 2.937714538574219e+02, 2.937728881835938e+02, 2.93765625e+02, 2.9377392578125e+02, 2.937738952636719e+02, 2.937676086425781e+02, 2.937762145996094e+02, 2.937746887207031e+02, 2.937695007324219e+02, 2.937782592773438e+02, 2.937751770019531e+02, 2.937713928222656e+02, 2.937800598144531e+02, 2.937755432128906e+02, 2.937732543945312e+02, 2.937816467285156e+02, 2.937757568359375e+02, 2.937749938964844e+02, 2.937830200195312e+02, 2.937759094238281e+02, 2.937769470214844e+02, 2.937839660644531e+02, 2.937760314941406e+02, 2.9377880859375e+02, 2.937847595214844e+02, 2.937762145996094e+02, 2.937806396484375e+02, 2.937851867675781e+02, 2.937765502929688e+02, 2.937822570800781e+02, 2.937853088378906e+02, 2.937769775390625e+02, 2.937839050292969e+02, 2.937851867675781e+02, 2.93777587890625e+02, 2.937853698730469e+02, 2.937847900390625e+02, 2.937784118652344e+02, 2.9378662109375e+02, 2.937841796875e+02, 2.937793579101562e+02, 2.937877502441406e+02, 2.937833862304688e+02, 2.937804870605469e+02, 2.937886352539062e+02, 2.937826538085938e+02, 2.937817077636719e+02, 2.937892456054688e+02, 2.937819213867188e+02, 2.937829895019531e+02, 2.937896118164062e+02, 2.937813720703125e+02, 2.937843322753906e+02, 2.937897033691406e+02, 2.937809753417969e+02, 2.9378564453125e+02, 2.937894897460938e+02, 2.937808227539062e+02, 2.937869262695312e+02, 2.937890014648438e+02, 2.937808837890625e+02]
-VAV_1.bus.TAirMix=[2.931499938964844e+02, 2.932084655761719e+02, 2.932410888671875e+02, 2.932364501953125e+02, 2.932334594726562e+02, 2.932936401367188e+02, 2.933694458007812e+02, 2.933857421875e+02, 2.933811950683594e+02, 2.93352294921875e+02, 2.933258666992188e+02, 2.933309936523438e+02, 2.933170471191406e+02, 2.933013916015625e+02, 2.933141174316406e+02, 2.933076477050781e+02, 2.932956848144531e+02, 2.933121948242188e+02, 2.933078918457031e+02, 2.932974243164062e+02, 2.933141479492188e+02, 2.933089599609375e+02, 2.932989501953125e+02, 2.933160095214844e+02, 2.933095092773438e+02, 2.933008117675781e+02, 2.9331787109375e+02, 2.933099060058594e+02, 2.93302490234375e+02, 2.933196716308594e+02, 2.93309814453125e+02, 2.933042297363281e+02, 2.933214416503906e+02, 2.933097229003906e+02, 2.933060302734375e+02, 2.933229675292969e+02, 2.933092651367188e+02, 2.933079528808594e+02, 2.933244934082031e+02, 2.933088989257812e+02, 2.933098449707031e+02, 2.933255615234375e+02, 2.933082885742188e+02, 2.933118896484375e+02, 2.933263854980469e+02, 2.93307861328125e+02, 2.9331396484375e+02, 2.933267211914062e+02, 2.933075866699219e+02, 2.933160705566406e+02, 2.933265686035156e+02, 2.933074951171875e+02, 2.933181762695312e+02, 2.93325927734375e+02, 2.933075561523438e+02, 2.933203125e+02, 2.933247375488281e+02, 2.93307861328125e+02, 2.933224487304688e+02, 2.933231506347656e+02, 2.933086242675781e+02, 2.933243103027344e+02, 2.933212280273438e+02, 2.933096618652344e+02, 2.93326416015625e+02, 2.933190612792969e+02, 2.9331103515625e+02, 2.933280639648438e+02, 2.933169860839844e+02, 2.933125610351562e+02, 2.933294067382812e+02, 2.933150634765625e+02, 2.933144226074219e+02, 2.933302917480469e+02, 2.933132934570312e+02, 2.933164672851562e+02, 2.933306884765625e+02, 2.9331201171875e+02, 2.933184814453125e+02, 2.933303527832031e+02, 2.9331103515625e+02, 2.933207397460938e+02, 2.933292846679688e+02, 2.933105163574219e+02, 2.933228759765625e+02, 2.933275756835938e+02, 2.933105163574219e+02, 2.93324951171875e+02, 2.933253173828125e+02, 2.933110046386719e+02, 2.933269348144531e+02, 2.933229064941406e+02, 2.933119201660156e+02, 2.933287048339844e+02, 2.933203125e+02, 2.93313232421875e+02, 2.933302307128906e+02, 2.933178100585938e+02, 2.933149108886719e+02, 2.933313293457031e+02, 2.933155822753906e+02]
-VAV_1.bus.TOut=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-VAV_1.bus.fanSup.V_flow=[0e+00, 9.863148629665375e-02, 1.372568011283875e-01, 1.754816770553589e-01, 2.132712155580521e-01, 2.501983046531677e-01, 2.856027781963348e-01, 3.196139335632325e-01, 3.517191410064697e-01, 3.790517151355743e-01, 3.998578190803528e-01, 4.195109307765961e-01, 4.348271489143372e-01, 4.437201321125031e-01, 4.523179829120636e-01, 4.569849073886871e-01, 4.554584622383118e-01, 4.547916948795319e-01, 4.540855884552002e-01, 4.505287110805511e-01, 4.504989385604858e-01, 4.49882835149765e-01, 4.465540945529938e-01, 4.467290341854095e-01, 4.461459517478943e-01, 4.430427551269531e-01, 4.434212148189545e-01, 4.428218007087708e-01, 4.39941018819809e-01, 4.405165314674377e-01, 4.398471415042877e-01, 4.372068345546722e-01, 4.379767179489136e-01, 4.371769726276398e-01, 4.348013699054719e-01, 4.357460141181946e-01, 4.347801506519318e-01, 4.326934814453125e-01, 4.337911903858185e-01, 4.326256215572357e-01, 4.30847704410553e-01, 4.320628046989441e-01, 4.306808412075043e-01, 4.292478561401367e-01, 4.305479824542999e-01, 4.289388656616211e-01, 4.278521537780762e-01, 4.291961193084717e-01, 4.273695647716522e-01, 4.266473054885864e-01, 4.279880225658417e-01, 4.259589910507202e-01, 4.25608903169632e-01, 4.268837571144104e-01, 4.24692302942276e-01, 4.247169494628906e-01, 4.258556962013244e-01, 4.235751032829285e-01, 4.239490926265717e-01, 4.248870611190796e-01, 4.225917756557465e-01, 4.232896268367767e-01, 4.239619672298431e-01, 4.217365086078644e-01, 4.227433502674103e-01, 4.230653643608093e-01, 4.210236370563507e-01, 4.222695231437683e-01, 4.222226440906525e-01, 4.20434445142746e-01, 4.218664765357971e-01, 4.214287102222443e-01, 4.199601709842682e-01, 4.215183556079865e-01, 4.206825196743011e-01, 4.195926785469055e-01, 4.212165176868439e-01, 4.199998676776886e-01, 4.193052351474762e-01, 4.209283590316772e-01, 4.193710684776306e-01, 4.190993010997772e-01, 4.206453561782837e-01, 4.187923967838287e-01, 4.189516007900238e-01, 4.203239679336548e-01, 4.182960391044617e-01, 4.188505709171295e-01, 4.199555218219757e-01, 4.178804755210876e-01, 4.18779045343399e-01, 4.195573627948761e-01, 4.175495803356171e-01, 4.187431335449219e-01, 4.191271066665649e-01, 4.17304515838623e-01, 4.187350571155548e-01, 4.18681263923645e-01, 4.171460866928101e-01, 4.187454283237457e-01, 4.182412028312683e-01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZControlG36Pressure.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZControlG36Pressure.txt
deleted file mode 100644
index c47fdb3e3fc..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZControlG36Pressure.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-last-generated=2023-05-24
-statistics-initialization=
-{
- "nonlinear": "1, 0, 2, 0, 1, 5, 1, 0, 1, 1, 0",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": " ",
- "nonlinear": "0, 1, 1, 2, 0, 0, 1, 5, 1, 1",
- "number of continuous time states": "37",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 1e+04]
-VAV_1.bus.TAirSup=[2.931499938964844e+02, 2.934417724609375e+02, 2.934788208007812e+02, 2.93883056640625e+02, 2.941762084960938e+02, 2.941072082519531e+02, 2.940464172363281e+02, 2.939945068359375e+02, 2.93953857421875e+02, 2.93924560546875e+02, 2.939037475585938e+02, 2.938895874023438e+02, 2.938804016113281e+02, 2.938748474121094e+02, 2.938716735839844e+02, 2.938701171875e+02, 2.938699035644531e+02, 2.938707885742188e+02, 2.938714904785156e+02, 2.938721923828125e+02, 2.938728637695312e+02, 2.9387353515625e+02, 2.938742065429688e+02, 2.938748474121094e+02, 2.9387548828125e+02, 2.938760986328125e+02, 2.938767395019531e+02, 2.938773498535156e+02, 2.938779296875e+02, 2.938785400390625e+02, 2.938791198730469e+02, 2.938796997070312e+02, 2.938802490234375e+02, 2.938807983398438e+02, 2.9388134765625e+02, 2.938818664550781e+02, 2.938823852539062e+02, 2.938828735351562e+02, 2.938837890625e+02, 2.938853454589844e+02, 2.938869934082031e+02, 2.93888671875e+02, 2.938904418945312e+02, 2.938922119140625e+02, 2.938939819335938e+02, 2.93895751953125e+02, 2.938974609375e+02, 2.938991088867188e+02, 2.939006652832031e+02, 2.939021301269531e+02, 2.939035034179688e+02, 2.9390478515625e+02, 2.939059448242188e+02, 2.939070129394531e+02, 2.93907958984375e+02, 2.939088439941406e+02, 2.939096374511719e+02, 2.939103698730469e+02, 2.939110107421875e+02, 2.9391162109375e+02, 2.939121398925781e+02, 2.939126281738281e+02, 2.939130554199219e+02, 2.939134521484375e+02, 2.93913818359375e+02, 2.939141235351562e+02, 2.939144287109375e+02, 2.939146728515625e+02, 2.939149169921875e+02, 2.939151306152344e+02, 2.939153137207031e+02, 2.939154663085938e+02, 2.939156188964844e+02, 2.939157409667969e+02, 2.939158630371094e+02, 2.939159851074219e+02, 2.939155883789062e+02, 2.939149475097656e+02, 2.939143676757812e+02, 2.939138488769531e+02, 2.939133605957031e+02, 2.939129028320312e+02, 2.939125061035156e+02, 2.939121704101562e+02, 2.939118347167969e+02, 2.939115295410156e+02, 2.939112548828125e+02, 2.939110107421875e+02, 2.939107971191406e+02, 2.939105834960938e+02, 2.93910400390625e+02, 2.939102478027344e+02, 2.939100952148438e+02, 2.939099426269531e+02, 2.939098205566406e+02, 2.939096984863281e+02, 2.939096069335938e+02, 2.939095153808594e+02, 2.93909423828125e+02, 2.939093627929688e+02, 2.939092712402344e+02]
-VAV_1.bus.TAirMix=[2.931499938964844e+02, 2.934419555664062e+02, 2.934414978027344e+02, 2.934410705566406e+02, 2.934406127929688e+02, 2.934401245117188e+02, 2.934396362304688e+02, 2.934391784667969e+02, 2.934387512207031e+02, 2.934383850097656e+02, 2.934381103515625e+02, 2.934378967285156e+02, 2.934377136230469e+02, 2.934375915527344e+02, 2.934375e+02, 2.934374389648438e+02, 2.934374389648438e+02, 2.934374694824219e+02, 2.934375e+02, 2.934375e+02, 2.934375305175781e+02, 2.934375610351562e+02, 2.934375610351562e+02, 2.934375915527344e+02, 2.934375915527344e+02, 2.934376220703125e+02, 2.934376220703125e+02, 2.934376525878906e+02, 2.934376525878906e+02, 2.934376831054688e+02, 2.934376831054688e+02, 2.934377136230469e+02, 2.934377136230469e+02, 2.934377136230469e+02, 2.93437744140625e+02, 2.93437744140625e+02, 2.93437744140625e+02, 2.934377746582031e+02, 2.934378967285156e+02, 2.934382019042969e+02, 2.934385070800781e+02, 2.934388732910156e+02, 2.934392700195312e+02, 2.93439697265625e+02, 2.934401550292969e+02, 2.93440673828125e+02, 2.934411926269531e+02, 2.934417114257812e+02, 2.934422912597656e+02, 2.934428405761719e+02, 2.934433898925781e+02, 2.934439392089844e+02, 2.934444885253906e+02, 2.934450073242188e+02, 2.934454956054688e+02, 2.934459838867188e+02, 2.934464416503906e+02, 2.934468383789062e+02, 2.934472351074219e+02, 2.934476013183594e+02, 2.934479370117188e+02, 2.934482727050781e+02, 2.934485473632812e+02, 2.934488220214844e+02, 2.934490661621094e+02, 2.934492797851562e+02, 2.934494934082031e+02, 2.934496765136719e+02, 2.934498291015625e+02, 2.934499816894531e+02, 2.934501342773438e+02, 2.934502563476562e+02, 2.934503784179688e+02, 2.934504699707031e+02, 2.934505615234375e+02, 2.934506530761719e+02, 2.934502258300781e+02, 2.934495849609375e+02, 2.93448974609375e+02, 2.934484558105469e+02, 2.934479675292969e+02, 2.93447509765625e+02, 2.934471130371094e+02, 2.934467468261719e+02, 2.934464416503906e+02, 2.934461364746094e+02, 2.934458923339844e+02, 2.934456481933594e+02, 2.934454345703125e+02, 2.934452209472656e+02, 2.934450378417969e+02, 2.934448852539062e+02, 2.934447631835938e+02, 2.934446105957031e+02, 2.934444885253906e+02, 2.934443969726562e+02, 2.934443054199219e+02, 2.934442138671875e+02, 2.934441223144531e+02, 2.934440612792969e+02, 2.934440002441406e+02]
-VAV_1.bus.TOut=[2.931499938964844e+02, 2.934419250488281e+02, 2.934414672851562e+02, 2.934410705566406e+02, 2.934406127929688e+02, 2.934401245117188e+02, 2.934396362304688e+02, 2.934391784667969e+02, 2.934387512207031e+02, 2.934384155273438e+02, 2.934381103515625e+02, 2.934378967285156e+02, 2.934377136230469e+02, 2.934375915527344e+02, 2.934375e+02, 2.934374389648438e+02, 2.934374389648438e+02, 2.934374694824219e+02, 2.934375e+02, 2.934375e+02, 2.934375305175781e+02, 2.934375610351562e+02, 2.934375610351562e+02, 2.934375915527344e+02, 2.934375915527344e+02, 2.934376220703125e+02, 2.934376220703125e+02, 2.934376525878906e+02, 2.934376525878906e+02, 2.934376831054688e+02, 2.934376831054688e+02, 2.934377136230469e+02, 2.934377136230469e+02, 2.934377136230469e+02, 2.93437744140625e+02, 2.93437744140625e+02, 2.93437744140625e+02, 2.934377746582031e+02, 2.934378967285156e+02, 2.934381713867188e+02, 2.934385070800781e+02, 2.934388732910156e+02, 2.934392700195312e+02, 2.93439697265625e+02, 2.934401550292969e+02, 2.934406433105469e+02, 2.93441162109375e+02, 2.934417114257812e+02, 2.934422607421875e+02, 2.934428100585938e+02, 2.93443359375e+02, 2.934439086914062e+02, 2.934444580078125e+02, 2.934449768066406e+02, 2.934454650878906e+02, 2.934459228515625e+02, 2.934463806152344e+02, 2.934468078613281e+02, 2.934471740722656e+02, 2.934475402832031e+02, 2.934478759765625e+02, 2.934481811523438e+02, 2.93448486328125e+02, 2.9344873046875e+02, 2.93448974609375e+02, 2.934491882324219e+02, 2.934494018554688e+02, 2.934495849609375e+02, 2.934497375488281e+02, 2.934498901367188e+02, 2.934500122070312e+02, 2.934501037597656e+02, 2.934501953125e+02, 2.934502868652344e+02, 2.934503479003906e+02, 2.934503784179688e+02, 2.934402465820312e+02, 2.934006042480469e+02, 2.933429565429688e+02, 2.932843627929688e+02, 2.9323583984375e+02, 2.932007446289062e+02, 2.931778869628906e+02, 2.931643981933594e+02, 2.931567993164062e+02, 2.931532287597656e+02, 2.931514587402344e+02, 2.93150634765625e+02, 2.931502685546875e+02, 2.931501159667969e+02, 2.931500549316406e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-VAV_1.bus.VOut_flow=[-0e+00, -3.610116839408875e-01, -3.538279831409454e-01, -3.435310125350952e-01, -3.311296105384827e-01, -3.173570036888123e-01, -3.02636593580246e-01, -2.872562110424042e-01, -2.725309133529663e-01, -2.59420245885849e-01, -2.479426711797714e-01, -2.382409572601318e-01, -2.304006516933441e-01, -2.244787216186523e-01, -2.204907536506653e-01, -2.184202820062637e-01, -2.181845754384995e-01, -2.194383293390274e-01, -2.204081118106842e-01, -2.213384658098221e-01, -2.22231537103653e-01, -2.230890393257141e-01, -2.239126861095428e-01, -2.247038930654526e-01, -2.254642248153687e-01, -2.261947840452194e-01, -2.268970459699631e-01, -2.275721877813339e-01, -2.282214164733887e-01, -2.288458496332169e-01, -2.29446604847908e-01, -2.300243675708771e-01, -2.305802702903748e-01, -2.311148792505264e-01, -2.316294014453888e-01, -2.321248650550842e-01, -2.326016575098038e-01, -2.330606281757355e-01, -2.305851578712463e-01, -2.240454256534576e-01, -2.166936993598938e-01, -2.08601638674736e-01, -1.998070180416107e-01, -1.903840154409409e-01, -1.804280877113342e-01, -1.700559854507446e-01, -1.594088673591614e-01, -1.486285626888275e-01, -1.378551423549652e-01, -1.272368580102921e-01, -1.168856993317604e-01, -1.069054454565048e-01, -9.737575054168701e-02, -8.835174143314362e-02, -7.986700534820557e-02, -7.194868475198746e-02, -6.459435075521462e-02, -5.779412761330611e-02, -5.153068900108337e-02, -4.577890411019325e-02, -4.051071032881737e-02, -3.570312261581421e-02, -3.13180536031723e-02, -2.732563763856888e-02, -2.369491010904312e-02, -2.039441093802452e-02, -1.739821955561638e-02, -1.468299422413111e-02, -1.222140993922947e-02, -9.990708902478237e-03, -7.969752885401249e-03, -6.138545460999012e-03, -4.481189418584108e-03, -2.983622951433063e-03, -1.628385274671018e-03, -4.021319036837667e-04, 7.087611593306065e-04, 1.71466579195112e-03, 2.622732892632484e-03, 3.442055778577924e-03, 4.182243254035711e-03, 4.851446952670819e-03, 5.456919781863689e-03, 6.003669463098049e-03, 6.501183845102787e-03, 6.945909466594458e-03, 7.347847800701857e-03, 7.711565587669611e-03, 8.039064705371857e-03, 8.33478756248951e-03, 8.602102287113667e-03, 8.843645453453064e-03, 9.062264114618301e-03, 9.259219281375408e-03, 9.437223896384239e-03, 9.597626514732838e-03, 9.742790833115578e-03, 9.874169714748859e-03, 9.992325678467751e-03, 1.009922195225954e-02, 1.019540056586266e-02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZDedicatedDampersPressure.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZDedicatedDampersPressure.txt
deleted file mode 100644
index bbf11dd16ba..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZDedicatedDampersPressure.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2023-09-27
-statistics-initialization=
-{
- "linear": "0",
- "nonlinear": "1, 0, 0, 0, 0, 0, 1, 5, 1, 0, 1, 1, 0",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": "0",
- "nonlinear": "1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 5, 1",
- "number of continuous time states": "38",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 1e+00]
-VAV_1.bus.TAirSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938966663e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.93150146484375e+02, 2.931501464845933e+02, 2.931501770019531e+02, 2.931502075195312e+02, 2.931502075195312e+02, 2.931502380371094e+02, 2.931502685546875e+02, 2.931502990722656e+02, 2.931503295898438e+02, 2.931503601069853e+02, 2.93150390624709e+02, 2.931504211424326e+02, 2.931504516601562e+02, 2.931504821777344e+02, 2.931505432128906e+02, 2.931505737304688e+02, 2.931506042480469e+02, 2.931506652832031e+02, 2.93150726318323e+02, 2.931507568360466e+02, 2.931508178713484e+02, 2.931508789066502e+02, 2.931509399414062e+02, 2.931510009765625e+02, 2.931510925292241e+02, 2.931511535644531e+02, 2.931512145998277e+02, 2.931513061523438e+02, 2.931513671875e+02, 2.931514587399797e+02, 2.931515197753906e+02, 2.931516113281614e+02, 2.931517028810413e+02, 2.931517944339212e+02, 2.931518859863281e+02, 2.931519775390625e+02, 2.931520996092295e+02, 2.931521911621094e+02]
-VAV_1.bus.TAirMix=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02]
-VAV_1.bus.TOut=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-VAV_1.bus.fanSup.V_flow=[0e+00, 1.469206836483692e-04, 5.720085724751053e-04, 1.256557355964126e-03, 2.187326873253534e-03, 3.322772357343373e-03, 4.65470153549575e-03, 6.232688154846984e-03, 7.959068145601111e-03, 9.833833444501902e-03, 1.183379596955182e-02, 1.398011775830639e-02, 1.6249083611176e-02, 1.862749759352354e-02, 2.108310893277518e-02, 2.361133727100496e-02, 2.625876388603659e-02, 2.896788294912222e-02, 3.173725852241387e-02, 3.456721523208411e-02, 3.745805012815005e-02, 4.037647885994045e-02, 4.330110957338924e-02, 4.622728255505208e-02, 4.91685436073165e-02, 5.21121434867382e-02, 5.505066644873368e-02, 5.798235593942651e-02, 6.090590322971261e-02, 6.382018570399724e-02, 6.67242522242545e-02, 6.961732288873852e-02, 7.248383963454808e-02, 7.531503962679804e-02, 7.812879134174215e-02, 8.092516826748249e-02, 8.370422920398916e-02, 8.646607267620166e-02, 8.921076487754312e-02, 9.193841756698896e-02, 9.464422453674862e-02, 9.728232119899603e-02, 9.989517522789645e-02, 1.024835314783436e-01, 1.050481057287668e-01, 1.075895384285782e-01, 1.101084256088558e-01, 1.126053336243518e-01, 1.150807690220743e-01, 1.175043485489457e-01, 1.198913529515266e-01, 1.222515724605889e-01, 1.24585781944045e-01, 1.268947339124535e-01, 1.291790704794851e-01, 1.314394596208849e-01, 1.336764985971864e-01, 1.358857319508485e-01, 1.380641794556069e-01, 1.402186658487397e-01, 1.423497596459033e-01, 1.444580077898518e-01, 1.465438892473995e-01, 1.486078808551005e-01, 1.506504296490695e-01, 1.526730853876935e-01, 1.546895004264681e-01, 1.566884931458959e-01, 1.586702898920355e-01, 1.6063515888566e-01, 1.625832789399162e-01, 1.645148884763556e-01, 1.66430184744435e-01, 1.683293544908267e-01, 1.702379268048471e-01, 1.72145202755928e-01, 1.740433144736194e-01, 1.759322023550527e-01, 1.778118365974793e-01, 1.796821762800856e-01, 1.815431840930286e-01, 1.833948488598068e-01, 1.852543069468474e-01, 1.871355058347001e-01, 1.890157510458917e-01, 1.908947482623849e-01, 1.927722516629543e-01, 1.94648011624822e-01, 1.965218046295396e-01, 1.983934071590499e-01, 2.002654419187248e-01, 2.021780708871572e-01, 2.040966717133204e-01, 2.060207859805827e-01, 2.079500262575588e-01, 2.098839902121981e-01, 2.118223053136467e-01, 2.137646023450177e-01, 2.157105766347403e-01, 2.176857273695171e-01, 2.196795493364334e-01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZFanRelief.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZFanRelief.txt
deleted file mode 100644
index cef6a73b209..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZFanRelief.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2023-05-24
-statistics-initialization=
-{
- "nonlinear": "1, 0, 2, 0, 1, 5, 1, 0, 1, 0",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": "0",
- "nonlinear": "1, 2, 1, 0, 0, 0, 1, 5, 1",
- "number of continuous time states": "29",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 1e+00]
-VAV_1.bus.TAirSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.93150146484375e+02, 2.93150146484375e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931502075195312e+02, 2.931502380371094e+02, 2.931502685543965e+02, 2.931502685546875e+02, 2.931502990722656e+02, 2.931503295899893e+02, 2.931503601077129e+02, 2.931504211425781e+02, 2.931504516598288e+02, 2.931504821777344e+02, 2.931505126953125e+02, 2.931505737304688e+02, 2.931506042483015e+02, 2.931506652832031e+02, 2.931507263179956e+02, 2.931507568359375e+02, 2.931508178710938e+02, 2.931508789063228e+02, 2.931509399416245e+02, 2.931510009769263e+02, 2.931510925288967e+02, 2.931511535641985e+02, 2.931512145996094e+02, 2.931513061523438e+02, 2.931513671876819e+02, 2.931514587405618e+02, 2.931515502925322e+02, 2.931516418454121e+02, 2.93151733398292e+02, 2.931518249511719e+02]
-VAV_1.bus.TAirMix=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499633789062e+02]
-VAV_1.bus.TOut=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-VAV_1.bus.fanSup.V_flow=[0e+00, 1.554221310491496e-04, 6.02572601716051e-04, 1.327918786271533e-03, 2.28917375399002e-03, 3.475339523597557e-03, 4.885089322303964e-03, 6.476504678826906e-03, 8.219076646913076e-03, 1.010184386593189e-02, 1.209142587706885e-02, 1.418885787680293e-02, 1.635644271441025e-02, 1.85792251981654e-02, 2.084904895499401e-02, 2.316147508984937e-02, 2.551518093187349e-02, 2.791132175977039e-02, 3.035217906460109e-02, 3.284044623801264e-02, 3.53778928355537e-02, 3.793490473276988e-02, 4.047329008884787e-02, 4.299612983232017e-02, 4.551084474214744e-02, 4.801575466990471e-02, 5.050952224641012e-02, 5.29910299435335e-02, 5.545940593326886e-02, 5.791391636387851e-02, 6.034603426223358e-02, 6.275795342798879e-02, 6.515297464238233e-02, 6.753096418588553e-02, 6.989184682822007e-02, 7.223556329808718e-02, 7.456207688618793e-02, 7.687141636491512e-02, 7.916167487094007e-02, 8.143359746184287e-02, 8.368805661946516e-02, 8.59251626348662e-02, 8.814499816948497e-02, 9.034765354693126e-02, 9.253323130020591e-02, 9.470183659604647e-02, 9.685964702617965e-02, 9.900497670609046e-02, 1.011357181189412e-01, 1.032519767422825e-01, 1.05353906750679e-01, 1.074415986696826e-01, 1.095151791623196e-01, 1.115747674380928e-01, 1.136204705568739e-01, 1.15652409760461e-01, 1.176706994741262e-01, 1.196754440045218e-01, 1.216772381085927e-01, 1.236744500767046e-01, 1.256619793565666e-01, 1.276401104101604e-01, 1.296090474294277e-01, 1.315690437338957e-01, 1.335202781383513e-01, 1.354630039635651e-01, 1.373973885197839e-01, 1.393236634823662e-01, 1.412420110117393e-01, 1.43152624823101e-01, 1.450658612464618e-01, 1.469824355199074e-01, 1.488957797419987e-01, 1.508062892496062e-01, 1.527142506532494e-01, 1.546200066804886e-01, 1.565238404538837e-01, 1.584260499980087e-01, 1.603269184355657e-01, 1.62226732469852e-01, 1.641257531657835e-01, 1.660242374185663e-01, 1.679293228956968e-01, 1.698434980899704e-01, 1.717610111512436e-01, 1.736822082454234e-01, 1.75607469901689e-01, 1.775371423094483e-01, 1.794715532957753e-01, 1.814110008849595e-01, 1.833558278039571e-01, 1.853062906311976e-01, 1.872627255410875e-01, 1.892253742467414e-01, 1.911966358371682e-01, 1.931781494454928e-01, 1.951678140048315e-01, 1.971658858018205e-01, 1.991726866764419e-01, 2.011884878688377e-01, 2.03213557600975e-01]
-VAV_1.bus.VOut_flow=[-0e+00, 1.002694966873784e-04, 4.123538287168865e-04, 9.267714178612501e-04, 1.644035994437116e-03, 2.552647303164986e-03, 3.620548097285894e-03, 4.848905334894146e-03, 6.228435114973782e-03, 7.738870475729319e-03, 9.378355675814644e-03, 1.111124559774996e-02, 1.295083625960663e-02, 1.489285009420167e-02, 1.688953104571458e-02, 1.894239398385718e-02, 2.106769087912473e-02, 2.326082957341716e-02, 2.551736333250407e-02, 2.783296499530172e-02, 3.020338456590688e-02, 3.262445863759374e-02, 3.504015534013746e-02, 3.74571447382322e-02, 3.98958599301027e-02, 4.235317558050156e-02, 4.482615975728042e-02, 4.731202975946678e-02, 4.980818524960701e-02, 5.231218249244549e-02, 5.479700568571098e-02, 5.726725176733036e-02, 5.973200676024958e-02, 6.218989989121613e-02, 6.463972391617823e-02, 6.708040233538765e-02, 6.951100032130945e-02, 7.193072770110354e-02, 7.431429737201384e-02, 7.666901834246818e-02, 7.900472591631684e-02, 8.13214638133256e-02, 8.361927719725784e-02, 8.589815185930379e-02, 8.81581460830432e-02, 9.039934245342524e-02, 9.261180276870479e-02, 9.479868437931263e-02, 9.696381770009198e-02, 9.91074198984775e-02, 1.01229727268219e-01, 1.033309941542005e-01, 1.054115036833466e-01, 1.074715464292598e-01, 1.095114157708511e-01, 1.115314489458272e-01, 1.135319541113865e-01, 1.155132516407252e-01, 1.174713703650349e-01, 1.194073906340856e-01, 1.213237746749331e-01, 1.232208284530247e-01, 1.250988087080183e-01, 1.26958028363233e-01, 1.287987407393684e-01, 1.306212289611161e-01, 1.324257654498043e-01, 1.342126548388306e-01, 1.359821247368665e-01, 1.377344582658271e-01, 1.394720992202145e-01, 1.411954201282963e-01, 1.429032634684802e-01, 1.445959178225825e-01, 1.462736560851979e-01, 1.479367762804031e-01, 1.495855168249298e-01, 1.512201608442511e-01, 1.528409318568507e-01, 1.544480885467627e-01, 1.560418735880412e-01, 1.576225157796274e-01, 1.591962587163019e-01, 1.60765263066706e-01, 1.623245667431966e-01, 1.638745032637898e-01, 1.654154487313252e-01, 1.669476919036707e-01, 1.684715606064435e-01, 1.699873379627722e-01, 1.714953368983917e-01, 1.729958316152203e-01, 1.744891082208818e-01, 1.759754259704105e-01, 1.774607900357036e-01, 1.789493578513428e-01, 1.804348709236366e-01, 1.81917707852876e-01, 1.833982886462502e-01, 1.848769769878896e-01, 1.863541454076767e-01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZFanSupplyBlowThrough.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZFanSupplyBlowThrough.txt
deleted file mode 100644
index 55898108458..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZFanSupplyBlowThrough.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2023-05-24
-statistics-initialization=
-{
- "nonlinear": "1, 0, 1, 0, 0, 1, 5, 1, 1, 0, 1, 0",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": " ",
- "nonlinear": "1, 0, 1, 0, 1, 1, 0, 0, 1, 5, 1",
- "number of continuous time states": "30",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 1e+00]
-VAV_1.bus.TAirSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244138442e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.93150146484375e+02, 2.93150146484375e+02, 2.931501770019531e+02, 2.931501770019531e+02, 2.931502075195312e+02, 2.931502380371094e+02, 2.931502380371094e+02, 2.931502685546875e+02, 2.931502990722656e+02, 2.931503295895891e+02, 2.931503295898438e+02, 2.931503601074583e+02, 2.931503906251819e+02, 2.931504516601562e+02, 2.931504821772978e+02, 2.931505126953125e+02, 2.931505432128906e+02, 2.931506042480469e+02, 2.931506347657705e+02, 2.931506958007812e+02, 2.931507568359375e+02, 2.931507873535156e+02, 2.931508483886719e+02, 2.931509094238281e+02, 2.931509704590935e+02, 2.931510620117188e+02, 2.93151123046875e+02, 2.931511840820312e+02, 2.931512756345473e+02, 2.931513671874272e+02, 2.93151428222729e+02, 2.931515197756089e+02, 2.931516113284888e+02, 2.931517028808594e+02, 2.931518249509172e+02, 2.931519165037971e+02, 2.931520385742188e+02, 2.93152130127135e+02, 2.93152252197593e+02, 2.931523742671416e+02, 2.931524963375996e+02, 2.931526184080576e+02, 2.931527404785156e+02]
-VAV_1.bus.TAirMix=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02]
-VAV_1.bus.TOut=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-VAV_1.bus.fanSup.V_flow=[0e+00, 1.829000628343488e-04, 7.197420676760761e-04, 1.592682746358498e-03, 2.788720072585885e-03, 4.237857531206956e-03, 5.942178672307592e-03, 7.870138563096939e-03, 9.975265174831082e-03, 1.223785533689005e-02, 1.462027580598464e-02, 1.709923349448175e-02, 1.965088652814932e-02, 2.224892316402563e-02, 2.487655154543743e-02, 2.753691588263097e-02, 3.022441364466171e-02, 3.292984466923775e-02, 3.565344019098711e-02, 3.839608720052512e-02, 4.115807555093987e-02, 4.391532198846861e-02, 4.66540384566494e-02, 4.938306545836188e-02, 5.209504212767619e-02, 5.478798970580101e-02, 5.74619758190826e-02, 6.011732011055358e-02, 6.275460092661397e-02, 6.537453302970778e-02, 6.797777551880474e-02, 7.056382236958872e-02, 7.313517664408292e-02, 7.569296323311082e-02, 7.823841927975568e-02, 8.077277393834287e-02, 8.329732355460726e-02, 8.581316351299038e-02, 8.831827461531219e-02, 9.081049619165417e-02, 9.329310656859524e-02, 9.57661726954102e-02, 9.822973931271285e-02, 1.00683851277557e-01, 1.03128575370104e-01, 1.055639713165947e-01, 1.079871634335877e-01, 1.103987026101801e-01, 1.128000195690239e-01, 1.151911742571602e-01, 1.175722479820251e-01, 1.199432932043054e-01, 1.223043695308469e-01, 1.246555514676687e-01, 1.269968846950032e-01, 1.293284567265553e-01, 1.316503280835022e-01, 1.339625434683112e-01, 1.362637915751952e-01, 1.385539532007607e-01, 1.408341174695162e-01, 1.431043711667835e-01, 1.453647155731344e-01, 1.476152102921478e-01, 1.498559149286818e-01, 1.520868741871792e-01, 1.543081195613273e-01, 1.565197222342418e-01, 1.587217285408204e-01, 1.609141831843313e-01, 1.630973245831648e-01, 1.652713017500454e-01, 1.674359677002054e-01, 1.695914078440366e-01, 1.71737639052842e-01, 1.738747358322144e-01, 1.760027428842163e-01, 1.781217198153399e-01, 1.80231711329282e-01, 1.823327794366507e-01, 1.844249789849992e-01, 1.865083421278342e-01, 1.88584150366555e-01, 1.906540577307559e-01, 1.927161121680864e-01, 1.947703908653626e-01, 1.96817007717726e-01, 1.988560249633857e-01, 2.008875320086339e-01, 2.029116182607575e-01, 2.049283582265216e-01, 2.06937814456911e-01, 2.089401003132277e-01, 2.109352634008516e-01, 2.129241828888578e-01, 2.149091237559615e-01, 2.168879551355147e-01, 2.188607844960546e-01, 2.208277396638673e-01, 2.227889131699815e-01, 2.247444242238998e-01]
-VAV_1.bus.VOut_flow=[-0e+00, 5.576723836641253e-05, 2.262588784012335e-04, 5.02959905094465e-04, 8.566020825975588e-04, 1.336431325927651e-03, 1.881217311535537e-03, 2.479430036627425e-03, 3.139184908258117e-03, 3.822893354026362e-03, 4.525126785941374e-03, 5.21967284783581e-03, 5.890972623469717e-03, 6.544782622328203e-03, 7.185022308837962e-03, 7.780663797677073e-03, 8.330440339689717e-03, 8.853953239974975e-03, 9.351242916782394e-03, 9.822354760569365e-03, 1.026733486070029e-02, 1.068623297279971e-02, 1.10791000042674e-02, 1.140349811351402e-02, 1.168371657697231e-02, 1.192648708820343e-02, 1.213186903611128e-02, 1.229991188608814e-02, 1.243066041280774e-02, 1.252414664601952e-02, 1.258196210211871e-02, 1.261642854161039e-02, 1.261712236793014e-02, 1.258404465912953e-02, 1.251718684180008e-02, 1.241653219107312e-02, 1.228205880834123e-02, 1.211373423516653e-02, 1.193034454533021e-02, 1.175181633393152e-02, 1.155150042268013e-02, 1.132936953536285e-02, 1.108539257013165e-02, 1.081954055549566e-02, 1.053177837558531e-02, 1.022207419081422e-02, 9.920944702072563e-03, 9.625649043921897e-03, 9.322779854996967e-03, 9.013120382726676e-03, 8.697452023625374e-03, 8.376562659219718e-03, 8.051238329164354e-03, 7.722271591228435e-03, 7.390455125538388e-03, 7.056579392554906e-03, 6.721441713978067e-03, 6.385839304252694e-03, 6.07008717016869e-03, 5.778453030817366e-03, 5.498129134186444e-03, 5.230604114473053e-03, 4.977371661497369e-03, 4.739923759935763e-03, 4.519752858906891e-03, 4.318349077293435e-03, 4.137204015883683e-03, 3.977805161299945e-03, 3.841641915179406e-03, 3.730201139520589e-03, 3.643026487744158e-03, 3.580330539288255e-03, 3.545660824550313e-03, 3.540413441096789e-03, 3.565983810323421e-03, 3.623765194788575e-03, 3.715148302581427e-03, 3.841520802165484e-03, 4.004267574152645e-03, 4.204766827171263e-03, 4.444395352924898e-03, 4.724519256555794e-03, 5.025836375966221e-03, 5.320392137907656e-03, 5.643562375187468e-03, 5.995513004664514e-03, 6.376409341687328e-03, 6.786403045160389e-03, 7.225638473311234e-03, 7.694251134000789e-03, 8.192365356350316e-03, 8.720091060283573e-03, 9.277531858301035e-03, 9.864770378769247e-03, 1.046643699065193e-02, 1.103880977524812e-02, 1.16242061979639e-02, 1.222145571519367e-02, 1.282939663788185e-02, 1.344685942317828e-02, 1.407268084585667e-02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMultiZone.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMultiZone.txt
new file mode 100644
index 00000000000..c64e1006a00
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMultiZone.txt
@@ -0,0 +1,18 @@
+last-generated=2023-09-19
+statistics-initialization=
+{
+ "nonlinear": "1, 2, 0, 0, 1, 5, 1, 0, 1, 1, 0",
+ "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+ "linear": " ",
+ "nonlinear": "1, 1, 2, 0, 0, 0, 1, 5, 1, 1",
+ "number of continuous time states": "36",
+ "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+04]
+VAV_1.bus.TAirSup=[2.931499938964844e+02, 2.935587463378906e+02, 2.939021911621094e+02, 2.943377990722656e+02, 2.941629943847656e+02, 2.940722351074219e+02, 2.940494079589844e+02, 2.939938049316406e+02, 2.939225463867188e+02, 2.938546447753906e+02, 2.938159484863281e+02, 2.937929077148438e+02, 2.937657775878906e+02, 2.937570495605469e+02, 2.9375634765625e+02, 2.937438049316406e+02, 2.937452087402344e+02, 2.937531127929688e+02, 2.937454833984375e+02, 2.93749267578125e+02, 2.937566528320312e+02, 2.937488708496094e+02, 2.937529907226562e+02, 2.937599487304688e+02, 2.937518615722656e+02, 2.937565612792969e+02, 2.937630615234375e+02, 2.93754638671875e+02, 2.937599487304688e+02, 2.937655334472656e+02, 2.937572326660156e+02, 2.937631225585938e+02, 2.93767822265625e+02, 2.937594909667969e+02, 2.937662048339844e+02, 2.937696838378906e+02, 2.937616882324219e+02, 2.9376904296875e+02, 2.937713928222656e+02, 2.937637329101562e+02, 2.937716369628906e+02, 2.937727355957031e+02, 2.937656860351562e+02, 2.937740783691406e+02, 2.937737426757812e+02, 2.937676696777344e+02, 2.937763366699219e+02, 2.937744750976562e+02, 2.937695922851562e+02, 2.937783813476562e+02, 2.937750549316406e+02, 2.93771484375e+02, 2.937801818847656e+02, 2.937753601074219e+02, 2.937733764648438e+02, 2.937817077636719e+02, 2.937756042480469e+02, 2.937752685546875e+02, 2.93782958984375e+02, 2.937757568359375e+02, 2.937771606445312e+02, 2.93783935546875e+02, 2.9377587890625e+02, 2.937789611816406e+02, 2.937847290039062e+02, 2.937760925292969e+02, 2.937807312011719e+02, 2.9378515625e+02, 2.937764892578125e+02, 2.937824096679688e+02, 2.937852478027344e+02, 2.937770080566406e+02, 2.937838439941406e+02, 2.937851257324219e+02, 2.937776184082031e+02, 2.93785400390625e+02, 2.937847290039062e+02, 2.937784118652344e+02, 2.937866821289062e+02, 2.937841186523438e+02, 2.937793579101562e+02, 2.937877502441406e+02, 2.937833862304688e+02, 2.937804870605469e+02, 2.937886047363281e+02, 2.937825317382812e+02, 2.9378173828125e+02, 2.937892456054688e+02, 2.937818603515625e+02, 2.937830505371094e+02, 2.937896118164062e+02, 2.937813415527344e+02, 2.937843627929688e+02, 2.937897033691406e+02, 2.937809143066406e+02, 2.937856750488281e+02, 2.937894592285156e+02, 2.937807922363281e+02, 2.937870178222656e+02, 2.937889099121094e+02, 2.937808837890625e+02]
+VAV_1.bus.TAirMix=[2.931499938964844e+02, 2.932084655761719e+02, 2.932410888671875e+02, 2.932364501953125e+02, 2.932334594726562e+02, 2.932936401367188e+02, 2.933694458007812e+02, 2.933857421875e+02, 2.933811950683594e+02, 2.93352294921875e+02, 2.933258972167969e+02, 2.933309936523438e+02, 2.933168334960938e+02, 2.933013305664062e+02, 2.933142395019531e+02, 2.933074951171875e+02, 2.932958068847656e+02, 2.933122253417969e+02, 2.933078918457031e+02, 2.932975158691406e+02, 2.933141479492188e+02, 2.933087463378906e+02, 2.932992248535156e+02, 2.933161315917969e+02, 2.933092956542969e+02, 2.933009338378906e+02, 2.933185729980469e+02, 2.933096008300781e+02, 2.933026428222656e+02, 2.933198547363281e+02, 2.933096313476562e+02, 2.933044128417969e+02, 2.933216552734375e+02, 2.933092956542969e+02, 2.933063659667969e+02, 2.933232116699219e+02, 2.933089294433594e+02, 2.933082580566406e+02, 2.933245849609375e+02, 2.933085021972656e+02, 2.933101806640625e+02, 2.933256530761719e+02, 2.933080749511719e+02, 2.933121948242188e+02, 2.933263244628906e+02, 2.933076782226562e+02, 2.933143005371094e+02, 2.933265991210938e+02, 2.933074340820312e+02, 2.9331640625e+02, 2.93326416015625e+02, 2.93307373046875e+02, 2.933185119628906e+02, 2.933256530761719e+02, 2.933075256347656e+02, 2.933206481933594e+02, 2.933244018554688e+02, 2.933079833984375e+02, 2.933226623535156e+02, 2.9332275390625e+02, 2.933087463378906e+02, 2.9332470703125e+02, 2.933207702636719e+02, 2.933097229003906e+02, 2.933265991210938e+02, 2.933187255859375e+02, 2.933111572265625e+02, 2.933282165527344e+02, 2.933167419433594e+02, 2.933127746582031e+02, 2.933294982910156e+02, 2.933149108886719e+02, 2.93314453125e+02, 2.933303527832031e+02, 2.933132934570312e+02, 2.933164672851562e+02, 2.933306274414062e+02, 2.933119506835938e+02, 2.933186340332031e+02, 2.93330322265625e+02, 2.933109436035156e+02, 2.933207397460938e+02, 2.933292541503906e+02, 2.933105163574219e+02, 2.933229064941406e+02, 2.93327392578125e+02, 2.933105163574219e+02, 2.933250732421875e+02, 2.933252258300781e+02, 2.9331103515625e+02, 2.933270263671875e+02, 2.933227844238281e+02, 2.933119812011719e+02, 2.933288269042969e+02, 2.933200988769531e+02, 2.93313232421875e+02, 2.93330322265625e+02, 2.93317626953125e+02, 2.933150329589844e+02, 2.933313598632812e+02, 2.933154296875e+02]
+VAV_1.bus.TOut=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+VAV_1.bus.fanSup.V_flow=[0e+00, 9.863148629665375e-02, 1.372568011283875e-01, 1.754816770553589e-01, 2.132712155580521e-01, 2.501983046531677e-01, 2.856027781963348e-01, 3.196141719818116e-01, 3.517200350761414e-01, 3.79051685333252e-01, 3.998571038246155e-01, 4.195103645324707e-01, 4.348210990428925e-01, 4.437176883220673e-01, 4.523314237594604e-01, 4.5697420835495e-01, 4.554579854011536e-01, 4.547984004020691e-01, 4.540781676769257e-01, 4.50529545545578e-01, 4.505095779895782e-01, 4.498641192913055e-01, 4.465525448322296e-01, 4.467501938343048e-01, 4.461225271224976e-01, 4.430406391620636e-01, 4.434032440185547e-01, 4.427923858165741e-01, 4.399421811103821e-01, 4.405469596385956e-01, 4.398108124732971e-01, 4.372105598449707e-01, 4.380121827125549e-01, 4.371281564235687e-01, 4.348138272762299e-01, 4.357887208461761e-01, 4.347284138202667e-01, 4.327090084552765e-01, 4.338264465332031e-01, 4.325753748416901e-01, 4.308760464191437e-01, 4.320951998233795e-01, 4.306473433971405e-01, 4.292671382427216e-01, 4.305717349052429e-01, 4.288973212242126e-01, 4.278824031352997e-01, 4.292183518409729e-01, 4.273299276828766e-01, 4.266778826713562e-01, 4.27998423576355e-01, 4.259264171123505e-01, 4.256400763988495e-01, 4.268874526023865e-01, 4.246678054332733e-01, 4.247495234012604e-01, 4.258497655391693e-01, 4.235475957393647e-01, 4.23979640007019e-01, 4.2486971616745e-01, 4.225711822509766e-01, 4.233314990997314e-01, 4.239303171634674e-01, 4.217305183410645e-01, 4.227667450904846e-01, 4.230434000492096e-01, 4.210230112075806e-01, 4.222908914089203e-01, 4.221972227096558e-01, 4.204398095607758e-01, 4.218859672546387e-01, 4.214078485965729e-01, 4.199666976928711e-01, 4.215312600135803e-01, 4.206756949424744e-01, 4.195935726165771e-01, 4.212182760238647e-01, 4.199880957603455e-01, 4.193158745765686e-01, 4.209332764148712e-01, 4.193543195724487e-01, 4.191097915172577e-01, 4.20644223690033e-01, 4.187897741794586e-01, 4.189608991146088e-01, 4.203183948993683e-01, 4.182875454425812e-01, 4.1886106133461e-01, 4.199521243572235e-01, 4.178744554519653e-01, 4.187909066677094e-01, 4.19549971818924e-01, 4.175449311733246e-01, 4.187552630901337e-01, 4.191088974475861e-01, 4.1730597615242e-01, 4.187501668930054e-01, 4.186632335186005e-01, 4.17150616645813e-01, 4.187596142292023e-01, 4.182214438915253e-01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_ZoneEquipment_Validation_VAVBoxCoolingOnly.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_ZoneEquipment_Validation_VAVBoxCoolingOnly.txt
index 01cb58950b7..9b72b4ea205 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_ZoneEquipment_Validation_VAVBoxCoolingOnly.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_ZoneEquipment_Validation_VAVBoxCoolingOnly.txt
@@ -1,4 +1,4 @@
-last-generated=2023-05-24
+last-generated=2023-09-19
statistics-initialization=
{
"nonlinear": "1, 0",
@@ -8,8 +8,11 @@ statistics-simulation=
{
"linear": " ",
"nonlinear": "1",
- "number of continuous time states": "2",
+ "number of continuous time states": "6",
"numerical Jacobians": "0"
}
-time=[0e+00, 1e+00]
-VAVBox_1.damVAV.m_flow=[1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01, 1.52911439538002e-01]
+time=[0e+00, 3.6e+03]
+VAVBox_1.bus.TAirSup=[2.881499938964844e+02, 2.881499938964844e+02]
+VAVBox_1.bus.TAirDis=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+VAVBox_1.bus.TZon=[3.031499938964844e+02, 3.031499938964844e+02]
+VAVBox_1.damVAV.m_flow=[1.52911439538002e-01, 6.630999967455864e-03, 1.109313406050205e-02, 1.497852057218552e-02, 1.827635802328587e-02, 2.174478769302368e-02, 2.541116252541542e-02, 2.926483750343323e-02, 3.331105411052704e-02, 3.755940124392509e-02, 4.19941321015358e-02, 4.656396061182022e-02, 5.122861638665199e-02, 5.592766031622887e-02, 6.059535965323449e-02, 6.52245357632637e-02, 6.979543715715408e-02, 7.42269828915596e-02, 7.736549526453018e-02, 8.010240644216537e-02, 8.27019140124321e-02, 8.5137739777565e-02, 8.742186427116394e-02, 8.956070989370346e-02, 9.156154841184616e-02, 9.343422949314117e-02, 9.518521279096603e-02, 9.682107716798782e-02, 9.835001826286316e-02, 9.977896511554718e-02, 1.011137217283249e-01, 1.023596748709679e-01, 1.035242527723312e-01, 1.046120896935463e-01, 1.056274026632309e-01, 1.065762639045715e-01, 1.074628531932831e-01, 1.082905828952789e-01, 1.090639680624008e-01, 1.097868084907532e-01, 1.104622855782509e-01, 1.110928058624268e-01, 1.116825714707375e-01, 1.12233929336071e-01, 1.127487123012543e-01, 1.132302358746529e-01, 1.13680474460125e-01, 1.141011342406273e-01, 1.144946292042732e-01, 1.14862747490406e-01, 1.152070388197899e-01, 1.155286505818367e-01, 1.158298403024673e-01, 1.161116063594818e-01, 1.163748949766159e-01, 1.166214495897293e-01, 1.168522164225578e-01, 1.17067925632e-01, 1.17269828915596e-01, 1.174589246511459e-01, 1.176359206438065e-01, 1.178012192249298e-01, 1.179562211036682e-01, 1.181013435125351e-01, 1.182369366288185e-01, 1.183640137314796e-01, 1.184830665588379e-01, 1.185943484306335e-01, 1.186985373497009e-01, 1.187962293624878e-01, 1.188877373933792e-01, 1.189730986952782e-01, 1.190532445907593e-01, 1.191283389925957e-01, 1.191984713077545e-01, 1.192642152309418e-01, 1.193259060382843e-01, 1.193835139274597e-01, 1.194374486804008e-01, 1.194880753755569e-01, 1.195355430245399e-01, 1.195797398686409e-01, 1.196212619543076e-01, 1.196602955460548e-01, 1.196966469287872e-01, 1.197307258844376e-01, 1.197627484798431e-01, 1.197926998138428e-01, 1.198206543922424e-01, 1.198468953371048e-01, 1.198716089129448e-01, 1.198945119976997e-01, 1.19916059076786e-01, 1.199363023042679e-01, 1.199551820755005e-01, 1.199728697538376e-01, 1.199894621968269e-01, 1.200050190091133e-01, 1.200195178389549e-01, 1.200331449508667e-01, 1.200459450483322e-01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_ZoneEquipment_Validation_VAVBoxCoolingOnlyControlG36.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_ZoneEquipment_Validation_VAVBoxCoolingOnlyControlG36.txt
deleted file mode 100644
index 7a7e3764744..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_ZoneEquipment_Validation_VAVBoxCoolingOnlyControlG36.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-last-generated=2023-05-24
-statistics-initialization=
-{
- "nonlinear": "1, 0",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": " ",
- "nonlinear": "1",
- "number of continuous time states": "6",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 3.6e+03]
-VAVBox_1.bus.TAirSup=[2.881499938964844e+02, 2.881499938964844e+02]
-VAVBox_1.bus.TAirDis=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-VAVBox_1.bus.TZon=[3.031499938964844e+02, 3.031499938964844e+02]
-VAVBox_1.damVAV.m_flow=[1.52911439538002e-01, 6.630999967455864e-03, 1.109313406050205e-02, 1.497852057218552e-02, 1.827635802328587e-02, 2.174478769302368e-02, 2.541116252541542e-02, 2.926483750343323e-02, 3.331105411052704e-02, 3.755940124392509e-02, 4.19941321015358e-02, 4.656396061182022e-02, 5.122861638665199e-02, 5.592766031622887e-02, 6.059535965323449e-02, 6.52245357632637e-02, 6.979543715715408e-02, 7.42269828915596e-02, 7.736549526453018e-02, 8.010240644216537e-02, 8.27019140124321e-02, 8.5137739777565e-02, 8.742186427116394e-02, 8.956070989370346e-02, 9.156154841184616e-02, 9.343422949314117e-02, 9.518521279096603e-02, 9.682107716798782e-02, 9.835001826286316e-02, 9.977896511554718e-02, 1.011137217283249e-01, 1.023596748709679e-01, 1.035242527723312e-01, 1.046120896935463e-01, 1.056274026632309e-01, 1.065762639045715e-01, 1.074628531932831e-01, 1.082905828952789e-01, 1.090639680624008e-01, 1.097868084907532e-01, 1.104622855782509e-01, 1.110928058624268e-01, 1.116825714707375e-01, 1.12233929336071e-01, 1.127487123012543e-01, 1.132302358746529e-01, 1.13680474460125e-01, 1.141011342406273e-01, 1.144946292042732e-01, 1.14862747490406e-01, 1.152070388197899e-01, 1.155286505818367e-01, 1.158298403024673e-01, 1.161116063594818e-01, 1.163748949766159e-01, 1.166214495897293e-01, 1.168522164225578e-01, 1.17067925632e-01, 1.17269828915596e-01, 1.174589246511459e-01, 1.176359206438065e-01, 1.178012192249298e-01, 1.179562211036682e-01, 1.181013435125351e-01, 1.182369366288185e-01, 1.183640137314796e-01, 1.184830665588379e-01, 1.185943484306335e-01, 1.186985373497009e-01, 1.187962293624878e-01, 1.188877373933792e-01, 1.189730986952782e-01, 1.190532445907593e-01, 1.191283389925957e-01, 1.191984713077545e-01, 1.192642152309418e-01, 1.193259060382843e-01, 1.193835139274597e-01, 1.194374486804008e-01, 1.194880753755569e-01, 1.195355430245399e-01, 1.195797398686409e-01, 1.196212619543076e-01, 1.196602955460548e-01, 1.196966469287872e-01, 1.197307258844376e-01, 1.197627484798431e-01, 1.197926998138428e-01, 1.198206543922424e-01, 1.198468953371048e-01, 1.198716089129448e-01, 1.198945119976997e-01, 1.19916059076786e-01, 1.199363023042679e-01, 1.199551820755005e-01, 1.199728697538376e-01, 1.199894621968269e-01, 1.200050190091133e-01, 1.200195178389549e-01, 1.200331449508667e-01, 1.200459450483322e-01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_ZoneEquipment_Validation_VAVBoxReheatControlG36.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_ZoneEquipment_Validation_VAVBoxReheat.txt
similarity index 99%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_ZoneEquipment_Validation_VAVBoxReheatControlG36.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_ZoneEquipment_Validation_VAVBoxReheat.txt
index 018a92e8f27..1b58384bbf3 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_ZoneEquipment_Validation_VAVBoxReheatControlG36.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_ZoneEquipment_Validation_VAVBoxReheat.txt
@@ -1,4 +1,4 @@
-last-generated=2023-05-24
+last-generated=2023-09-19
statistics-initialization=
{
"nonlinear": "1, 0",
diff --git a/Buildings/Resources/Scripts/BuildingsPy/conf.yml b/Buildings/Resources/Scripts/BuildingsPy/conf.yml
index 415599b5adf..8f7fc4b2fc4 100644
--- a/Buildings/Resources/Scripts/BuildingsPy/conf.yml
+++ b/Buildings/Resources/Scripts/BuildingsPy/conf.yml
@@ -313,65 +313,22 @@
optimica:
comment: See https://github.com/lbl-srg/modelica-buildings/issues/2235
translate: false
-- model_name: Buildings.Templates.AirHandlersFans.Validation.VAVMZBase
- openmodelica:
- comment: Translation failed.
- translate: false
-- model_name: Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilElectricHeating
- openmodelica:
- comment: Translation failed.
- translate: false
-- model_name: Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilEvaporatorMultiStage
- openmodelica:
- comment: Translation failed.
- translate: false
-- model_name: Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilEvaporatorVariable
- openmodelica:
- comment: Translation failed.
- translate: false
-- model_name: Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilWaterHeating3WVReheat
- openmodelica:
- comment: Time out after 300 s.
- translate: false
-- model_name: Buildings.Templates.AirHandlersFans.Validation.VAVMZControlG36Airflow
+- model_name: Buildings.Templates.AirHandlersFans.Validation.VAVMultiZone
optimica:
comment: Array size mismatch in modification of the attribute quantity for the variable TZon. This is a bug in OCT tracked under Modelon#2023022839000276.
translate: false
openmodelica:
comment: Translation failed.
translate: false
-- model_name: Buildings.Templates.AirHandlersFans.Validation.VAVMZControlG36Pressure
- optimica:
- comment: Array size mismatch in modification of the attribute quantity for the variable TZon. This is a bug in OCT tracked under Modelon#2023022839000276.
- translate: false
- openmodelica:
- comment: Translation failed.
- translate: false
-- model_name: Buildings.Templates.AirHandlersFans.Validation.VAVMZDedicatedDampersPressure
- openmodelica:
- comment: Time out after 300 s.
- translate: false
-- model_name: Buildings.Templates.AirHandlersFans.Validation.VAVMZFanRelief
- openmodelica:
- comment: Time out after 300 s.
- translate: false
-- model_name: Buildings.Templates.AirHandlersFans.Validation.VAVMZFanSupplyBlowThrough
- openmodelica:
- comment: Translation failed.
- translate: false
- model_name: Buildings.Templates.Components.Validation.Fans
openmodelica:
comment: Translation failed.
translate: false
- model_name: Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnly
- openmodelica:
- comment: Time out after 300 s.
- translate: false
-- model_name: Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnlyControlG36
openmodelica:
comment: Translation failed.
translate: false
-- model_name: Buildings.Templates.ZoneEquipment.Validation.VAVBoxReheatControlG36
+- model_name: Buildings.Templates.ZoneEquipment.Validation.VAVBoxReheat
openmodelica:
comment: Time out after 300 s.
translate: false
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZBase.mos b/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZBase.mos
deleted file mode 100644
index e3d38f620d9..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZBase.mos
+++ /dev/null
@@ -1,20 +0,0 @@
-simulateModel("Buildings.Templates.AirHandlersFans.Validation.VAVMZBase",
- method="cvode",
- tolerance=1e-6,
- stopTime=1.0,
- resultFile="VAVMZBase");
-createPlot(
- id=1,
- subPlot=1,
- position={20, 20, 500, 500},
- y={"VAV_1.bus.TAirSup", "VAV_1.bus.TAirMix", "VAV_1.bus.TOut"},
- autoscale=true,
- grid=true
-);
-createPlot(
- id=1,
- subPlot=2,
- y={"VAV_1.bus.fanSup.V_flow", "VAV_1.bus.VOut_flow"},
- autoscale=true,
- grid=true
-);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZCoilElectricHeating.mos b/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZCoilElectricHeating.mos
deleted file mode 100644
index ab6d9d37a77..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZCoilElectricHeating.mos
+++ /dev/null
@@ -1,20 +0,0 @@
-simulateModel("Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilElectricHeating",
- method="cvode",
- tolerance=1e-6,
- stopTime=1.0,
- resultFile="VAVMZCoilElectricHeating");
-createPlot(
- id=1,
- subPlot=1,
- position={20, 20, 500, 500},
- y={"VAV_1.bus.TAirSup", "VAV_1.bus.TAirMix", "VAV_1.bus.TOut"},
- autoscale=true,
- grid=true
-);
-createPlot(
- id=1,
- subPlot=2,
- y={"VAV_1.bus.fanSup.V_flow", "VAV_1.bus.VOut_flow"},
- autoscale=true,
- grid=true
-);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZCoilEvaporatorMultiStage.mos b/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZCoilEvaporatorMultiStage.mos
deleted file mode 100644
index dff6a331204..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZCoilEvaporatorMultiStage.mos
+++ /dev/null
@@ -1,20 +0,0 @@
-simulateModel("Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilEvaporatorMultiStage",
- method="cvode",
- tolerance=1e-6,
- stopTime=1.0,
- resultFile="VAVMZCoilEvaporatorMultiStage");
-createPlot(
- id=1,
- subPlot=1,
- position={20, 20, 500, 500},
- y={"VAV_1.bus.TAirSup", "VAV_1.bus.TAirMix", "VAV_1.bus.TOut"},
- autoscale=true,
- grid=true
-);
-createPlot(
- id=1,
- subPlot=2,
- y={"VAV_1.bus.fanSup.V_flow", "VAV_1.bus.VOut_flow"},
- autoscale=true,
- grid=true
-);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZCoilEvaporatorVariable.mos b/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZCoilEvaporatorVariable.mos
deleted file mode 100644
index eb46e31a5de..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZCoilEvaporatorVariable.mos
+++ /dev/null
@@ -1,20 +0,0 @@
-simulateModel("Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilEvaporatorVariable",
- method="cvode",
- tolerance=1e-6,
- stopTime=1.0,
- resultFile="VAVMZCoilEvaporatorVariable");
-createPlot(
- id=1,
- subPlot=1,
- position={20, 20, 500, 500},
- y={"VAV_1.bus.TAirSup", "VAV_1.bus.TAirMix", "VAV_1.bus.TOut"},
- autoscale=true,
- grid=true
-);
-createPlot(
- id=1,
- subPlot=2,
- y={"VAV_1.bus.fanSup.V_flow", "VAV_1.bus.VOut_flow"},
- autoscale=true,
- grid=true
-);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZCoilWaterHeating3WVReheat.mos b/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZCoilWaterHeating3WVReheat.mos
deleted file mode 100644
index 0e4dcc654e5..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZCoilWaterHeating3WVReheat.mos
+++ /dev/null
@@ -1,20 +0,0 @@
-simulateModel("Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilWaterHeating3WVReheat",
- method="cvode",
- tolerance=1e-6,
- stopTime=1.0,
- resultFile="VAVMZCoilWaterHeating3WVReheat");
-createPlot(
- id=1,
- subPlot=1,
- position={20, 20, 500, 500},
- y={"VAV_1.bus.TAirSup", "VAV_1.bus.TAirMix", "VAV_1.bus.TOut"},
- autoscale=true,
- grid=true
-);
-createPlot(
- id=1,
- subPlot=2,
- y={"VAV_1.bus.fanSup.V_flow", "VAV_1.bus.VOut_flow"},
- autoscale=true,
- grid=true
-);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZControlG36Pressure.mos b/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZControlG36Pressure.mos
deleted file mode 100644
index 0abf6c30e03..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZControlG36Pressure.mos
+++ /dev/null
@@ -1,20 +0,0 @@
-simulateModel("Buildings.Templates.AirHandlersFans.Validation.VAVMZControlG36Pressure",
- method="cvode",
- tolerance=1e-6,
- stopTime=10000,
- resultFile="VAVMZControlG36Pressure");
-createPlot(
- id=1,
- subPlot=1,
- position={20, 20, 500, 500},
- y={"VAV_1.bus.TAirSup", "VAV_1.bus.TAirMix", "VAV_1.bus.TOut"},
- autoscale=true,
- grid=true
-);
-createPlot(
- id=1,
- subPlot=2,
- y={"VAV_1.bus.VOut_flow"},
- autoscale=true,
- grid=true
-);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZDedicatedDampersPressure.mos b/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZDedicatedDampersPressure.mos
deleted file mode 100644
index 82467d81e47..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZDedicatedDampersPressure.mos
+++ /dev/null
@@ -1,20 +0,0 @@
-simulateModel("Buildings.Templates.AirHandlersFans.Validation.VAVMZDedicatedDampersPressure",
- method="cvode",
- tolerance=1e-6,
- stopTime=1.0,
- resultFile="VAVMZDedicatedDampersPressure");
-createPlot(
- id=1,
- subPlot=1,
- position={20, 20, 500, 500},
- y={"VAV_1.bus.TAirSup", "VAV_1.bus.TAirMix", "VAV_1.bus.TOut"},
- autoscale=true,
- grid=true
-);
-createPlot(
- id=1,
- subPlot=2,
- y={"VAV_1.bus.fanSup.V_flow"},
- autoscale=true,
- grid=true
-);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZFanRelief.mos b/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZFanRelief.mos
deleted file mode 100644
index da6ed92788c..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZFanRelief.mos
+++ /dev/null
@@ -1,20 +0,0 @@
-simulateModel("Buildings.Templates.AirHandlersFans.Validation.VAVMZFanRelief",
- method="cvode",
- tolerance=1e-6,
- stopTime=1.0,
- resultFile="VAVMZFanRelief");
-createPlot(
- id=1,
- subPlot=1,
- position={20, 20, 500, 500},
- y={"VAV_1.bus.TAirSup", "VAV_1.bus.TAirMix", "VAV_1.bus.TOut"},
- autoscale=true,
- grid=true
-);
-createPlot(
- id=1,
- subPlot=2,
- y={"VAV_1.bus.fanSup.V_flow", "VAV_1.bus.VOut_flow"},
- autoscale=true,
- grid=true
-);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZFanSupplyBlowThrough.mos b/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZFanSupplyBlowThrough.mos
deleted file mode 100644
index 723a342e506..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZFanSupplyBlowThrough.mos
+++ /dev/null
@@ -1,20 +0,0 @@
-simulateModel("Buildings.Templates.AirHandlersFans.Validation.VAVMZFanSupplyBlowThrough",
- method="cvode",
- tolerance=1e-6,
- stopTime=1.0,
- resultFile="VAVMZFanSupplyBlowThrough");
-createPlot(
- id=1,
- subPlot=1,
- position={20, 20, 500, 500},
- y={"VAV_1.bus.TAirSup", "VAV_1.bus.TAirMix", "VAV_1.bus.TOut"},
- autoscale=true,
- grid=true
-);
-createPlot(
- id=1,
- subPlot=2,
- y={"VAV_1.bus.fanSup.V_flow", "VAV_1.bus.VOut_flow"},
- autoscale=true,
- grid=true
-);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZControlG36Airflow.mos b/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMultiZone.mos
similarity index 86%
rename from Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZControlG36Airflow.mos
rename to Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMultiZone.mos
index 288d1e302e1..dd03770564b 100644
--- a/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMZControlG36Airflow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Templates/AirHandlersFans/Validation/VAVMultiZone.mos
@@ -1,8 +1,8 @@
-simulateModel("Buildings.Templates.AirHandlersFans.Validation.VAVMZControlG36Airflow",
+simulateModel("Buildings.Templates.AirHandlersFans.Validation.VAVMultiZone",
method="cvode",
tolerance=1e-6,
stopTime=10000,
- resultFile="VAVMZControlG36Airflow");
+ resultFile="VAVMultiZone");
createPlot(
id=1,
subPlot=1,
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/ZoneEquipment/Validation/VAVBoxCoolingOnly.mos b/Buildings/Resources/Scripts/Dymola/Templates/ZoneEquipment/Validation/VAVBoxCoolingOnly.mos
index 898996d2622..1a8e65824ef 100644
--- a/Buildings/Resources/Scripts/Dymola/Templates/ZoneEquipment/Validation/VAVBoxCoolingOnly.mos
+++ b/Buildings/Resources/Scripts/Dymola/Templates/ZoneEquipment/Validation/VAVBoxCoolingOnly.mos
@@ -1,11 +1,19 @@
simulateModel("Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnly",
method="cvode",
tolerance=1e-6,
- stopTime=1.0,
+ stopTime=3600,
resultFile="VAVBoxCoolingOnly");
createPlot(
id=1,
+ subPlot=1,
position={20, 20, 500, 500},
+ y={"VAVBox_1.bus.TAirSup", "VAVBox_1.bus.TAirDis", "VAVBox_1.bus.TZon"},
+ autoscale=true,
+ grid=true
+);
+createPlot(
+ id=1,
+ subPlot=2,
y={"VAVBox_1.damVAV.m_flow"},
autoscale=true,
grid=true
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/ZoneEquipment/Validation/VAVBoxCoolingOnlyControlG36.mos b/Buildings/Resources/Scripts/Dymola/Templates/ZoneEquipment/Validation/VAVBoxCoolingOnlyControlG36.mos
deleted file mode 100644
index 0dc9eb36750..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Templates/ZoneEquipment/Validation/VAVBoxCoolingOnlyControlG36.mos
+++ /dev/null
@@ -1,20 +0,0 @@
-simulateModel("Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnlyControlG36",
- method="cvode",
- tolerance=1e-6,
- stopTime=3600,
- resultFile="VAVBoxCoolingOnlyControlG36");
-createPlot(
- id=1,
- subPlot=1,
- position={20, 20, 500, 500},
- y={"VAVBox_1.bus.TAirSup", "VAVBox_1.bus.TAirDis", "VAVBox_1.bus.TZon"},
- autoscale=true,
- grid=true
-);
-createPlot(
- id=1,
- subPlot=2,
- y={"VAVBox_1.damVAV.m_flow"},
- autoscale=true,
- grid=true
-);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/ZoneEquipment/Validation/VAVBoxReheatControlG36.mos b/Buildings/Resources/Scripts/Dymola/Templates/ZoneEquipment/Validation/VAVBoxReheat.mos
similarity index 86%
rename from Buildings/Resources/Scripts/Dymola/Templates/ZoneEquipment/Validation/VAVBoxReheatControlG36.mos
rename to Buildings/Resources/Scripts/Dymola/Templates/ZoneEquipment/Validation/VAVBoxReheat.mos
index bb3fae39d39..ab1ee7c1991 100644
--- a/Buildings/Resources/Scripts/Dymola/Templates/ZoneEquipment/Validation/VAVBoxReheatControlG36.mos
+++ b/Buildings/Resources/Scripts/Dymola/Templates/ZoneEquipment/Validation/VAVBoxReheat.mos
@@ -1,8 +1,8 @@
-simulateModel("Buildings.Templates.ZoneEquipment.Validation.VAVBoxReheatControlG36",
+simulateModel("Buildings.Templates.ZoneEquipment.Validation.VAVBoxReheat",
method="cvode",
tolerance=1e-6,
stopTime=3600,
- resultFile="VAVBoxReheatControlG36");
+ resultFile="VAVBoxReheat");
createPlot(
id=1,
subPlot=1,
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZBase.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZBase.mos
deleted file mode 100644
index 52b34531c27..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZBase.mos
+++ /dev/null
@@ -1,8 +0,0 @@
-compareVars :=
- {
- "VAV_1.bus.TAirSup",
- "VAV_1.bus.TAirMix",
- "VAV_1.bus.TOut",
- "VAV_1.bus.fanSup.V_flow",
- "VAV_1.bus.VOut_flow"
- };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilElectricHeating.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilElectricHeating.mos
deleted file mode 100644
index 52b34531c27..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilElectricHeating.mos
+++ /dev/null
@@ -1,8 +0,0 @@
-compareVars :=
- {
- "VAV_1.bus.TAirSup",
- "VAV_1.bus.TAirMix",
- "VAV_1.bus.TOut",
- "VAV_1.bus.fanSup.V_flow",
- "VAV_1.bus.VOut_flow"
- };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilEvaporatorMultiStage.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilEvaporatorMultiStage.mos
deleted file mode 100644
index 52b34531c27..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilEvaporatorMultiStage.mos
+++ /dev/null
@@ -1,8 +0,0 @@
-compareVars :=
- {
- "VAV_1.bus.TAirSup",
- "VAV_1.bus.TAirMix",
- "VAV_1.bus.TOut",
- "VAV_1.bus.fanSup.V_flow",
- "VAV_1.bus.VOut_flow"
- };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilEvaporatorVariable.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilEvaporatorVariable.mos
deleted file mode 100644
index 52b34531c27..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilEvaporatorVariable.mos
+++ /dev/null
@@ -1,8 +0,0 @@
-compareVars :=
- {
- "VAV_1.bus.TAirSup",
- "VAV_1.bus.TAirMix",
- "VAV_1.bus.TOut",
- "VAV_1.bus.fanSup.V_flow",
- "VAV_1.bus.VOut_flow"
- };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilWaterHeating3WVReheat.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilWaterHeating3WVReheat.mos
deleted file mode 100644
index 52b34531c27..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZCoilWaterHeating3WVReheat.mos
+++ /dev/null
@@ -1,8 +0,0 @@
-compareVars :=
- {
- "VAV_1.bus.TAirSup",
- "VAV_1.bus.TAirMix",
- "VAV_1.bus.TOut",
- "VAV_1.bus.fanSup.V_flow",
- "VAV_1.bus.VOut_flow"
- };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZControlG36Pressure.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZControlG36Pressure.mos
deleted file mode 100644
index e5e4781e9e9..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZControlG36Pressure.mos
+++ /dev/null
@@ -1,7 +0,0 @@
-compareVars :=
- {
- "VAV_1.bus.TAirSup",
- "VAV_1.bus.TAirMix",
- "VAV_1.bus.TOut",
- "VAV_1.bus.VOut_flow"
- };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZDedicatedDampersPressure.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZDedicatedDampersPressure.mos
deleted file mode 100644
index 9db3c5c2164..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZDedicatedDampersPressure.mos
+++ /dev/null
@@ -1,7 +0,0 @@
-compareVars :=
- {
- "VAV_1.bus.TAirSup",
- "VAV_1.bus.TAirMix",
- "VAV_1.bus.TOut",
- "VAV_1.bus.fanSup.V_flow"
- };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZFanRelief.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZFanRelief.mos
deleted file mode 100644
index 52b34531c27..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZFanRelief.mos
+++ /dev/null
@@ -1,8 +0,0 @@
-compareVars :=
- {
- "VAV_1.bus.TAirSup",
- "VAV_1.bus.TAirMix",
- "VAV_1.bus.TOut",
- "VAV_1.bus.fanSup.V_flow",
- "VAV_1.bus.VOut_flow"
- };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZFanSupplyBlowThrough.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZFanSupplyBlowThrough.mos
deleted file mode 100644
index 52b34531c27..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZFanSupplyBlowThrough.mos
+++ /dev/null
@@ -1,8 +0,0 @@
-compareVars :=
- {
- "VAV_1.bus.TAirSup",
- "VAV_1.bus.TAirMix",
- "VAV_1.bus.TOut",
- "VAV_1.bus.fanSup.V_flow",
- "VAV_1.bus.VOut_flow"
- };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZControlG36Airflow.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMultiZone.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMZControlG36Airflow.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.AirHandlersFans.Validation.VAVMultiZone.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnly.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnly.mos
index 8576bff9fd2..e5912f579af 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnly.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnly.mos
@@ -1,4 +1,7 @@
compareVars :=
{
+ "VAVBox_1.bus.TAirSup",
+ "VAVBox_1.bus.TAirDis",
+ "VAVBox_1.bus.TZon",
"VAVBox_1.damVAV.m_flow"
};
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnlyControlG36.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.ZoneEquipment.Validation.VAVBoxReheat.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnlyControlG36.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.ZoneEquipment.Validation.VAVBoxReheat.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.ZoneEquipment.Validation.VAVBoxReheatControlG36.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.ZoneEquipment.Validation.VAVBoxReheatControlG36.mos
deleted file mode 100644
index e5912f579af..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.ZoneEquipment.Validation.VAVBoxReheatControlG36.mos
+++ /dev/null
@@ -1,7 +0,0 @@
-compareVars :=
- {
- "VAVBox_1.bus.TAirSup",
- "VAVBox_1.bus.TAirDis",
- "VAVBox_1.bus.TZon",
- "VAVBox_1.damVAV.m_flow"
- };
diff --git a/Buildings/Resources/Scripts/travis/Makefile b/Buildings/Resources/Scripts/travis/Makefile
index 0456be0ac5a..47e63a0c442 100644
--- a/Buildings/Resources/Scripts/travis/Makefile
+++ b/Buildings/Resources/Scripts/travis/Makefile
@@ -172,3 +172,9 @@ test-optimica:
(cd $(ROOT)/Buildings && \
export PYTHONPATH=$(TRAVIS_BUILD_DIR)/Buildings/Resources/Python-Sources && \
python3 ../bin/runUnitTests.py --batch --single-package $(PACKAGE) --tool optimica --skip-verification -n $(NPROC))
+
+test-templates-dymola:
+ (cd $(ROOT)/Buildings && ../Buildings/Resources/Scripts/travis/templates/checkandrun.sh --checksum --tool Dymola)
+
+test-templates-optimica:
+ (cd $(ROOT)/Buildings && ../Buildings/Resources/Scripts/travis/templates/checkandrun.sh --checksum --tool Optimica)
diff --git a/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum b/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum
new file mode 100644
index 00000000000..3602f95b60d
--- /dev/null
+++ b/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum
@@ -0,0 +1 @@
+5f9a1b3af189924f1cfb6c10c66afaec
diff --git a/Buildings/Resources/Scripts/travis/templates/VAVBox.py b/Buildings/Resources/Scripts/travis/templates/VAVBox.py
new file mode 100755
index 00000000000..55bbddb2418
--- /dev/null
+++ b/Buildings/Resources/Scripts/travis/templates/VAVBox.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+"""Generate combinations and run simulations.
+
+This script shall be run from the directory `modelica-buildings/Buildings`,
+i.e., where the top-level `package.mo` file can be found.
+
+Args:
+ - See docstring of core.py for the optional positional arguments of this script.
+
+Returns:
+ - 0 if all simulations succeed.
+ - 1 otherwise.
+
+Details:
+ The script performs the following tasks.
+ - Generate all possible combinations of class modifications based on a set of
+ parameter bindings and redeclare statements provided in `MODIF_GRID`.
+ - Exclude the combinations based on a match with the patterns provided in `EXCLUDE`.
+ - This allows excluding unsupported configurations.
+ - Exclude the class modifications based on a match with the patterns provided in `REMOVE_MODIF`,
+ and prune the resulting duplicated combinations.
+ - This allows reducing the number of simulations by excluding class modifications that
+ yield the same model, i.e., modifications to parameters that are not used (disabled) in
+ the given configuration.
+ - For the remaining combinations: run the corresponding simulations for the models in `MODELS`.
+"""
+
+from core import *
+
+MODELS = [
+ 'Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnly',
+ 'Buildings.Templates.ZoneEquipment.Validation.VAVBoxReheat',
+]
+
+# See docstring of `generate_combinations` function for the structure of MODIF_GRID.
+# Tested modifications should at least cover the options specified at:
+# https://github.com/lbl-srg/ctrl-flow-dev/blob/main/server/scripts/sequence-doc/src/version/Current%20G36%20Decisions/Guideline%2036-2021%20(mappings).csv
+MODIF_GRID = {
+ 'Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnly': dict(
+ VAVBox_1__ctl__have_occSen=[
+ 'true',
+ 'false',
+ ],
+ VAVBox_1__ctl__have_winSen=[
+ 'true',
+ 'false',
+ ],
+ VAVBox_1__ctl__have_CO2Sen=[
+ 'true',
+ 'false',
+ ],
+ ),
+}
+MODIF_GRID['Buildings.Templates.ZoneEquipment.Validation.VAVBoxReheat'] = {
+ **MODIF_GRID['Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnly'],
+ **dict(
+ VAVBox_1__redeclare__coiHea=[
+ 'Buildings.Templates.Components.Coils.WaterBasedHeating'
+ + '(typVal=Buildings.Templates.Components.Types.Valve.TwoWayModulating)',
+ 'Buildings.Templates.Components.Coils.WaterBasedHeating'
+ + '(typVal=Buildings.Templates.Components.Types.Valve.ThreeWayModulating)',
+ 'Buildings.Templates.Components.Coils.ElectricHeating',
+ ],
+ ),
+}
+
+# See docstring of `prune_modifications` function for the structure of EXCLUDE.
+EXCLUDE = None
+
+# See docstring of `prune_modifications` function for the structure of REMOVE_MODIF.
+REMOVE_MODIF = None
+
+
+if __name__ == '__main__':
+ main(models=MODELS, modif_grid=MODIF_GRID, exclude=EXCLUDE, remove_modif=REMOVE_MODIF)
diff --git a/Buildings/Resources/Scripts/travis/templates/VAVMultiZone.py b/Buildings/Resources/Scripts/travis/templates/VAVMultiZone.py
new file mode 100755
index 00000000000..96f05cc6377
--- /dev/null
+++ b/Buildings/Resources/Scripts/travis/templates/VAVMultiZone.py
@@ -0,0 +1,271 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+"""Generate combinations and run simulations.
+
+This script shall be run from the directory `modelica-buildings/Buildings`,
+i.e., where the top-level `package.mo` file can be found.
+
+Args:
+ - See docstring of core.py for the optional positional arguments of this script.
+
+Returns:
+ - 0 if all simulations succeed.
+ - 1 otherwise.
+
+Details:
+ The script performs the following tasks.
+ - Generate all possible combinations of class modifications based on a set of
+ parameter bindings and redeclare statements provided in `MODIF_GRID`.
+ - Exclude the combinations based on a match with the patterns provided in `EXCLUDE`.
+ - This allows excluding unsupported configurations.
+ - Exclude the class modifications based on a match with the patterns provided in `REMOVE_MODIF`,
+ and prune the resulting duplicated combinations.
+ - This allows reducing the number of simulations by excluding class modifications that
+ yield the same model, i.e., modifications to parameters that are not used (disabled) in
+ the given configuration.
+ - For the remaining combinations: run the corresponding simulations for the models in `MODELS`.
+"""
+
+from core import *
+
+MODELS = [
+ 'Buildings.Templates.AirHandlersFans.Validation.VAVMultiZone',
+]
+
+# See docstring of `generate_combinations` function for the structure of MODIF_GRID.
+# Tested modifications should at least cover the options specified at:
+# https://github.com/lbl-srg/ctrl-flow-dev/blob/main/server/scripts/sequence-doc/src/version/Current%20G36%20Decisions/Guideline%2036-2021%20(mappings).csv
+MODIF_GRID = {
+ 'Buildings.Templates.AirHandlersFans.Validation.VAVMultiZone': {
+ 'VAV_1__redeclare__coiHeaPre': [
+ 'Buildings.Templates.Components.Coils.None',
+ 'Buildings.Templates.Components.Coils.WaterBasedHeating',
+ 'Buildings.Templates.Components.Coils.ElectricHeating',
+ ],
+ 'VAV_1__redeclare__coiCoo': [
+ 'Buildings.Templates.Components.Coils.None',
+ 'Buildings.Templates.Components.Coils.WaterBasedCooling',
+ 'Buildings.Templates.Components.Coils.EvaporatorVariableSpeed',
+ ],
+ 'VAV_1__secOutRel__redeclare__secOut': [
+ 'Buildings.Templates.AirHandlersFans.Components.OutdoorSection.DedicatedDampersAirflow',
+ 'Buildings.Templates.AirHandlersFans.Components.OutdoorSection.DedicatedDampersPressure',
+ 'Buildings.Templates.AirHandlersFans.Components.OutdoorSection.SingleDamper',
+ ],
+ 'VAV_1__secOutRel__redeclare__secRel': [
+ 'Buildings.Templates.AirHandlersFans.Components.ReliefReturnSection.ReliefDamper',
+ 'Buildings.Templates.AirHandlersFans.Components.ReliefReturnSection.ReliefFan',
+ 'Buildings.Templates.AirHandlersFans.Components.ReliefReturnSection.ReturnFan',
+ ],
+ 'VAV_1__redeclare__fanSupBlo': [
+ 'Buildings.Templates.Components.Fans.None',
+ 'Buildings.Templates.Components.Fans.SingleVariable',
+ 'Buildings.Templates.Components.Fans.ArrayVariable(nFan=2)',
+ ],
+ 'VAV_1__redeclare__fanSupDra': [
+ 'Buildings.Templates.Components.Fans.None',
+ 'Buildings.Templates.Components.Fans.SingleVariable',
+ 'Buildings.Templates.Components.Fans.ArrayVariable(nFan=2)',
+ ],
+ 'VAV_1__ctl__typCtlEco': [
+ 'Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedDryBulb',
+ 'Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.DifferentialDryBulb',
+ 'Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedDryBulbWithDifferentialDryBulb',
+ 'Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedEnthalpyWithFixedDryBulb',
+ 'Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.DifferentialEnthalpyWithFixedDryBulb',
+ ],
+ 'VAV_1__ctl__typCtlFanRet': [
+ 'Buildings.Templates.AirHandlersFans.Types.ControlFanReturn.AirflowMeasured',
+ 'Buildings.Templates.AirHandlersFans.Types.ControlFanReturn.BuildingPressure',
+ ],
+ 'VAV_1__ctl__have_perZonRehBox': [
+ 'true',
+ 'false',
+ ],
+ 'VAV_1__ctl__have_frePro': [
+ 'true',
+ 'false',
+ ],
+ 'VAV_1__ctl__typFreSta': [
+ 'Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.No_freeze_stat',
+ 'Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment',
+ 'Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_BAS',
+ ],
+ 'VAV_1__ctl__have_CO2Sen': [
+ 'true',
+ 'false',
+ ],
+ },
+}
+
+# See docstring of `prune_modifications` function for the structure of EXCLUDE.
+EXCLUDE = {
+ 'Buildings.Templates.AirHandlersFans.Validation.VAVMultiZone': [
+ [
+ 'Buildings.Templates.Components.Fans.None fanSupBlo',
+ 'Buildings.Templates.Components.Fans.None fanSupDra',
+ ],
+ [
+ 'Buildings.Templates.Components.Fans.(SingleVariable|ArrayVariable) fanSupBlo',
+ 'Buildings.Templates.Components.Fans.(SingleVariable|ArrayVariable) fanSupDra',
+ ],
+ ],
+}
+
+# See docstring of `prune_modifications` function for the structure of REMOVE_MODIF.
+REMOVE_MODIF = {
+ 'Buildings.Templates.AirHandlersFans.Validation.VAVMultiZone': [
+ (
+ [
+ 'Buildings.Templates.AirHandlersFans.Components.ReliefReturnSection.(?!ReturnFan)',
+ ],
+ [
+ 'typCtlFanRet',
+ ],
+ ),
+ (
+ [
+ 'have_frePro=false',
+ ],
+ [
+ 'typFreSta',
+ ],
+ ),
+ (
+ [
+ 'Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.(?!DedicatedDampersPressure)',
+ ],
+ [
+ 'have_CO2Sen',
+ ],
+ ),
+ # We don't test all combinations of equipment and control options to limit the number of simulations.
+ (
+ [
+ 'Buildings.Templates.Components.Coils.(None|ElectricHeating|EvaporatorVariableSpeed)',
+ ],
+ [
+ 'secOut',
+ 'secRel',
+ 'fanSupBlo',
+ 'fanSupDra',
+ 'typCtlFanRet',
+ 'typCtlEco',
+ 'have_perZonRehBox',
+ 'have_frePro',
+ 'typFreSta',
+ 'have_CO2Sen',
+ ],
+ ),
+ (
+ [
+ 'Buildings.Templates.Components.Fans.ArrayVariable',
+ ],
+ [
+ 'coiHeaPre',
+ 'coiCoo',
+ 'secOut',
+ 'secRel',
+ 'typCtlFanRet',
+ 'typCtlEco',
+ 'have_perZonRehBox',
+ 'have_frePro',
+ 'typFreSta',
+ 'have_CO2Sen',
+ ],
+ ),
+ (
+ [
+ 'Buildings.Templates.Components.Fans.(?!None) fanSupBlo',
+ ],
+ [
+ 'coiHeaPre',
+ 'coiCoo',
+ 'secOut',
+ 'secRel',
+ 'typCtlFanRet',
+ 'typCtlEco',
+ 'have_perZonRehBox',
+ 'have_frePro',
+ 'typFreSta',
+ 'have_CO2Sen',
+ ],
+ ),
+ (
+ [
+ 'typCtlEco=Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.(?!FixedDryBulb)',
+ ],
+ [
+ 'typCtlFanRet',
+ 'have_perZonRehBox',
+ 'have_frePro',
+ 'typFreSta',
+ 'have_CO2Sen',
+ ],
+ ),
+ (
+ [
+ 'typCtlFanRet=Buildings.Templates.AirHandlersFans.Types.ControlFanReturn.BuildingPressure',
+ ],
+ [
+ 'typCtlEco',
+ 'have_perZonRehBox',
+ 'have_frePro',
+ 'typFreSta',
+ 'have_CO2Sen',
+ ],
+ ),
+ (
+ [
+ 'have_perZonRehBox=false',
+ ],
+ [
+ 'typCtlEco',
+ 'typCtlFanRet',
+ 'have_frePro',
+ 'typFreSta',
+ 'have_CO2Sen',
+ ],
+ ),
+ (
+ [
+ 'have_frePro=false',
+ ],
+ [
+ 'typCtlEco',
+ 'typCtlFanRet',
+ 'have_perZonRehBox',
+ 'typFreSta',
+ 'have_CO2Sen',
+ ],
+ ),
+ (
+ [
+ 'typFreSta=Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.(?!No_freeze_stat)',
+ ],
+ [
+ 'typCtlEco',
+ 'typCtlFanRet',
+ 'have_perZonRehBox',
+ 'have_CO2Sen',
+ ],
+ ),
+ (
+ [
+ 'have_CO2Sen=false',
+ ],
+ [
+ 'typCtlEco',
+ 'typCtlFanRet',
+ 'have_perZonRehBox',
+ 'have_frePro',
+ 'typFreSta',
+ ],
+ ),
+ ]
+}
+
+
+if __name__ == '__main__':
+ main(models=MODELS, modif_grid=MODIF_GRID, exclude=EXCLUDE, remove_modif=REMOVE_MODIF)
diff --git a/Buildings/Resources/Scripts/travis/templates/ZoneEquipment.checksum b/Buildings/Resources/Scripts/travis/templates/ZoneEquipment.checksum
new file mode 100644
index 00000000000..5861014a278
--- /dev/null
+++ b/Buildings/Resources/Scripts/travis/templates/ZoneEquipment.checksum
@@ -0,0 +1 @@
+acbd9555f66c19c6b0b3c0144697b21b
diff --git a/Buildings/Resources/Scripts/travis/templates/checkandrun.sh b/Buildings/Resources/Scripts/travis/templates/checkandrun.sh
new file mode 100755
index 00000000000..b22cf3c63f6
--- /dev/null
+++ b/Buildings/Resources/Scripts/travis/templates/checkandrun.sh
@@ -0,0 +1,134 @@
+#!/bin/bash
+# coding: utf-8
+
+# This script shall be run from `modelica-buildings/Buildings`,
+# i.e., where the top-level `package.mo` file can be found.
+#
+# Command line flags: see the code for argument parsing, case * ).
+#
+# The script performs the following tasks.
+# - Generate checksums for all *.mo files within the Templates package, order them
+# based on the file names, and generates the checksum of those checksums.
+# - Compare the resulting checksum with the stored value from previous evaluation.
+# - If the values differ: run simulation script (*.py),
+# otherwise do nothing.
+# - If all simulations succeed: overwrite stored checksum with new value,
+# otherwise do nothing.
+
+LOCALRUN=false
+USE_CHECKSUM=false
+SIMULATOR=Dymola
+FRACTION_TEST_COVERAGE=1
+
+CGREEN='\033[0;32m'
+CRED='\033[0;31m'
+CEND='\033[0m'
+
+while [[ "$1" != "" ]]; do
+ case $1 in
+ --local )
+ LOCALRUN=true
+ ;;
+ --checksum )
+ USE_CHECKSUM=true
+ ;;
+ --tool )
+ shift
+ if [[ "$1" == "Dymola" ]] || [[ "$1" == "Optimica" ]]; then
+ SIMULATOR="$1"
+ else
+ echo "$0: $1 is not a valid Modelica tool, only Dymola and Optimica are allowed." >&2
+ exit
+ fi
+ ;;
+ --cover )
+ shift
+ if (( $(echo "$1 > 0.0" | bc -l) )) && (( $(echo "$1 <= 1.0" | bc -l) )); then
+ FRACTION_TEST_COVERAGE=$1
+ else
+ echo "$0: $1 is not a valid fraction of test coverage, it must be within ]0, 1]." >&2
+ exit
+ fi
+ ;;
+ * )
+ echo "Invalid option: $1"
+ echo "Usage: checkandrun.sh [--local] [--checksum] [--tool tool_name] [--cover test_coverage]"
+ echo " --local is for a local run execution (run simulations and update the checksum)."
+ echo " --checksum is to trigger testing based on checksum verification (only option currently available)."
+ echo " --tool enables specifying the Modelica tool to be used, defaulting to Dymola."
+ echo " --cover enables specifying the fraction of test coverage, defaulting to 1."
+ exit
+ ;;
+ esac
+ shift
+done
+
+# Declare directories that must be checked (with checksum) for each template package.
+# Each key is a Modelica package name under Buildings.Templates (with . as separator).
+# Each value is a string containing directory paths (relative to `modelica-buildings/Buildings`).
+declare -A checksum_dirs=(
+ ["AirHandlersFans"]="Templates/AirHandlersFans
+ Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV"
+ ["ZoneEquipment"]="Templates/ZoneEquipment
+ Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly
+ Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat"
+)
+# Declare the python script that must be run for each template package.
+# Each key is a Modelica package name under Buildings.Templates (with . as separator).
+# Each value is a string containing the script path (relative to `modelica-buildings/Buildings`).
+declare -A test_script=(
+ ["AirHandlersFans"]="./Resources/Scripts/travis/templates/VAVMultiZone.py"
+ ["ZoneEquipment"]="./Resources/Scripts/travis/templates/VAVBox.py"
+)
+
+for type in "${!test_script[@]}"; do
+ if [ "$USE_CHECKSUM" = true ]; then
+ # For each system type: compute checksum of checksum of all mo files under corresponding checksum_dirs, and store value.
+ checksum="$(
+ find ${checksum_dirs[$type]} -type f -name '*.mo' -exec md5sum {} \; \
+ | LC_ALL=C sort -f -k 2 \
+ | awk '{ print $1; }' \
+ | md5sum \
+ | awk '{ print $1; }'
+ )"
+ echo $checksum > "./Resources/Scripts/travis/templates/$type.checksum"
+
+ # Add checksum file to the index so that differences show up in git diff even if file was never added before.
+ git add --intent-to-add "./Resources/Scripts/travis/templates/$type.checksum"
+
+ # Diff/HEAD: only for remote testing.
+ # (Locally, it is expected that there is some diff/HEAD, and we proceed directly to the next step: diff/master.)
+ if [ "$LOCALRUN" = false ]; then
+ diff_checksum="$(git diff --name-only HEAD | grep Resources/Scripts/travis/templates/$type.checksum)"
+ if (( $? == 0 )); then
+ printf "${CRED}Computed checksum does not match checksum on HEAD${CEND}: please commit updated checksum for Templates.%s.\n" $type
+ echo "Computed checksum: $checksum"
+ checksum_head=$(git show HEAD:Buildings/Resources/Scripts/travis/templates/$type.checksum 2>/dev/null)
+ if [[ -z "$checksum_head" ]]; then
+ echo "There is no checksum on HEAD for $type."
+ else
+ echo "Checksum on HEAD: $checksum_head"
+ fi
+ exit 1
+ fi
+ fi
+
+ # Diff/master
+ diff_checksum="$(git diff --name-only origin/master | grep Resources/Scripts/travis/templates/$type.checksum)"
+ if (( $? == 0 )); then
+ echo "Computed checksum does not match checksum on master."
+ echo "Running ${test_script[$type]} with --tool $SIMULATOR."
+ python "${test_script[$type]}" --generate --simulate --tool $SIMULATOR --coverage $FRACTION_TEST_COVERAGE
+ if (( $? == 0 )); then
+ printf "${CGREEN}All simulations succeeded.${CEND}\n"
+ else
+ exit 1
+ fi
+ else
+ echo "Computed checksum matches checksum on master: no further check performed."
+ fi
+ else
+ echo "No --checksum flag is passed, so no test is performed. This is considered improper usage."
+ exit 1
+ fi
+done
diff --git a/Buildings/Resources/Scripts/travis/templates/core.py b/Buildings/Resources/Scripts/travis/templates/core.py
new file mode 100644
index 00000000000..d68987ac0d7
--- /dev/null
+++ b/Buildings/Resources/Scripts/travis/templates/core.py
@@ -0,0 +1,567 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+"""Provide definitions and common declarations used by other scripts in the same directory."""
+
+import argparse
+import gc
+import glob
+import itertools
+import os
+import pickle
+import random
+import re
+import sys
+from math import ceil, floor
+
+# For CPU- and I/O-heavy jobs, we prefer multiprocessing.Pool because it provides better process isolation.
+from multiprocessing import Pool
+
+import pandas as pd
+import yaml
+
+assert sys.version_info >= (3, 8), "This script requires a Python version >= 3.8."
+
+CRED = '\033[91m'
+CGREEN = '\033[92m'
+CEND = '\033[0m'
+
+# Parse conf.yml.
+with open('./Resources/Scripts/BuildingsPy/conf.yml', 'r') as FH:
+ CONF = yaml.safe_load(FH)
+
+
+def parse_args():
+ """Parse script arguments."""
+ parser = argparse.ArgumentParser(
+ description='Generate combinations and run simulations'
+ )
+ parser.add_argument(
+ "--tool",
+ type=str,
+ help="tool to run simulations (case-insensitive)",
+ default='dymola',
+ required=False,
+ )
+ parser.add_argument(
+ "--coverage",
+ type=float,
+ help="fraction of test coverage between 0 (>) and 1 (<=)",
+ default=1,
+ required=False,
+ )
+ parser.add_argument("--generate", help="generate combinations", action="store_true")
+ parser.add_argument(
+ "--simulate", help="path of combination file", action="store_true"
+ )
+ args = parser.parse_args()
+
+ assert (
+ args.coverage > 0 and args.coverage <= 1
+ ), "Fraction of test coverage must be between (>) 0 and (<=) 1."
+
+ return args
+
+
+def get_experiment_attributes(model_name, conf=CONF):
+ """Get experiment attributes from mos script and conf.yml file."""
+ default_attributes = dict(
+ method='CVode',
+ tolerance=1e-6,
+ startTime=0,
+ stopTime=1,
+ simulate=True,
+ )
+
+ # We start by overwriting default attributes with the ones from the mos script.
+ mos_path = re.sub(r'\.', os.path.sep, model_name) + '.mos'
+ mos_path = re.sub(
+ 'Buildings', os.path.join('Resources', 'Scripts', 'Dymola'), mos_path
+ )
+ with open(mos_path) as FH:
+ mos_content = FH.read()
+ try:
+ simu_clause = re.search(r'simulateModel\(.*?\)', mos_content, re.DOTALL).group(
+ 0
+ )
+ except AttributeError:
+ raise RuntimeError(
+ f'The script {os.path.abspath(mos_path)} does not contain any simulateModel clause.'
+ )
+ simu_args = re.finditer(r'(.*)=(.*)', simu_clause)
+ for arg in simu_args:
+ if (key := re.sub(r'\s', '', arg.group(1))) in default_attributes:
+ value = re.sub(r',|\)|;| |\n|"', '', arg.group(2))
+ if value.lower() == 'cvode':
+ value = 'CVode' # This is for optimica which only accepts case-sensitive solver names.
+ if key in ['tolerance', 'startTime', 'stopTime']:
+ value = float(value)
+ default_attributes[key] = value
+
+ # We apply the default attributes for all Modelica tools.
+ # .copy() is required otherwise any subsequent modification of e.g. attributes['dymola']['simulate'] will modify all attributes[*]['simulate'] the same way.
+ attributes = dict(
+ dymola=default_attributes.copy(),
+ optimica=default_attributes.copy(),
+ openmodelica=default_attributes.copy(),
+ )
+
+ # We look into conf.yml file to overwrite the default attributes for each Modelica tool.
+ for el_conf in conf:
+ if model_name == el_conf['model_name']:
+ for tool in attributes:
+ if tool in el_conf:
+ if 'rtol' in el_conf[tool]:
+ attributes[tool]['tolerance'] = el_conf[tool]['tolerance']
+ if 'translate' in el_conf[tool]:
+ attributes[tool]['simulate'] = el_conf[tool]['translate']
+ if 'simulate' in el_conf[tool]:
+ attributes[tool]['simulate'] = el_conf[tool]['simulate']
+ return attributes
+
+
+def simulate_case(arg, simulator, experiment_attributes):
+ """Set common parameters and run simulation with buildingspy.
+
+ Args:
+ arg: tuple[str, list[str], str]: Model name, list of class modifications, suffix for mat file name.
+ simulator: str: Modelica tool for simulating the model.
+ experiment_attributes: dict: Dict as returned by get_experiment_attributes().
+
+ Returns:
+ tuple[int, str]: Error code, log.
+ """
+ # Local imports required for multiprocessing in Jupyter notebook.
+ import glob
+ import json
+ import os
+ import re
+ import shutil
+ import tempfile
+
+ simulator = simulator.lower()
+
+ if simulator == 'dymola':
+ from buildingspy.simulate.Dymola import Simulator
+ elif simulator == 'optimica':
+ from buildingspy.simulate.Optimica import Simulator
+ else:
+ return 4, f'Unsupported simulation tool: {simulator}.'
+
+ mat_root = re.split(r"\.", arg[0])[-1]
+ mat_suffix = re.sub(r"\.", "_", str(arg[2]))
+ output_dir_prefix = f"{mat_root}_{mat_suffix}"
+ cwd = os.getcwd()
+ # We need to create temporary directories at the same level as Buildings because of
+ # the way volumes are mounted in docker run, see Buildings/Resources/Scripts/travis/dymola/dymola.
+ output_dir_path = tempfile.mkdtemp(
+ prefix=output_dir_prefix, dir=os.path.abspath(os.pardir)
+ )
+
+ # The following make Dymola worker cd into outputDirectory.
+ s = Simulator(arg[0], outputDirectory=output_dir_path)
+
+ if simulator == 'dymola':
+ s.addPreProcessingStatement(r'Advanced.TranslationInCommandLog:=true;')
+ s.addPreProcessingStatement(
+ r'openModel("../Buildings/package.mo", changeDirectory=false);'
+ )
+ if simulator == 'optimica':
+ # Set MODELICAPATH (only in child process, so this won't affect main process).
+ os.environ['MODELICAPATH'] = os.path.abspath(os.pardir)
+
+ for modif in arg[1]:
+ s.addModelModifier(modif)
+
+ s.setSolver(experiment_attributes[simulator]['method'])
+ s.setTolerance(experiment_attributes[simulator]['tolerance'])
+ s.setStartTime(experiment_attributes[simulator]['startTime'])
+ s.setStopTime(experiment_attributes[simulator]['stopTime'])
+ s.printModelAndTime()
+
+ try:
+ s.simulate()
+ except Exception as e:
+ toreturn = 2
+ print(e)
+ finally:
+ os.chdir(cwd)
+
+ # Test if simulation succeeded.
+ toreturn = 0
+ log = None
+ try:
+ if simulator == 'dymola':
+ with open(os.path.join(output_dir_path, 'simulator.log')) as fh:
+ log = fh.read()
+ if re.search('\n = false', log):
+ toreturn = 1
+ elif simulator == 'optimica':
+ with open(
+ glob.glob(os.path.join(fr'{output_dir_path}', '*buildingspy.json'))[0],
+ 'r',
+ ) as f:
+ log = json.load(f)
+ if not log['simulation']['success']:
+ toreturn = 1
+ except (FileNotFoundError, IndexError) as e:
+ toreturn = 3
+ log = e
+ finally:
+ if toreturn == 0:
+ shutil.rmtree(output_dir_path, ignore_errors=True)
+ # We delete the log of successful simulations to limit memory usage.
+ log = None
+
+ return toreturn, log
+
+
+def simulate_cases(args, simulator, all_experiment_attributes, asy=False):
+ """Configure and run all simulations.
+
+ Args:
+ args: list[tuple[str, list[str]]]: List of tuples containing (model name, list of class modifications, suffix for mat file name).
+ simulator: str: Modelica tool for simulating the model.
+ all_experiment_attributes: dict: Dict with model name as key and return value of get_experiment_attributes(model_name) as value (dict).
+ asy: bool: If True run simulations asynchronously.
+
+ Returns:
+ list[tuple[int, str]]: List of (error code, log).
+ """
+ args_with_fixed = [(el, simulator, all_experiment_attributes[el[0]]) for el in args]
+ results = []
+ pool = Pool(os.cpu_count())
+ if asy:
+ results = pool.starmap_async(simulate_case, args_with_fixed)
+ else:
+ results = pool.starmap(simulate_case, args_with_fixed)
+ pool.close()
+ pool.join()
+
+ return results
+
+
+def generate_modif_list(dic):
+ """Generate list of class modifications.
+
+ Args:
+ dic: dict[str, list[str]]: Dictionary where each key is the component or variable to be modified,
+ and each value is a list of modifications to be applied.
+ Class modifications of redeclared components shall be appended to the class name, e.g.:
+ 'VAV_1__redeclare__fanSupBlo': [
+ 'Buildings.Templates.Components.Fans.ArrayVariable(nFan=2)',
+ ]
+ as opposed to:
+ 'VAV_1__redeclare__fanSupBlo': [
+ 'Buildings.Templates.Components.Fans.ArrayVariable',
+ ],
+ 'VAV_1__fanSupBlo__nFan': [
+ 2,
+ ]
+ which is not supported by Dymola (which does not error, but simply disregard the second modification!).
+
+ Returns:
+ list[str]: List of class modifications.
+ """
+ to_return = []
+ for param, val in dic.items():
+ if 'redeclare' in param:
+ modif_val = re.search('(.*)\((.*)\)', val)
+ if modif_val is not None:
+ comp_type = modif_val.group(1)
+ comp_modif = '(' + modif_val.group(2)
+ else:
+ comp_type = val
+ comp_modif = ''
+ modif = re.sub(
+ '(.*)redeclare__(.*)',
+ fr'\g<1>redeclare {comp_type} \g<2>',
+ param + comp_modif,
+ )
+ else:
+ modif = param + '=' + val
+ modif = re.sub('__', '(', modif)
+ modif = modif + ')' * modif.count('(')
+ to_return.append(modif)
+ return to_return
+
+
+def remove_items_by_indices(lst, indices):
+ """Remove (inplace) items from list based on their indices.
+
+ Args:
+ lst: list
+ indices: list[int]
+
+ Returns:
+ None
+ """
+ for idx in sorted(list(dict.fromkeys(indices)), reverse=True):
+ if idx < len(lst):
+ lst.pop(idx)
+
+
+def generate_combinations(models, modif_grid):
+ """Generate all possible combinations.
+
+ Args:
+ models: list[str]: List of model names.
+ modif_grid: dict[str, dict[str, list[str]]]: Dictionary where each key is a model name,
+ and each value is a dictionary where each key resolves into a component to modify
+ and each value is a list of modifications to be applied to the component:
+ see docstring of `generate_modif_list` for the structure of this list of modifications.
+
+ Returns:
+ list[tuple[str, list[str], str]]: List of 3-tuples where
+ the first item of the tuple is a model to be simulated,
+ the second item of the tuple is the list of class modifications,
+ the third item of the tuple is a tag.
+ """
+ # Generate combinations.
+ # combinations_dicts is a dictionary where
+ # each key is a model to be simulated,
+ # each value is a list of dictionaries where each key is the component or variable
+ # to be modified, and the corresponding value is the modification to be applied.
+ combinations_dicts = dict()
+ for model in models:
+ keys, values = zip(*modif_grid[model].items())
+ combinations_dicts[model] = [
+ dict(zip(keys, v)) for v in itertools.product(*values)
+ ]
+
+ combinations = []
+ tag = 0 # Simply tag each element with str(index).
+ for model, modif_dict_list in combinations_dicts.items():
+ for el in modif_dict_list:
+ combinations.append((model, generate_modif_list(el), str(tag)))
+ tag = tag + 1
+
+ return combinations
+
+
+def prune_modifications(combinations, exclude, remove_modif, fraction_test_coverage):
+ """Remove class modifications, and update combination tag.
+
+ Args:
+ combinations: list[tuple[str, list[str], str]]: List of combinations as generated
+ by `generate_combinations`.
+ remove_modif: dict[str, list[tuple[list[str], list[str]]]]: Dictionary providing modifications
+ to be removed, see below.
+ exclude: dict[str, list[list[str]]]: Dictionary providing modifications to be excluded, see below.
+ fraction_test_coverage: float = Fraction (>0 and <=1) of test coverage to further reduce the number
+ of combinations (randomly). 1 should be for used for PR against master.
+
+ Returns:
+ list[tuple[str, list[str], str]]: Pruned list of combinations
+
+ Details:
+ A combination is a model and a list of class modifications (and a tag).
+
+ For a given combination:
+ - The `remove_modif` argument is used to remove a *single* class modification.
+ Removing class modifications this way yields many duplicate combinations.
+ These duplicates are pruned afterwards.
+ - The `exclude` argument is used to exclude a combination entirely, i.e., *all* class modifications.
+
+ Exclude (first): A combination is excluded if the following exclusion test returns true.
+ - Look for the model (key) in exclude (dict).
+ - Iterate over the list of list of class modifications for this model (value of exclude[model]).
+ - For a given list of class modifications, return true if all strings are found in the original
+ class modifications of the combination (concatenated).
+ - Note: re patterns are supported, e.g., negative lookahead using (?!pattern)
+
+ Remove (after exclude): A class modification is removed from a combination according to the following rules.
+ For each item (2-tuple) of the list provided (as value) for each model (key) in remove_modif (dict):
+ - if all patterns of item[0] are found in the original class modifications of the combination (concatenated), and
+ - if a class modification contains any item within item[1], then
+ - this class modification is removed.
+ - Note: re patterns are supported, e.g., negative lookahead using (?!pattern)
+
+ Example:
+ - Exclude: For a CHW plant, a combination with chillers in series arrangement and dedicated primary CHW pumps
+ can be excluded.
+ - Remove single modification: For a VAV air handler, a combination with a electric heating coil and a three-way valve
+ for the heating coil should use `remove_modif` to remove the valve component modification. We cannot use
+ `exclude` here because there is a modification of the valve component in each combination, so we would end up
+ excluding all combinations with a electric heating coil.
+ """
+ # Exclude cases.
+ if exclude is not None:
+ indices_to_pop = []
+ for i, arg in enumerate(combinations):
+ if arg[0] in exclude: # Model found in dict keys.
+ modif_concat = ''.join(arg[1])
+ if any(
+ all(re.search(modif_ex, modif_concat) for modif_ex in list_modif_ex)
+ for list_modif_ex in exclude[arg[0]]
+ ):
+ indices_to_pop.append(i)
+ combinations = [
+ el for idx, el in enumerate(combinations) if idx not in indices_to_pop
+ ]
+
+ # Remove modifications.
+ if remove_modif is not None:
+ for i, arg in enumerate(combinations):
+ indices_to_pop = []
+ if arg[0] in remove_modif: # Model found in dict keys.
+ modif_concat = ''.join(arg[1])
+ for item in remove_modif[arg[0]]:
+ if all(re.search(el, modif_concat) for el in item[0]):
+ for pattern_to_remove in item[1]:
+ for j, modif in enumerate(arg[1]):
+ if re.search(pattern_to_remove, modif):
+ indices_to_pop.append(j)
+ # The tuple combinations[i] is immutable, but modifying inplace one of its elements is possible though.
+ remove_items_by_indices(combinations[i][1], indices_to_pop)
+
+ # Remove elements with duplicated (model, modif) within combinations.
+ df_model_modif = pd.DataFrame(
+ dict(
+ model=[el[0] for el in combinations],
+ modif=[''.join(el[1]) for el in combinations],
+ )
+ )
+ indices_to_pop = df_model_modif[df_model_modif.duplicated() == True].index.tolist()
+ combinations = [
+ el for idx, el in enumerate(combinations) if idx not in indices_to_pop
+ ]
+
+ # Apply fraction of test coverage.
+ if fraction_test_coverage is not None:
+ combinations = [
+ el
+ for idx, el in enumerate(combinations)
+ if idx
+ in random.sample(
+ range(len(combinations)),
+ int(len(combinations) * fraction_test_coverage),
+ )
+ ]
+
+ # Update tags. (Because pruning resulted in a sparse list of indices.)
+ for i, arg in enumerate(combinations):
+ combinations[i] = (*combinations[i][:2], str(i))
+
+ return combinations
+
+
+def report_clean(combinations, results):
+ """Report, clean and exit(1) if any simulations failed.
+
+ Args:
+ combinations: list[tuple[str, list[str], str]]: List of combinations.
+ results: list[tuple[int, str]]: List of (error code, log).
+
+ Returns:
+ pd.DataFrame
+ """
+ try:
+ os.unlink('tmp_func.py')
+ os.unlink('unitTestsTemplates.log')
+ except FileNotFoundError:
+ pass
+
+ df = pd.DataFrame(
+ dict(
+ model=[el[0] for el in combinations],
+ tag=[el[2] for el in combinations],
+ modif=[el[1] for el in combinations],
+ errorcode=[r[0] for r in results],
+ errorlog=[r[1] for r in results],
+ )
+ )
+
+ assert len(df) == len(
+ combinations
+ ), 'Error when trying to retrieve simulation results as a DataFrame.'
+
+ # Log and exit if any simulations failed.
+ if df.errorcode.abs().sum() != 0:
+ with open('unitTestsTemplates.log', 'w') as FH:
+ for idx in df[df.errorcode != 0].index:
+ FH.write(
+ f'*** Simulation failed for {df.iloc[idx].model} with the error code {df.iloc[idx].errorcode} '
+ + 'and the following class modifications and error log.\n\n'
+ + ',\n'.join(df.iloc[idx].modif)
+ + f'\n\n{df.iloc[idx].errorlog}\n\n'
+ )
+ number_failure = df.errorcode.apply(lambda x: 1 if x != 0 else 0).sum()
+ print(
+ CRED
+ + f'{int(number_failure / len(df) * 100)} % of the simulations failed. '
+ + CEND
+ + 'See the file `unitTestsTemplates.log`.\n'
+ )
+ sys.exit(1)
+
+ del combinations
+ del results
+ gc.collect()
+
+
+def main(models, modif_grid, exclude, remove_modif):
+ """Main function."""
+ args = parse_args()
+ tool = args.tool.lower()
+ # Get experiment attributes for all models.
+ all_experiment_attributes = dict(
+ zip(models, map(get_experiment_attributes, models))
+ )
+
+ if args.generate:
+ # Exclude model if it shall not be simulated.
+ for model_name in models:
+ if not all_experiment_attributes[model_name][tool]['simulate']:
+ models.remove(model_name)
+ print(f'Model {model_name} is not simulated based on `conf.yml`.')
+
+ # Generate combinations.
+ combinations = generate_combinations(models=models, modif_grid=modif_grid)
+
+ # Prune class modifications.
+ combinations = prune_modifications(
+ combinations=combinations,
+ exclude=exclude,
+ remove_modif=remove_modif,
+ fraction_test_coverage=args.coverage,
+ )
+
+ print(f'Number of cases to be simulated: {len(combinations)}.\n')
+
+ # # DEBUG
+ # with open('combinations.log', 'w') as FH:
+ # for el in combinations:
+ # modif = "\n".join(el[1])
+ # FH.write(f'{el[0]}\n{modif}\n\n')
+
+ # Split combinations into chunks of 100 items.
+ for i in range(ceil(len(combinations) / 100)):
+ with open(
+ f'{os.path.basename(__file__).replace(".py", "_combin") + str(i)}', 'wb'
+ ) as FH:
+ slc = slice(i * 100, min((i + 1) * 100, len(combinations)))
+ pickle.dump(combinations[slc], FH)
+
+ if args.simulate:
+ # Run simulations by chunks of 100 items.
+ # This gives a chance to exit(1) if any simulation failed within a given chunk.
+ for file in glob.glob(
+ f'{os.path.basename(__file__).replace(".py", "_combin")}*'
+ ):
+ with open(file, 'rb') as FH:
+ combinations = pickle.load(FH)
+ # Delete combination file that was just consumed.
+ os.unlink(file)
+
+ if len(combinations) > 0:
+ # Simulate cases.
+ results = simulate_cases(
+ combinations,
+ simulator=tool,
+ all_experiment_attributes=all_experiment_attributes,
+ asy=False,
+ )
+
+ # Report, clean and exit(1) if any simulations failed.
+ report_clean(combinations, results)
diff --git a/Buildings/Templates/AirHandlersFans/Components/Controls/G36VAVMultiZone.mo b/Buildings/Templates/AirHandlersFans/Components/Controls/G36VAVMultiZone.mo
index 6c0821ec2f4..aa7c065dedf 100644
--- a/Buildings/Templates/AirHandlersFans/Components/Controls/G36VAVMultiZone.mo
+++ b/Buildings/Templates/AirHandlersFans/Components/Controls/G36VAVMultiZone.mo
@@ -271,8 +271,12 @@ equation
connect(bus.pAirSup_rel, ctl.dpDuc);
connect(bus.TOut, ctl.TOut);
connect(bus.TAirSup, ctl.TAirSup);
- connect(bus.VOut_flow, ctl.VAirOut_flow);
- connect(bus.VOutMin_flow, ctl.VAirOut_flow);
+ if typSecOut==Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.SingleDamper then
+ connect(bus.VOut_flow, ctl.VAirOut_flow);
+ end if;
+ if typSecOut==Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow then
+ connect(bus.VOutMin_flow, ctl.VAirOut_flow);
+ end if;
connect(bus.dpAirOutMin, ctl.dpMinOutDam);
connect(bus.hAirOut, ctl.hAirOut);
@@ -325,6 +329,7 @@ equation
connect(ctl.y1MinOutDam, bus.damOutMin.y1);
connect(ctl.yRetDam, bus.damRet.y);
connect(ctl.yRelDam, bus.damRel.y);
+ connect(ctl.y1RelDam, bus.damRel.y1);
connect(ctl.yOutDam, bus.damOut.y);
connect(ctl.y1EneCHWPum, bus.y1PumChiWat);
connect(ctl.y1SupFan, bus.fanSup.y1);
@@ -502,15 +507,6 @@ Buildings.Controls.OBC.ASHRAE.G36.ZoneGroups.ZoneGroupSystem:
Computation of the AHU operating mode
-Details
-
-The AI point for the measured outdoor air flow rate ctl.VOut_flow
-used for minimum outdoor airflow control is connected to both bus.VOutMin_flow
-(dedicated minimum OA damper) and bus.VOut_flow (single common OA damper).
-Those two variables are exclusive from one another.
-In case of dedicated OA dampers, the total outdoor airflow is not measured,
-hence no bus.VOut_flow signal is available for that configuration.
-
References
-
@@ -518,5 +514,18 @@ ASHRAE, 2021. Guideline 36-2021, High-Performance Sequences of Operation
for HVAC Systems. Atlanta, GA.
+